6 Commits

Author SHA1 Message Date
Samuel Georges
a8389fb1aa Tooltip now auto initializes
initForm can now pass context
Various improvements and bug fixes
2015-03-12 20:50:16 +11:00
webmaxx
b4819e73b3 Added new symbols to page slug regexp in the backend.
Example slug:
/news/:page?|^[0-9]+$ - "/news/", "/news/2"
2014-11-19 12:04:55 +04: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
57ec5c7261 Moved asset combiner to the system module 2014-10-15 08:09:46 +11:00
Stefan Talen
230a7377cf Updating files in modules/cms 2014-10-11 14:33:40 +02:00
Sam Georges
062ce2f50a Closes #673 - Add Argentine Spanish (es-AR) locale 2014-10-11 16:32:51 +11:00