TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,050 Commits 3 Branches 0 Tags 78 MiB
Commit Graph

1050 Commits

Author SHA1 Message Date
Stefan Talen 018e0a4172 Updating plugin folder 2014-10-18 12:49:29 +02:00
Stefan Talen 0a05e08a38 Fixing issues with files in modules/backend 2014-10-18 12:05:51 +02:00
Stefan Talen 509e7d2a12 Fixing issues with files in modules/cms 2014-10-18 12:03:48 +02:00
Stefan Talen f85087eac6 Updating modules/system 2014-10-18 11:58:50 +02:00
Stefan Talen 347dff7e75 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 
Conflicts:
	modules/backend/behaviors/RelationController.php
	modules/backend/classes/WidgetManager.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/twig/Extension.php
	modules/cms/twig/PlaceholderNode.php
	modules/cms/widgets/TemplateList.php
 2014-10-18 11:07:17 +02:00
Sam Georges ed552f1591 Minor code clean 2014-10-18 15:52:44 +11:00
Sam Georges 8ee28b214d Minor code clean 2014-10-18 14:32:06 +11:00
Sam Georges 2689a3e669 Be more specific about pathing, minor improvement to system settings table 2014-10-18 13:39:33 +11:00
Sam Georges fff64a30a7 FormWidget registrations use a "code" not an "alias", it is confusing with defaultAlias property in widgetbase 2014-10-18 10:47:36 +11:00
Sam Georges d74a15b297 Update font autumn to latest 2014-10-17 17:33:59 +11:00
alekseybobkov d4bc164fb2 Display the default placeholder content if there is no put tag for the placeholder 2014-10-16 22:36:00 -07:00
alekseybobkov 219f1ff8f7 Merge branch 'develop' into static-pages-support 
Conflicts:
	modules/backend/assets/less/controls/filelist.less
 2014-10-16 21:03:20 -07:00
alekseybobkov 12175b29db Multiple updates in the back-end widgets and styles 2014-10-16 20:47:23 -07:00
Sam Georges d741b7bd60 Missing language keys 2014-10-17 08:25:28 +11:00
Sam Georges df98ae9196 Use getQualifiedKeyName when finding existing IDs 2014-10-17 08:15:16 +11:00
Sam Georges 6e827b4c8c Merge branch 'master' into develop 2014-10-17 08:14:04 +11:00
Samuel Georges c48e10cbf5 Merge pull request #701 from karnold/develop 
when building belongsToMany relationships in controllers, the lack of a ...
 2014-10-17 08:13:19 +11:00
Samuel Georges 1a5c277c30 Merge pull request #700 from negativa/patch-1 
Rename Datepicker.php to DatePicker.php
 2014-10-17 08:11:12 +11:00
Sam Georges 6e584ecc56 Customize backend should style the breadcrumb 2014-10-17 07:57:43 +11:00
Kris Arnold c75df3a120 when building belongsToMany relationships in controllers, the lack of a table name 
alias causes an sql ambigious Id error
 2014-10-16 14:28:36 -05:00
Dmitriy d055bbedaa Rename Datepicker.php to DatePicker.php 2014-10-16 22:03:10 +03:00
Stefan Talen 06890d711a Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 
Conflicts:
	modules/backend/behaviors/UserPreferencesModel.php
	modules/cms/classes/Controller.php
	modules/system/classes/CombineAssets.php
 2014-10-16 18:44:18 +02:00
Sam Georges 3e48ba945f * Build 155 2014-10-16 19:57:53 +11:00
Sam Georges 886e6fc70a Only set noInit on PluginManager for specific CLI commands (october:up, october:update) 2014-10-16 19:49:31 +11:00
Sam Georges 8d618d4e29 Fixes #684 - Plugins still load language, routes, etc when noInit is enabled 2014-10-16 19:49:30 +11:00
Sam Georges 1203043a45 Cache BrandSettings compiled CSS 2014-10-16 19:49:29 +11:00
Sam Georges fbaab26bfb Improve efficiency in settings model behavior 2014-10-16 19:49:28 +11:00
Samuel Georges 56e6620a35 Merge pull request #695 from erikthedeveloper/fixup/minor_documentation 
Fixes typo (Licence) and missing space in README.md
 2014-10-16 19:44:43 +11:00
Erik Aybar 69d7893f37 Fixes missing space and typo (Licence) in README.md 2014-10-15 18:50:19 -06:00
Sam Georges b55cfa0aff Use contain 2014-10-15 20:03:12 +11:00
Sam Georges cb8cad3a75 Merge branch 'customize-backend' into develop 2014-10-15 19:59:33 +11:00
Sam Georges 9f5646d273 BackendSettings -> BrandSettings 
pageTitle is now translated at the end of the line
Fixed unit tests so they pass
SettingsModels are now cached
 2014-10-15 19:53:44 +11:00
Sam Georges 82192c3e55 Add light/dark variations of primary/secondary colors 2014-10-15 08:10:38 +11:00
Sam Georges 57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
Samuel Georges 3a7cc9f7aa Merge pull request #686 from DallasMuseumArt/upstream 
fixed language reference in dialog box for plugin disable form
 2014-10-14 07:50:44 +11:00
Kris Arnold 9c51b8b2a1 fixed language reference in dialog box for plugin disable form 2014-10-13 15:32:59 -05:00
Sam Georges 3ec4a2a82f Add LESS ability to rendering custom backend less 2014-10-13 19:05:23 +11:00
Sam Georges d194f34cf8 Merge branch 'develop' into customize-backend 2014-10-13 18:35:39 +11:00
Sam Georges 640dc04cf5 Dedicated layout partial for custom styles 2014-10-13 16:09:07 +11:00
Stefan Talen acf2304ce2 Fixing test SectionParserTest::testParseOffset 2014-10-12 14:23:47 +02:00
Stefan Talen dcb292b246 Fixing incorrect brackets 2014-10-12 13:43:50 +02:00
Stefan Talen 230a7377cf Updating files in modules/cms 2014-10-11 14:33:40 +02:00
Stefan Talen 4fa6db3bd5 Fixing minor issue 2014-10-11 12:15:02 +02:00
Stefan Talen 61cf1ad710 Merge branch 'develop' of https://github.com/octobercms/october into feature/PSR-2 
Conflicts:
	modules/backend/behaviors/FormController.php
	modules/backend/classes/AuthManager.php
	modules/backend/lang/fa/lang.php
	modules/backend/widgets/Form.php
	modules/cms/classes/CmsCompoundObject.php
	modules/cms/classes/ComponentHelpers.php
	modules/cms/formwidgets/Components.php
 2014-10-11 11:58:20 +02:00
Sam Georges dd5a46d815 Refs #599 - Adds method to get the list widget object from the controller 2014-10-11 18:06:14 +11:00
Sam Georges 153fcfbb13 Refs #598 - Ignore phantom columns stored in preferences 2014-10-11 17:58:48 +11:00
Sam Georges cf352bfe1a Fixes #657 - Add Redis service provider 2014-10-11 16:53:51 +11:00
Sam Georges f03db8be5d Fixes #669 - Labels in filter do not translate 2014-10-11 16:38:23 +11:00
Sam Georges 062ce2f50a Closes #673 - Add Argentine Spanish (es-AR) locale 2014-10-11 16:32:51 +11:00
alekseybobkov 0b8af1f505 Merge branch 'develop' into static-pages-support 2014-10-10 22:27:01 -07:00