Vojta Svoboda
3ea76dd817
Remove duplicate array keys
2015-10-04 22:09:57 +02:00
Samuel Georges
a5531f931b
Manual merge - fixes #1278 Thanks @Freakspot
2015-07-25 15:00:19 +10:00
Samuel Georges
961509839e
Manually merge Pull Requests that are prepared incorrectly
...
Fixes #1229
Fixes #1259
Fixes #1260
Fixes #1261
Fixes #1262
Fixes #1263
Fixes #1264
Fixes #1277
Thanks @felixinx @awaysoft @tsioukas @Freakspot
2015-07-11 14:36:38 +10:00
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
Sam Georges
20e279bf4c
Page URLs now support dots (.)
...
Add hook for cms.page.init
2014-08-21 19:47:29 +10:00
Sam Georges
91ecb55ca3
Tidy up #314
2014-06-17 19:13:25 +10:00
Louis Matthijssen
bbd2915637
Improve the access denied (403) page
...
This is an improved version of the current access denied (403) page based on the built-in not found (404) page.
Shows a link to the CMS backend if the user is logged in and doesn't have permissions for the backend page it's trying to access, but does have permissions for the CMS backend.
Please note that the following languages are machine translated: ja, pt-br, ru and sv.
2014-06-16 22:58:37 +02:00
Sam Georges
12a80cae9c
Add new keys to other languages (needs further translation)
2014-05-16 11:29:44 +10:00
mhe
80d41c4e4d
Add further translation files
2014-05-15 20:25:55 +02:00
