Commit Graph

10 Commits

Author SHA1 Message Date
Samuel Georges 99fcdaaadb Merge pull request #1488 from vojtasvoboda/feature/duplicate-array-keys
Remove duplicate array keys
2015-10-05 08:45:48 +11:00
Vojta Svoboda 3ea76dd817 Remove duplicate array keys 2015-10-04 22:09:57 +02:00
Sajjad 19adf61c5e Update Persian language 2015-10-03 12:36:57 +03:30
Sajjad 711df56986 update persian language 2015-07-05 21:26:39 +04:30
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 e114f29582 Updating modules/cms/lang 2014-10-11 01:32:11 +02:00
sajjad-ser 1cf70bf032 Add Persian Translate 2014-10-07 17:37:37 +03:30