Daniel Hensby
228c406e64
Merge remote-tracking branch '3.2.4' into 3.3.2
2016-05-05 12:33:08 +01:00
Daniel Hensby
ce3575e362
Update translations
2016-05-05 12:25:44 +01:00
Daniel Hensby
5cbfad4aea
Merge remote-tracking branch 'origin/3.1.19' into 3.2.4
2016-05-05 12:25:13 +01:00
Daniel Hensby
2d10c94049
Update translations
2016-05-05 10:24:15 +01:00
Ingo Schommer
b4c4c636f2
Merge remote-tracking branch 'origin/3'
2016-03-04 17:07:23 +13:00
Damian Mooyman
ffdfac6af4
Merge branch '3.2' into 3.3
...
# Conflicts:
# lang/en.yml
# lang/sk.yml
2016-02-29 16:47:11 +13:00
Damian Mooyman
2406881d3e
Merge remote-tracking branch 'origin/3.3.1' into 3.3
...
# Conflicts:
# lang/cs.yml
2016-02-29 16:44:01 +13:00
Damian Mooyman
1eed3608ad
Merge branch '3.1' into 3.2
...
# Conflicts:
# code/controllers/CMSMain.php
2016-02-29 16:41:01 +13:00
Damian Mooyman
77d506547c
Update translations
2016-02-29 15:01:55 +13:00
Damian Mooyman
80959dc441
Update translations
2016-02-29 15:01:10 +13:00
Damian Mooyman
e6f9e71a0f
Update translations
2016-02-29 14:57:30 +13:00
Damian Mooyman
05a9c760f8
Update translations
2016-02-27 20:38:29 +13:00
Damian Mooyman
a89debb962
Update translations
2016-02-27 20:38:19 +13:00
Damian Mooyman
be980a50fc
Update translations
2016-02-27 20:35:10 +13:00
Damian Mooyman
99c72fce5f
Merge remote-tracking branch 'origin/3'
2016-02-25 14:52:55 +13:00
Damian Mooyman
208497ea42
Merge remote-tracking branch 'origin/3.2' into 3.3
...
# Conflicts:
# lang/en.yml
# lang/lt.yml
2016-02-24 17:32:58 +13:00
Damian Mooyman
a5444c3eeb
Update translations
2016-02-24 16:06:03 +13:00
Damian Mooyman
4c3761f42c
Update translations
2016-02-24 15:20:40 +13:00
Damian Mooyman
4849aa828e
Update translations
2016-02-24 15:14:58 +13: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
Damian Mooyman
c43b84573b
Update translations
2016-02-09 17:45:20 +13:00
Damian Mooyman
0a2456e71e
Merge remote-tracking branch 'origin/3'
2016-01-25 16:16:53 +13:00
Damian Mooyman
0cc49cb27a
Update translations
2016-01-25 15:06:55 +13:00
Damian Mooyman
93acf4b39a
Update translations
2016-01-21 14:22:35 +13:00
Damian Mooyman
d387d4f311
Update translations
2015-12-23 13:22:38 +13:00
Damian Mooyman
15685d85ab
Merge remote-tracking branch 'origin/3.2' into 3
2015-12-22 14:10:52 +13:00
Damian Mooyman
a40c8e034a
Update translations
2015-11-16 16:01:51 +13:00
Damian Mooyman
5925883330
Update translations
2015-11-16 15:08:39 +13: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
748866ec0f
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
code/controllers/CMSMain.php
code/model/ErrorPage.php
2015-11-03 13:11:26 +13:00
Damian Mooyman
54b8389b8a
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
code/model/ErrorPage.php
lang/fa_IR.yml
2015-11-03 11:11:29 +13:00
Damian Mooyman
d8915115f8
Update translations
2015-10-06 18:33:16 +13:00
Damian Mooyman
0df0f35278
Update translations
2015-09-18 14:21:19 +12:00
Damian Mooyman
6e72bd2cf8
Update translations
2015-09-15 10:51:27 +12:00
Damian Mooyman
ce212972c8
Update translations
2015-09-15 10:42:32 +12:00
Damian Mooyman
105b3c60d1
Update translations
2015-09-15 10:33:25 +12:00
Damian Mooyman
b7ad568644
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 14:50:28 +12:00
Damian Mooyman
353e5938de
Update translations
2015-09-02 11:15:52 +12:00
Damian Mooyman
b26b6c3eca
Update translations
2015-08-26 13:56:19 +12:00
scott1702
4f05c4c4f8
Update the filtered tree styling
2015-08-25 13:02:20 +12:00
Damian Mooyman
a3f789c2b5
Update translations
2015-08-24 16:29:40 +12:00
Daniel Hensby
39ee2ec634
Merge branch '3.2' into 3
...
Conflicts:
lang/en.yml
2015-08-17 14:23:16 +01:00
Damian Mooyman
a1b9e99342
Update localisation
2015-08-04 13:02:52 +12:00
David Craig
cc3385b9f8
Move filters from panel to header
...
- The filters panel has been removed in favour of a search panel in the header
- Multi-select updated
- Renamed to Bulk actions
- Styles updated
- Added placeholder text / removed redundant option
- Now appears in SiteTree view too
2015-06-24 09:58:48 +12:00
Damian Mooyman
12bcf382ad
Update translations
2015-06-19 18:25:53 +12: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
Damian Mooyman
9d7a640205
Merge remote-tracking branch 'origin/3.1' into 3
2015-03-11 11:43:56 +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
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
Gander
6d50b26757
Update pl.yml for ContentController.StartEditing
...
For over a year, here is an error, resulting in the display of the broken link to the Polish version of CMS, after installation.
2014-08-26 21:43:41 +02: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
Nicolaas
7eeb59a52f
fix spelling of pages from pags to pages
...
fix spelling of pages from pags to pages
2014-08-07 20:33:19 +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
3162d0e664
API Update ErrorPage to respect new HTTP Error codes
2014-05-06 15:29:33 +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
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
Ingo Schommer
07033548fc
Merge remote-tracking branch 'origin/3.1'
2013-12-19 20:22:26 +01:00
Ingo Schommer
046a5fd6bb
Updated translation masters
2013-12-19 19:51:26 +01:00
Ingo Schommer
6f5d9927de
Updated translations
2013-12-19 18:05:19 +01:00
Andrew Short
e17fb17520
Merge branch '3.1'
...
Conflicts:
lang/es.yml
2013-11-11 18:24:03 +11:00
Ingo Schommer
e2fa3b7f2c
Updated translations
2013-11-08 00:59:07 +01:00
Ingo Schommer
42a55be91a
Updated translations
2013-10-10 12:34:15 +02:00
Ingo Schommer
dd29936fee
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:10:20 +02:00
Ingo Schommer
34a0fe3bf1
Chinese translation encoding
2013-10-08 12:20:21 +02:00
Ingo Schommer
6a8de3090c
Updated Te Reo translations
2013-10-08 11:37:43 +02:00
Ingo Schommer
0eb56f9650
Merge remote-tracking branch 'origin/3.1'
2013-10-07 16:19:55 +02:00
Ingo Schommer
aa44e710d0
Updated translations
2013-10-07 14:28:12 +02:00
Ingo Schommer
413e45881b
Updated translations
2013-10-07 01:18:15 +02:00
Ingo Schommer
6098457467
Updated master translation file
2013-10-06 23:25:58 +02:00
Ingo Schommer
7bab37cde3
Updated translations
2013-10-06 19:40:16 +02:00
Ingo Schommer
1a40994527
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
2013-10-06 19:07:52 +02:00
Ingo Schommer
2cb05428ff
Merge branch 'refs/heads/3.1.0' into 3.1
2013-10-06 19:06:36 +02:00
Ingo Schommer
e836bbb907
Renamed "ja_JP" locale to "ja"
...
Better compat with transifex with generic locale
2013-10-06 19:06:21 +02:00
Ingo Schommer
648c2072e8
updated translations
2013-10-04 12:38:27 +02:00
Ingo Schommer
c2a34ff4a7
Updated translations
2013-10-01 00:05:08 +02:00
Ingo Schommer
32478ab512
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
code/controllers/ReportAdmin.php
code/reports/Report.php
2013-09-27 19:07:13 +02:00
Ingo Schommer
553f32576d
Updated translations
2013-09-12 16:53:44 +02:00
Ingo Schommer
7ad9712f05
Merge remote-tracking branch 'origin/3.1'
2013-08-16 13:37:49 +02:00
Ingo Schommer
004dfa76b1
Updated translations
2013-08-09 14:53:17 +02:00
Ingo Schommer
d18bb858e3
Fixed share instructions wording in template
...
This also removed all the existing translations from Transifex
because the string changed.
2013-08-09 14:45:26 +02:00
Ingo Schommer
9a387f91ec
Updated translations
2013-08-09 12:47:44 +02:00
Ingo Schommer
a42c89a110
Merge remote-tracking branch 'origin/3.1'
2013-08-09 12:12:05 +02:00
Sam Minnee
8ad00a1004
Updated translation master file
2013-08-09 14:14:35 +12:00
Ingo Schommer
5eaeb7462a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
lang/en.yml
2013-08-07 17:20:28 +02:00
Ingo Schommer
3f118ef08f
Translations: Switch to Transifex format
...
- Based on new (last) translation download from getlocalization.com
- Removed untranslated strings. Getlocalization started including those at some point
which is highly annoying, unnecessary and breaks the new transfix system,
since it'll mark all of the english strings as actual translations
- Avoid dots in entities. It confuses the Transifex YML parser
- Removed some locales unknown to Transifex which didn't have any translations anyway
- Removed "lolcat" locale, uses custom notation (en@lolcal)
which SilverStripe's i18n system can't handle
(needs mapping from SS naming to Zend naming)
- Renamed "Te Reo/Maori" locale from "mi_NZ" to "mi" (Transifex/CLDR notation)
- Namespaced all entities used in templates (deprecated usage)
- Converted dots to underscores where template filenames are used for namespaces,
since Transifex YML parsing handles them as separate YML keys otherwise
- Removed whitespace in entity names, SilverStripe i18n can't handle it
2013-08-04 12:28:07 +02:00
