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