Damian Mooyman
|
b57fde6cff
|
Update translations
|
2016-08-15 17:44:52 +12:00 |
|
Damian Mooyman
|
bf19806f50
|
Update translations
|
2016-08-15 15:00:58 +12:00 |
|
Damian Mooyman
|
0d5ae23f2b
|
Merge 3.2 into 3.3
|
2016-08-05 14:36:35 +12:00 |
|
Damian Mooyman
|
cb39f2ef27
|
Merge 3.1 into 3.2
# Conflicts:
# admin/javascript/lang/cs.js
# admin/javascript/lang/de.js
# admin/javascript/lang/eo.js
# admin/javascript/lang/es.js
# admin/javascript/lang/fa_IR.js
# admin/javascript/lang/fi.js
# admin/javascript/lang/fr.js
# admin/javascript/lang/id.js
# admin/javascript/lang/id_ID.js
# admin/javascript/lang/it.js
# admin/javascript/lang/ja.js
# admin/javascript/lang/lt.js
# admin/javascript/lang/mi.js
# admin/javascript/lang/nb.js
# admin/javascript/lang/nl.js
# admin/javascript/lang/pl.js
# admin/javascript/lang/ro.js
# admin/javascript/lang/ru.js
# admin/javascript/lang/sk.js
# admin/javascript/lang/sl.js
# admin/javascript/lang/sr.js
# admin/javascript/lang/sr@latin.js
# admin/javascript/lang/sr_RS.js
# admin/javascript/lang/sr_RS@latin.js
# admin/javascript/lang/src/cs.js
# admin/javascript/lang/src/de.js
# admin/javascript/lang/src/eo.js
# admin/javascript/lang/src/es.js
# admin/javascript/lang/src/fa_IR.js
# admin/javascript/lang/src/fi.js
# admin/javascript/lang/src/fr.js
# admin/javascript/lang/src/id.js
# admin/javascript/lang/src/id_ID.js
# admin/javascript/lang/src/it.js
# admin/javascript/lang/src/ja.js
# admin/javascript/lang/src/lt.js
# admin/javascript/lang/src/mi.js
# admin/javascript/lang/src/nb.js
# admin/javascript/lang/src/nl.js
# admin/javascript/lang/src/pl.js
# admin/javascript/lang/src/ro.js
# admin/javascript/lang/src/ru.js
# admin/javascript/lang/src/sk.js
# admin/javascript/lang/src/sl.js
# admin/javascript/lang/src/sr.js
# admin/javascript/lang/src/sr@latin.js
# admin/javascript/lang/src/sr_RS.js
# admin/javascript/lang/src/sr_RS@latin.js
# admin/javascript/lang/src/sv.js
# admin/javascript/lang/src/zh.js
# admin/javascript/lang/sv.js
# admin/javascript/lang/zh.js
# javascript/lang/fa_IR.js
# javascript/lang/src/fa_IR.js
|
2016-08-05 11:41:04 +12:00 |
|
Damian Mooyman
|
9805544cee
|
Update translations
|
2016-08-05 11:06:51 +12:00 |
|
Damian Mooyman
|
f4c2a89d5a
|
Update translations
|
2016-05-11 11:05:57 +12:00 |
|
Damian Mooyman
|
c27cb2dae7
|
Update translations
|
2016-05-11 11:05:37 +12:00 |
|
Damian Mooyman
|
60644a5be8
|
Update translations
|
2016-05-11 10:58:25 +12:00 |
|
Daniel Hensby
|
840cd4f877
|
Update translations
|
2016-05-05 12:46:38 +01:00 |
|
Daniel Hensby
|
d1751e3310
|
Merge remote-tracking branch '3.2.4' into 3.3.2
|
2016-05-05 12:33:21 +01:00 |
|
Daniel Hensby
|
2edef65d7a
|
Update translations
|
2016-05-05 11:18:02 +01:00 |
|
Daniel Hensby
|
cf29b2c146
|
Merge remote-tracking branch '3.1.19' into 3.2.4
|
2016-05-05 11:17:45 +01:00 |
|
Daniel Hensby
|
686db04a0a
|
Update translations
|
2016-05-05 02:05:54 +01:00 |
|
Damian Mooyman
|
393a4788bf
|
Merge branch '3.2' into 3.3
|
2016-02-29 17:29:41 +13:00 |
|
Damian Mooyman
|
f7d49df258
|
Merge tag '3.2.3' into 3.2
Release 3.2.3
# Conflicts:
# lang/cs.yml
|
2016-02-29 17:27:00 +13:00 |
|
Damian Mooyman
|
24a6c53645
|
Merge branch '3.2' into 3.3
# Conflicts:
# admin/code/ModelAdmin.php
# lang/cs.yml
# lang/lt.yml
# lang/sk.yml
|
2016-02-29 17:03:22 +13:00 |
|
Damian Mooyman
|
4fbf0b0863
|
Merge remote-tracking branch 'origin/3.3.1' into 3.3
|
2016-02-29 17:01:26 +13:00 |
|
Damian Mooyman
|
2c1f837442
|
Merge branch '3.1' into 3.2
# Conflicts:
# docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
# docs/en/01_Tutorials/03_Forms.md
# docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
# docs/en/02_Developer_Guides/00_Model/10_Versioning.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
# docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
# docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/14_Files/index.md
# lang/cs.yml
# lang/fi.yml
# lang/sk.yml
|
2016-02-29 16:59:20 +13:00 |
|
Damian Mooyman
|
a20654b49b
|
Update translations
|
2016-02-29 15:01:55 +13:00 |
|
Damian Mooyman
|
3f18b2f8cd
|
Update translations
|
2016-02-29 15:01:10 +13:00 |
|
Damian Mooyman
|
31e04862a8
|
Update translations
|
2016-02-29 14:57:30 +13:00 |
|
Damian Mooyman
|
8a8d82cc57
|
Merge branch '3.3.1' into 3.3
# Conflicts:
# lang/cs.yml
|
2016-02-27 21:19:29 +13:00 |
|
Damian Mooyman
|
80a6242912
|
Update translations
|
2016-02-27 21:01:57 +13:00 |
|
Damian Mooyman
|
6bbd50c917
|
Update translations
|
2016-02-27 21:00:46 +13:00 |
|
Damian Mooyman
|
387264fbbb
|
Update translations
|
2016-02-27 20:53:15 +13:00 |
|
Damian Mooyman
|
5f2d3f31d7
|
Merge remote-tracking branch 'origin/3.2' into 3.3
# Conflicts:
# dev/DevelopmentAdmin.php
# docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
# lang/cs.yml
# lang/lt.yml
|
2016-02-24 17:29:06 +13:00 |
|
Damian Mooyman
|
301155b3e8
|
Update translations
|
2016-02-24 16:06:04 +13:00 |
|
Damian Mooyman
|
01c13bf6b3
|
Update translations
|
2016-02-24 15:20:40 +13:00 |
|
Damian Mooyman
|
50aab6d8d4
|
Update translations
|
2016-02-24 15:14:58 +13:00 |
|
Damian Mooyman
|
3738436d0e
|
Update translations
|
2016-02-19 10:54:36 +13:00 |
|
Damian Mooyman
|
cfd1a5d696
|
Update translations
|
2016-02-19 10:21:03 +13:00 |
|
Damian Mooyman
|
adc7a59108
|
Update translations
|
2016-02-09 17:45:21 +13:00 |
|
Damian Mooyman
|
d754884214
|
Update translations
|
2016-02-04 11:03:41 +13:00 |
|
Damian Mooyman
|
75493e79ff
|
Update translations
|
2016-01-25 15:06:55 +13:00 |
|
scott1702
|
e4222d8186
|
Add default action from batch actions
|
2016-01-22 16:02:27 +13:00 |
|
Damian Mooyman
|
952896e638
|
Update translations
|
2015-12-23 13:22:38 +13:00 |
|
Damian Mooyman
|
3fe8b7479c
|
Update translations
|
2015-11-16 16:01:52 +13:00 |
|
Damian Mooyman
|
8eb583cda0
|
Update translations
|
2015-11-16 15:08:39 +13:00 |
|
Damian Mooyman
|
e68eb7e45d
|
Update translations
|
2015-11-11 17:06:45 +13:00 |
|
Damian Mooyman
|
b338efe5a7
|
Update translations
|
2015-11-11 16:07:20 +13:00 |
|
Damian Mooyman
|
e07f80014c
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
lang/cs.yml
lang/sk.yml
|
2015-11-03 11:10:46 +13:00 |
|
Damian Mooyman
|
0cd3569fb9
|
Update translations
|
2015-10-06 18:33:16 +13:00 |
|
Damian Mooyman
|
7f71a2ccfe
|
Update translations
|
2015-09-18 14:21:20 +12:00 |
|
Damian Mooyman
|
c4710b2272
|
Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
admin/code/GroupImportForm.php
admin/code/MemberImportForm.php
tests/model/DataListTest.php
|
2015-09-15 13:18:47 +12:00 |
|
Damian Mooyman
|
00caeb700d
|
Added 3.1.14 changelog
Update translations
|
2015-09-15 10:58:15 +12:00 |
|
Damian Mooyman
|
92f9af1984
|
Update translations
|
2015-09-02 11:15:53 +12:00 |
|
Damian Mooyman
|
840c1b1615
|
Update translations
|
2015-08-26 13:56:19 +12:00 |
|
Damian Mooyman
|
f220adc3e0
|
Update translations
|
2015-08-24 16:52:39 +12:00 |
|
Damian Mooyman
|
102892e247
|
Update translations
|
2015-08-04 13:02:20 +12:00 |
|
Damian Mooyman
|
bc8bc7d0c5
|
Update translations
|
2015-06-19 18:18:00 +12:00 |
|