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

594 Commits

Author SHA1 Message Date
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 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 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 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
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 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
Sam Georges b55cfa0aff Use contain 2014-10-15 20:03:12 +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 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 dcb292b246 Fixing incorrect brackets 2014-10-12 13:43:50 +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 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
Sam Georges d92268b516 Oops, broke the switch 2014-10-11 14:32:30 +11:00
Sam Georges 71f9df8e13 Use HTML to pass unchecked checkboxes/switches. Refs #648 2014-10-11 14:31:09 +11:00
Samuel Georges 182bb01167 Merge pull request #648 from Flynsarmy/checkboxZeroVal 
Send a 0 value when a checkbox is unchecked
 2014-10-11 14:21:43 +11:00
Sam Georges 3836a9b8d7 Refs #679 - Fixed Visibility must be declared on property issues 2014-10-11 12:27:21 +11:00
Sam Georges 1dcaa0d1d6 Fixes #677 - use FQN for "instanceof Model" expressions 2014-10-11 12:13:25 +11:00
Sam Georges 4504d5bf4c Improve translation handling 2014-10-11 10:37:48 +11:00
Stefan Talen b64a744498 Updating modules/backend/widgets 2014-10-11 00:39:34 +02:00
Stefan Talen aa68d163a0 Updating modules/backend/traits 2014-10-11 00:07:30 +02:00
Stefan Talen 75510ed4de Updating modules/backend/skins 2014-10-11 00:05:35 +02:00
Stefan Talen 07a0a7e428 Updating modules/backend/models 2014-10-11 00:04:51 +02:00
Stefan Talen 6ccf49bdd9 Updating modules/backend/lang 2014-10-10 23:58:23 +02:00
Stefan Talen f29151100b Updating modules/backend/formwidgets 2014-10-10 23:50:05 +02:00
Sam Georges fd547bb485 We can't sort by relation fields anymore 2014-10-11 08:44:30 +11:00
Stefan Talen ae1c9e95c2 Updating backend/facades 2014-10-10 23:36:04 +02:00
Stefan Talen 7148341b80 Updating backend/database 2014-10-10 23:34:34 +02:00
Stefan Talen 92aa3fc18d Updating backend/controllers 2014-10-10 23:26:57 +02:00
Stefan Talen e66f6d5820 Updating single files in backend 2014-10-10 23:16:22 +02:00
Stefan Talen 7dc24cfff1 Updating backend/classes 2014-10-10 23:12:50 +02:00
Stefan Talen b01d3e540f Updating backend/behaviours 2014-10-10 22:34:57 +02:00
Samuel Georges ba97260aa9 Merge pull request #667 from sajjad-ser/master 
Add Persian Translate
 2014-10-08 18:58:05 +11:00