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
|
57ec5c7261
|
Moved asset combiner to the system module
|
2014-10-15 08:09:46 +11:00 |
|
Stefan Talen
|
e114f29582
|
Updating modules/cms/lang
|
2014-10-11 01:32:11 +02:00 |
|
Sam Georges
|
20e279bf4c
|
Page URLs now support dots (.)
Add hook for cms.page.init
|
2014-08-21 19:47:29 +10:00 |
|
adi
|
03d9f81b47
|
Added Romanian translation files in modules/*/lang/ro and modified modules/backend/models/BackendPreferences.php and modules/system/lang/en/lang.php in order for the language to appear in the admin section
|
2014-08-16 15:00:07 +03:00 |
|