Commit Graph

321 Commits

Author SHA1 Message Date
Chris Joe
3c00c437f4 Merge pull request #1774 from open-sausages/pulls/4.0/6258-update-archive-warning-msg
ENHANCEMENT Update archive warning message
2017-04-06 09:20:08 +12:00
Damian Mooyman
8f8553a737 Update translations 2017-04-05 16:08:16 +12:00
Saophalkun Ponlu
5b90141c03 ENHANCEMENT Update archive warning message 2017-04-04 11:26:46 +12:00
Damian Mooyman
9374c3458c Update translations 2017-03-01 14:08:50 +13:00
Damian Mooyman
fa2b87172c
Upgrade cms for new i18n backend 2017-01-26 11:39:20 +13:00
Ingo Schommer
cfe23dd5aa Update translations 2017-01-17 16:11:43 +13:00
Daniel Hensby
7a296a541b
Merge branch '3' 2016-12-28 17:00:32 +00:00
Damian Mooyman
a26607ca56 Merge 3.5 into 3
# Conflicts:
#	lang/en.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/hr.yml
#	lang/it.yml
2016-12-22 13:24:17 +13:00
Daniel Hensby
0b952e277e
Merge branch '3.5' into 3 2016-12-19 11:56:55 +00:00
Dan Hensby
36287b09d0 Update translations 2016-12-16 20:49:04 +00:00
Daniel Hensby
f833bb53c3
Merge branch '3.4' into 3.5 2016-12-16 16:46:28 +00:00
Damian Mooyman
224b2a4cba BUG Fix localisation issues in CMS 2016-12-07 12:15:54 +13:00
Daniel Hensby
ca76b9488f
Merge branch '3.4' into 3.5 2016-11-28 14:01:01 +00:00
Dan Hensby
de19c643fb Update translations 2016-11-28 12:35:17 +00:00
Dan Hensby
285c4921a7 Update translations 2016-11-21 13:51:27 +00:00
Dan Hensby
aab7d30ab0 Update translations 2016-11-21 13:27:57 +00:00
Dan Hensby
cca147513a Update translations 2016-11-09 11:32:19 +00:00
Damian Mooyman
35b38ff29c Update translations 2016-11-03 13:36:56 +13:00
Damian Mooyman
6524d60f75 Update translations 2016-09-23 14:02:58 +12:00
Christopher Joe
4b3f4ba01c move BackLinkHTMLList to template 2016-09-19 10:43:39 +12:00
Daniel Hensby
91444b8016
Merge branch '3' 2016-09-07 11:28:05 +01:00
Damian Mooyman
bffab11a54 Update translations 2016-08-15 18:27:31 +12:00
Damian Mooyman
9f86315330 Update translations 2016-08-15 15:49:50 +12:00
Damian Mooyman
5f07e193fa Update translations 2016-08-05 17:57:46 +12:00
Damian Mooyman
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
Damian Mooyman
8284fdc4ca Update translations 2016-08-05 16:13:13 +12:00
Damian Mooyman
99b3346316 Merge 3.2 into 3.3 2016-08-05 14:36:30 +12:00
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
Daniel Hensby
a3d7d986a7
Merge branch '3' 2016-06-13 14:38:08 +01:00
Damian Mooyman
1ea9444be9 Update translations 2016-06-02 17:07:41 +12:00
Damian Mooyman
f5b00786d6 Update translations 2016-05-19 14:48:39 +12:00
Damian Mooyman
c58d8bdedc Update translations 2016-05-12 15:37:09 +12:00
Damian Mooyman
4571779213 Update translations 2016-05-11 11:05:57 +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
Julian Seidenberg
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
Daniel Hensby
4207e9bae9
Update translations 2016-05-05 12:47:36 +01:00
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