Damian Mooyman
795ece3352
Merge 3.1 into 3.2
...
# Conflicts:
# javascript/lang/fa_IR.js
# javascript/lang/ru.js
# javascript/lang/src/fa_IR.js
# javascript/lang/src/ru.js
# lang/fa_IR.yml
2016-08-05 11:37:29 +12:00
Damian Mooyman
6477e24219
Update translations
2016-08-05 11:06:51 +12:00
Damian Mooyman
dd0163ae00
Update translations
2016-05-11 11:05:37 +12:00
Damian Mooyman
03c628345b
Update translations
2016-05-11 10:58:24 +12:00
Damian Mooyman
33bf5f9519
Update translations
2016-02-19 10:54:36 +13:00
Damian Mooyman
42cedb70b9
Update translations
2016-02-19 10:21:02 +13:00
Loz Calver
97e90b8ebd
FIX: RedirectorPage toggles not working ( fixes #1328 )
2015-11-17 16:22:49 +00:00
Damian Mooyman
73377a7a92
Update translations
2015-11-11 17:06:44 +13:00
Damian Mooyman
ebed1d22e5
Update translations
2015-11-11 16:07:20 +13:00
Damian Mooyman
d8915115f8
Update translations
2015-10-06 18:33:16 +13:00
Loz Calver
052aba17ac
FIX: Incorrect field IDs breaking SiteTree settings toggles ( fixes #1280 )
2015-09-23 14:53:07 +01:00
Damian Mooyman
0df0f35278
Update translations
2015-09-18 14:21:19 +12:00
Damian Mooyman
353e5938de
Update translations
2015-09-02 11:15:52 +12:00
Damian Mooyman
a3f789c2b5
Update translations
2015-08-24 16:29:40 +12:00
Damian Mooyman
a1b9e99342
Update localisation
2015-08-04 13:02:52 +12:00
Damian Mooyman
f38402bee3
Merge pull request #1254 from scott1702/update-alerts
...
Update archive warning to include children pages
2015-08-03 18:14:12 +12:00
scott1702
3566e4ed87
Update archive warning to include children pages
2015-08-03 16:10:10 +12:00
Damian Mooyman
a6677b1653
API respect custom attributes on OptionsetField and CheckboxSetField
...
Must be merged with https://github.com/silverstripe/silverstripe-framework/pull/4390
2015-08-03 16:08:56 +12:00
Damian Mooyman
12bcf382ad
Update translations
2015-06-19 18:25:53 +12:00
Daniel Hensby
715cd9ab4e
Merge branch 'pulls/localized-urlsegment-creation' of https://github.com/chillu/silverstripe-cms into chillu-pulls/localized-urlsegment-creation
...
Conflicts:
tests/model/SiteTreeTest.php
2015-06-13 15:23:22 +01:00
Damian Mooyman
b169823a00
API Deprecate delete in favour of archive
...
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug preventing side-by-side preview of archived pages
Fix bug in reporting publishing of error pages
Restoring a page without an available parent will restore to root
2015-06-03 14:46:16 +12:00
Damian Mooyman
1f9fc33349
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteTree.php
code/model/SiteTreeLinkTracking.php
tests/controller/CMSMainTest.php
2015-06-02 19:23:48 +12:00
Damian Mooyman
0557c0d47b
Update translations
2015-05-14 13:52:21 +12:00
Ingo Schommer
36ac61115a
Fix auto-setting of URL from localized page titles
...
Replace the hardcoded check for english locale ("new-page")
with a localized version.
See https://github.com/silverstripe/silverstripe-translatable/issues/180
2015-04-29 00:16:53 +12:00
Damian Mooyman
cf4d9edafb
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/model/SiteConfig.php
javascript/CMSMain.AddForm.js
tests/model/SiteConfigTest.php
tests/model/SiteTreeTest.php
2015-03-31 19:54:43 +13:00
Damian Mooyman
7f1f615634
Merge remote-tracking branch 'origin/3.1.11' into 3.1
2015-03-19 17:51:25 +13:00
Damian Mooyman
3df41e1176
BUG Fix SiteTree / SiteConfig permissions
2015-03-19 15:29:38 +13:00
Damian Mooyman
9d7a640205
Merge remote-tracking branch 'origin/3.1' into 3
2015-03-11 11:43:56 +13:00
Damian Mooyman
c0a44db56b
Merge pull request #1154 from uniun/missing-translations-entity
...
FIX. Missing translation entity
2015-03-10 22:50:26 +13:00
Damian Mooyman
c238e1e15b
Update translations
2015-03-09 17:11:50 +13:00
Damian Mooyman
21e2bc7258
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/reports/Report.php
2015-02-20 10:16:37 +13:00
Damian Mooyman
c7814cffc9
Update translations
2015-02-16 11:54:06 +13:00
Damian Mooyman
475b6d18e5
Merge remote-tracking branch 'composer/3.1' into 3
2015-01-15 17:48:11 +13:00
Elvinas L.
9da7e90bf4
FIX. Missing translation entity
...
Missing translation entity on Update URL button.
2015-01-13 12:36:09 +02:00
Damian Mooyman
ee4639ed74
Update translations
2015-01-12 17:52:29 +13:00
Damian Mooyman
d01883a5f8
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/model/SiteConfig.php
2014-11-18 12:45:42 +13:00
Damian Mooyman
708e70624c
Update translations
2014-11-08 17:06:10 +13:00
Mateusz Uzdowski
52d297e6ef
Merge remote-tracking branch 'origin/3.1' into merge-back
...
Conflicts:
code/controllers/CMSSiteTreeFilter.php
code/controllers/ReportAdmin.php
code/reports/Report.php
2014-08-13 17:19:01 +12:00
Damian Mooyman
407033b076
Update translations
2014-08-05 15:01:52 +12:00
Ingo Schommer
0b296b3665
Merge remote-tracking branch 'origin/3.1'
2014-06-15 22:50:35 +12:00
Damian Mooyman
3033d45498
Updated translation masters
2014-05-13 11:13:44 +12:00
Damian Mooyman
6a69134fb0
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:33:44 +12:00
Damian Mooyman
bae95805dd
Updated translation masters
2014-05-07 10:03:15 +12:00
Damian Mooyman
ecda66a1c4
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:39:47 +13:00
Damian Mooyman
755f4f1557
Updated translation master
2014-03-31 14:23:47 +13:00
Stig Lindqvist
1625d126c2
BUG Report admin don't listen to filters
...
It seems like filter params that are added to the url are added in a bad way
Currently
?0[name]=filters[ContentReviewOwnerID]&0[value]=1
Expected:
?filters[ContentReviewOwnerID]=1
2014-02-25 17:20:25 +13:00
Ingo Schommer
889e97e17d
Merge remote-tracking branch 'origin/3.1'
2014-02-18 22:06:56 +13:00
Ingo Schommer
ca37dc8e69
Updated translations
2014-02-18 11:50:04 +13:00
jean
5f2d78a2dc
FIX JS issue when enabling save buttons for when the content has changed. Current implementation triggers a 'Object is not a function' error. New implementation follows the same logic as in the onmatch function, and uses .button() as the function
2014-02-17 14:34:12 +13:00
axllent
c043d070f7
Fix typo in ONLYSELECTTWO alert
2014-01-14 13:40:06 +13:00
