Commit Graph

7 Commits

Author SHA1 Message Date
Sam Georges a8daa5b4a7 Fixes the system settings icon 2014-10-24 16:38:36 +11: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 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
Stefan Talen 92aa3fc18d Updating backend/controllers 2014-10-10 23:26:57 +02:00
alekseybobkov fecfeee2ac Fixed drop-down widget properties on the dashboard 2014-08-02 12:29:41 +11:00
Sam Georges 2b820a20d6 Convert all boolean table columnns to use is_ prefix
Add email template/layout system
2014-06-06 21:39:20 +10:00
Sam Georges 71a5dd67ab Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00