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
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
92aa3fc18d
Updating backend/controllers
2014-10-10 23:26:57 +02:00
7beafebf7c
getClassExtension -> asExtension (shorter syntax)
2014-08-23 09:41:48 +10:00
98eb3e2e84
System page navigation improvements, not finished
2014-07-24 15:19:00 +11:00
ddb6337efe
EditorSettings -> EditorPreferences (System has settings, User has preferences, App has configuration)
...
Create a My Settings page, now linked when clicking a User
Create backend preferences form for setting locale
Dropdown options now support an image or icon in their options
2014-07-01 17:17:53 +10:00
Stefan Talen
Sam Georges
alekseybobkov