ORIENT/modules/backend/models
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
..
accesslog We can't sort by relation fields anymore 2014-10-11 08:44:30 +11:00
backendpreferences EditorSettings -> EditorPreferences (System has settings, User has preferences, App has configuration) 2014-07-01 17:17:53 +10:00
editorpreferences EditorSettings -> EditorPreferences (System has settings, User has preferences, App has configuration) 2014-07-01 17:17:53 +10:00
group Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00
user We can't sort by relation fields anymore 2014-10-11 08:44:30 +11:00
AccessLog.php Updating modules/backend/models 2014-10-11 00:04:51 +02:00
BackendPreferences.php Closes #673 - Add Argentine Spanish (es-AR) locale 2014-10-11 16:32:51 +11:00
EditorPreferences.php Updating modules/backend/models 2014-10-11 00:04:51 +02:00
User.php Updating modules/backend/models 2014-10-11 00:04:51 +02:00
UserGroup.php If a base classes uses a trait, no need to reuse that trait because Model boots all traits now 2014-08-03 11:57:51 +10:00
UserPreferences.php Updating modules/backend/models 2014-10-11 00:04:51 +02:00
UserThrottle.php Welcome to the world, October :-) 2014-05-14 23:24:20 +10:00