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
|
3836a9b8d7
|
Refs #679 - Fixed Visibility must be declared on property issues
|
2014-10-11 12:27:21 +11:00 |
|
Stefan Talen
|
7dc24cfff1
|
Updating backend/classes
|
2014-10-10 23:12:50 +02:00 |
|
Sam Georges
|
56d0c3351b
|
private -> protected
|
2014-08-01 14:54:16 +10:00 |
|
Sam Georges
|
4bd7f9975c
|
Oops, now plugins can register permissions :-)
|
2014-05-19 22:42:16 +10:00 |
|
Sam Georges
|
71a5dd67ab
|
Welcome to the world, October :-)
|
2014-05-14 23:24:20 +10:00 |
|