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 |
|