ca76b9488f
Merge branch '3.4' into 3.5
2016-11-28 14:01:01 +00:00
de19c643fb
Update translations
2016-11-28 12:35:17 +00:00
285c4921a7
Update translations
2016-11-21 13:51:27 +00:00
aab7d30ab0
Update translations
2016-11-21 13:27:57 +00:00
cca147513a
Update translations
2016-11-09 11:32:19 +00:00
35b38ff29c
Update translations
2016-11-03 13:36:56 +13:00
6524d60f75
Update translations
2016-09-23 14:02:58 +12:00
4b3f4ba01c
move BackLinkHTMLList to template
2016-09-19 10:43:39 +12:00
91444b8016
Merge branch '3'
2016-09-07 11:28:05 +01:00
bffab11a54
Update translations
2016-08-15 18:27:31 +12:00
9f86315330
Update translations
2016-08-15 15:49:50 +12:00
5f07e193fa
Update translations
2016-08-05 17:57:46 +12:00
afc9bb0dc6
Merge 3.3 into 3.4
...
# Conflicts:
# code/controllers/CMSPageHistoryController.php
# code/controllers/SilverStripeNavigator.php
# lang/bg.yml
# lang/cs.yml
# lang/it.yml
# lang/sk.yml
2016-08-05 16:46:35 +12:00
8284fdc4ca
Update translations
2016-08-05 16:13:13 +12:00
99b3346316
Merge 3.2 into 3.3
2016-08-05 14:36:30 +12:00
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
6477e24219
Update translations
2016-08-05 11:06:51 +12:00
a3d7d986a7
Merge branch '3'
2016-06-13 14:38:08 +01:00
1ea9444be9
Update translations
2016-06-02 17:07:41 +12:00
f5b00786d6
Update translations
2016-05-19 14:48:39 +12:00
c58d8bdedc
Update translations
2016-05-12 15:37:09 +12:00
4571779213
Update translations
2016-05-11 11:05:57 +12:00
dd0163ae00
Update translations
2016-05-11 11:05:37 +12:00
03c628345b
Update translations
2016-05-11 10:58:24 +12:00
9169b11b8f
MINOR Correcting the default HTML so TinyMCE doesn't auto-clean it upon first viewing of a new database ( fixes #1473 )
2016-05-06 11:24:03 +12:00
4207e9bae9
Update translations
2016-05-05 12:47:36 +01:00
228c406e64
Merge remote-tracking branch '3.2.4' into 3.3.2
2016-05-05 12:33:08 +01:00
ce3575e362
Update translations
2016-05-05 12:25:44 +01:00
5cbfad4aea
Merge remote-tracking branch 'origin/3.1.19' into 3.2.4
2016-05-05 12:25:13 +01:00
2d10c94049
Update translations
2016-05-05 10:24:15 +01:00
b4c4c636f2
Merge remote-tracking branch 'origin/3'
2016-03-04 17:07:23 +13:00
ffdfac6af4
Merge branch '3.2' into 3.3
...
# Conflicts:
# lang/en.yml
# lang/sk.yml
2016-02-29 16:47:11 +13:00
2406881d3e
Merge remote-tracking branch 'origin/3.3.1' into 3.3
...
# Conflicts:
# lang/cs.yml
2016-02-29 16:44:01 +13:00
1eed3608ad
Merge branch '3.1' into 3.2
...
# Conflicts:
# code/controllers/CMSMain.php
2016-02-29 16:41:01 +13:00
77d506547c
Update translations
2016-02-29 15:01:55 +13:00
80959dc441
Update translations
2016-02-29 15:01:10 +13:00
e6f9e71a0f
Update translations
2016-02-29 14:57:30 +13:00
05a9c760f8
Update translations
2016-02-27 20:38:29 +13:00
a89debb962
Update translations
2016-02-27 20:38:19 +13:00
be980a50fc
Update translations
2016-02-27 20:35:10 +13:00
99c72fce5f
Merge remote-tracking branch 'origin/3'
2016-02-25 14:52:55 +13:00
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
a5444c3eeb
Update translations
2016-02-24 16:06:03 +13:00
4c3761f42c
Update translations
2016-02-24 15:20:40 +13:00
4849aa828e
Update translations
2016-02-24 15:14:58 +13:00
33bf5f9519
Update translations
2016-02-19 10:54:36 +13:00
42cedb70b9
Update translations
2016-02-19 10:21:02 +13:00
c43b84573b
Update translations
2016-02-09 17:45:20 +13:00
0a2456e71e
Merge remote-tracking branch 'origin/3'
2016-01-25 16:16:53 +13:00
0cc49cb27a
Update translations
2016-01-25 15:06:55 +13:00
93acf4b39a
Update translations
2016-01-21 14:22:35 +13:00
d387d4f311
Update translations
2015-12-23 13:22:38 +13:00
15685d85ab
Merge remote-tracking branch 'origin/3.2' into 3
2015-12-22 14:10:52 +13:00
a40c8e034a
Update translations
2015-11-16 16:01:51 +13:00
5925883330
Update translations
2015-11-16 15:08:39 +13:00
73377a7a92
Update translations
2015-11-11 17:06:44 +13:00
ebed1d22e5
Update translations
2015-11-11 16:07:20 +13:00
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
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
d8915115f8
Update translations
2015-10-06 18:33:16 +13:00
0df0f35278
Update translations
2015-09-18 14:21:19 +12:00
6e72bd2cf8
Update translations
2015-09-15 10:51:27 +12:00
ce212972c8
Update translations
2015-09-15 10:42:32 +12:00
105b3c60d1
Update translations
2015-09-15 10:33:25 +12:00
b7ad568644
Merge remote-tracking branch 'origin/3.2' into 3
2015-09-09 14:50:28 +12:00
353e5938de
Update translations
2015-09-02 11:15:52 +12:00
b26b6c3eca
Update translations
2015-08-26 13:56:19 +12:00
4f05c4c4f8
Update the filtered tree styling
2015-08-25 13:02:20 +12:00
a3f789c2b5
Update translations
2015-08-24 16:29:40 +12:00
39ee2ec634
Merge branch '3.2' into 3
...
Conflicts:
lang/en.yml
2015-08-17 14:23:16 +01:00
a1b9e99342
Update localisation
2015-08-04 13:02:52 +12:00
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
12bcf382ad
Update translations
2015-06-19 18:25:53 +12:00
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
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
0557c0d47b
Update translations
2015-05-14 13:52:21 +12:00
9d7a640205
Merge remote-tracking branch 'origin/3.1' into 3
2015-03-11 11:43:56 +13:00
c238e1e15b
Update translations
2015-03-09 17:11:50 +13:00
21e2bc7258
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
code/reports/Report.php
2015-02-20 10:16:37 +13:00
c7814cffc9
Update translations
2015-02-16 11:54:06 +13:00
475b6d18e5
Merge remote-tracking branch 'composer/3.1' into 3
2015-01-15 17:48:11 +13:00
ee4639ed74
Update translations
2015-01-12 17:52:29 +13:00
d01883a5f8
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
code/model/SiteConfig.php
2014-11-18 12:45:42 +13:00
708e70624c
Update translations
2014-11-08 17:06:10 +13:00
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
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
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
407033b076
Update translations
2014-08-05 15:01:52 +12:00
0b296b3665
Merge remote-tracking branch 'origin/3.1'
2014-06-15 22:50:35 +12:00
3033d45498
Updated translation masters
2014-05-13 11:13:44 +12:00
6a69134fb0
Merge remote-tracking branch 'origin/3.1'
2014-05-12 11:33:44 +12:00
bae95805dd
Updated translation masters
2014-05-07 10:03:15 +12:00
3162d0e664
API Update ErrorPage to respect new HTTP Error codes
2014-05-06 15:29:33 +12:00
ecda66a1c4
Merge remote-tracking branch 'origin/3.1'
2014-04-02 17:39:47 +13:00
755f4f1557
Updated translation master
2014-03-31 14:23:47 +13:00
889e97e17d
Merge remote-tracking branch 'origin/3.1'
2014-02-18 22:06:56 +13:00
ca37dc8e69
Updated translations
2014-02-18 11:50:04 +13:00
07033548fc
Merge remote-tracking branch 'origin/3.1'
2013-12-19 20:22:26 +01:00
046a5fd6bb
Updated translation masters
2013-12-19 19:51:26 +01:00
6f5d9927de
Updated translations
2013-12-19 18:05:19 +01:00
e17fb17520
Merge branch '3.1'
...
Conflicts:
lang/es.yml
2013-11-11 18:24:03 +11:00
e2fa3b7f2c
Updated translations
2013-11-08 00:59:07 +01:00
42a55be91a
Updated translations
2013-10-10 12:34:15 +02:00
dd29936fee
Merge remote-tracking branch 'origin/3.1'
2013-10-10 12:10:20 +02:00
34a0fe3bf1
Chinese translation encoding
2013-10-08 12:20:21 +02:00
6a8de3090c
Updated Te Reo translations
2013-10-08 11:37:43 +02:00
0eb56f9650
Merge remote-tracking branch 'origin/3.1'
2013-10-07 16:19:55 +02:00
aa44e710d0
Updated translations
2013-10-07 14:28:12 +02:00
413e45881b
Updated translations
2013-10-07 01:18:15 +02:00
6098457467
Updated master translation file
2013-10-06 23:25:58 +02:00
7bab37cde3
Updated translations
2013-10-06 19:40:16 +02:00
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
2cb05428ff
Merge branch 'refs/heads/3.1.0' into 3.1
2013-10-06 19:06:36 +02:00
e836bbb907
Renamed "ja_JP" locale to "ja"
...
Better compat with transifex with generic locale
2013-10-06 19:06:21 +02:00
648c2072e8
updated translations
2013-10-04 12:38:27 +02:00
c2a34ff4a7
Updated translations
2013-10-01 00:05:08 +02:00
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
553f32576d
Updated translations
2013-09-12 16:53:44 +02:00
7ad9712f05
Merge remote-tracking branch 'origin/3.1'
2013-08-16 13:37:49 +02:00
004dfa76b1
Updated translations
2013-08-09 14:53:17 +02:00
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
9a387f91ec
Updated translations
2013-08-09 12:47:44 +02:00
a42c89a110
Merge remote-tracking branch 'origin/3.1'
2013-08-09 12:12:05 +02:00
8ad00a1004
Updated translation master file
2013-08-09 14:14:35 +12:00
5eaeb7462a
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
lang/en.yml
2013-08-07 17:20:28 +02:00
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
ab0f83c48d
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
- Renamed "lolcat" locale from "lc_xx" to "en@lolcat" (Transifex/CLDR notation)
- 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 11:05:41 +02:00
8e7802f8a1
Fixed spelling mistake in SilverStripeNavigator
...
Thanks to Donald Rogers for pointing it out
2013-06-18 18:27:49 +02:00
5175352ed1
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-06-03 00:22:22 +02:00
46d62efd81
Updated translations
2013-06-03 00:14:09 +02:00
6117057c59
Update doRollback messages to work well with the new reverts.
...
Currently reverts are not creating the new versions anymore - they are
simply copying the Version over. Remove incorrect message about new
version creation and remove the "cancel draft changes" message that's
not correct.
2013-05-16 08:43:12 +12:00
b88f56dfd8
Reverted 04bb85a78d
2013-05-11 18:57:53 +00:00
878cf541b9
Better UI feedback on VirtualPage states ( fixes #1594 )
2013-04-16 11:56:33 +02:00
a43fac3ecf
Merge remote-tracking branch 'origin/3.0' into 3.1
2013-04-09 14:03:04 +02:00
6e2906d01e
API: remove static related classes, now staticpublisher module
2013-04-06 17:26:15 +13:00
04bb85a78d
Removed LOLCAT locale - sadly not supported by our translation infrastructure
...
It breaks the CMS when selected. If there's interest in maintaining it,
we can re-add. Fixes https://github.com/silverstripe/sapphire/issues/1457
2013-04-04 10:58:11 +02:00
2dd0e3f02e
NEW Restored duplicate and duplicated with children functionality, as in 2.4 See ticket #7602
...
Conflicts:
javascript/CMSMain.Tree.js
templates/Includes/CMSMain_TreeView.ss
2013-03-13 10:04:09 +01:00
306b0d77e4
Updated translations
2013-02-26 13:27:07 +01:00
e809e0775e
Updated translations
2013-02-18 01:20:00 +01:00
d0585e484a
Updated translations
2013-01-21 11:57:12 +01:00
cb96255e80
Removed direct sprintf() usage from _t() calls
...
Parameterized strings are easier to understand,
and more fail-proof, don't fatal out when not enough sprintf() args
2012-12-21 11:18:18 +01:00
83febeff12
Updated translations
2012-12-17 11:54:22 +01:00
5da4b5a0ce
Updating default en.yml translations
2012-11-07 11:43:31 +13:00
2ae5c497af
Updated translations
2012-11-05 11:55:51 +13:00
b00397968b
Tweaking text for "You can start editing" on successful install
2012-11-05 11:12:49 +13:00
0964a5b832
Updating default en.yml with updated entities
2012-11-05 11:08:35 +13:00
94c406139e
Updated translations
2012-09-11 12:03:18 +02:00
53fdafb473
NEW 7839 Support for documents as a file type in Files and images
2012-09-04 11:26:09 +12:00
8442ed0ecd
i18n for report table title (see #7798 )
2012-08-26 23:58:38 +02:00
6b6dfaed7b
Fixed i18n namespace for "Sync Files"
2012-08-26 23:58:38 +02:00
Daniel Hensby
Dan Hensby
Damian Mooyman
Christopher Joe
Daniel Hensby
Julian Seidenberg
Ingo Schommer
Damian Mooyman
Damian Mooyman
scott1702
David Craig
Gander
Mateusz Uzdowski
Nicolaas
Ingo Schommer
Andrew Short
Sam Minnee
Zauberfisch
Will Rossiter
jean
Sean Harvey