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
|
71bf14d590
|
Merge remote-tracking branch 'origin/3.1.18' into 3.1
|
2016-02-29 16:49:25 +13:00 |
|
Damian Mooyman
|
fb58233201
|
Added 3.3.1 changelog
|
2016-02-29 15:23:25 +13:00 |
|
Damian Mooyman
|
2147205dc1
|
Added 3.1.18 changelog
|
2016-02-29 15:10:05 +13:00 |
|
Damian Mooyman
|
a20654b49b
|
Update translations
|
2016-02-29 15:01:55 +13:00 |
|
Damian Mooyman
|
31e04862a8
|
Update translations
|
2016-02-29 14:57:30 +13:00 |
|
Damian Mooyman
|
6c74481462
|
Merge pull request #5104 from ntd/pr3
FIX Do not hang on nested parameters in search context
|
2016-02-29 10:29:05 +13:00 |
|
Nicola Fontana
|
29b35c7ccf
|
Do not hang on nested parameters in search context
Backport of 0b5a57389b for 3.2 that does not add a new API, as
required by #5056 to be semver compatible.
|
2016-02-28 21:40:34 +01: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
|
14aa497b80
|
Merge branch '3.2.3' into 3.2
|
2016-02-27 21:11:57 +13:00 |
|
Damian Mooyman
|
807377ad2d
|
Added 3.3.1-rc2 changelog
|
2016-02-27 21:02:09 +13:00 |
|
Damian Mooyman
|
3d2c87029c
|
Added 3.3.1-rc2 changelog
|
2016-02-27 21:01:57 +13:00 |
|
Damian Mooyman
|
80a6242912
|
Update translations
|
2016-02-27 21:01:57 +13:00 |
|
Daniel Hensby
|
b7b1aba3fb
|
FIX undeclared constant issue
|
2016-02-27 21:01:57 +13:00 |
|
Damian Mooyman
|
3c053bb85d
|
Added 3.2.3-rc2 changelog
|
2016-02-27 21:00:59 +13:00 |
|
Damian Mooyman
|
3f5c635353
|
Added 3.2.3-rc2 changelog
|
2016-02-27 21:00:46 +13:00 |
|
Damian Mooyman
|
6bbd50c917
|
Update translations
|
2016-02-27 21:00:46 +13:00 |
|
Daniel Hensby
|
c2a0e8945f
|
FIX undeclared constant issue
|
2016-02-27 21:00:45 +13:00 |
|
Damian Mooyman
|
cd05068814
|
Merge branch '3.1.18' into 3.1
|
2016-02-27 20:59:51 +13:00 |
|
Damian Mooyman
|
b77acaeeb7
|
Added 3.1.18-rc2 changelog
|
2016-02-27 20:53:23 +13:00 |
|
Damian Mooyman
|
9d9a6fc0e8
|
Added 3.1.18-rc2 changelog
|
2016-02-27 20:53:15 +13:00 |
|
Damian Mooyman
|
387264fbbb
|
Update translations
|
2016-02-27 20:53:15 +13:00 |
|
Daniel Hensby
|
bd48d89642
|
FIX undeclared constant issue
|
2016-02-27 20:53:15 +13:00 |
|
Damian Mooyman
|
4d6e8a4dbd
|
Merge pull request #5102 from dhensby/pulls/fix-proxy-host-header
BUG Fixing undeclared constant issue
|
2016-02-27 20:19:11 +13:00 |
|
Daniel Hensby
|
3d2fcf9087
|
Fixing undeclared constant issue
|
2016-02-26 14:45:07 +00:00 |
|
Damian Mooyman
|
a2c7524b85
|
Merge branch '3.1.18' into 3.1
|
2016-02-26 17:39:06 +13:00 |
|
Damian Mooyman
|
73780ce94e
|
Merge branch '3.2.3' into 3.2
|
2016-02-26 17:36:45 +13:00 |
|
Damian Mooyman
|
ae29576763
|
Merge branch '3.3.1' into 3.3
|
2016-02-26 17:35:42 +13:00 |
|
Damian Mooyman
|
a80c6e1e8c
|
Added 3.3.1-rc1 changelog
|
2016-02-26 17:30:07 +13:00 |
|
Damian Mooyman
|
8c12b6f992
|
Added 3.2.3-rc1 changelog
|
2016-02-26 17:25:00 +13:00 |
|
Damian Mooyman
|
9e0037d43e
|
Added 3.1.18-rc1 changelog
|
2016-02-26 17:13:49 +13:00 |
|
Damian Mooyman
|
0840f5d021
|
BUG Fix regressions in missing CSRF on print button
|
2016-02-26 17:05:56 +13:00 |
|
Damian Mooyman
|
2c1b934ba2
|
BUG Fix regression in gridfield get actions
|
2016-02-26 17:05:48 +13:00 |
|
Damian Mooyman
|
320c833fa1
|
BUG Fix regressions in missing CSRF on print button
|
2016-02-26 17:03:35 +13:00 |
|
Damian Mooyman
|
b0ad86bf8f
|
BUG Fix regression in gridfield get actions
|
2016-02-26 17:03:27 +13:00 |
|
Damian Mooyman
|
cc95703b18
|
BUG Fix regressions in missing CSRF on print button
|
2016-02-26 16:59:40 +13:00 |
|
Damian Mooyman
|
3dc0d0ee89
|
BUG Fix regression in gridfield get actions
|
2016-02-26 16:59:25 +13:00 |
|
Ingo Schommer
|
59026a7838
|
Merge pull request #5101 from open-sausages/pulls/3.3/fix-printbutton
BUG Fix regressions in missing CSRF on print button
|
2016-02-26 16:38:01 +13:00 |
|
Damian Mooyman
|
99ca2aa23d
|
BUG Fix regressions in missing CSRF on print button
|
2016-02-26 15:49:28 +13:00 |
|
Daniel Hensby
|
11ad3e17c1
|
Merge pull request #5099 from tractorcow/pulls/3.3/gridfield-csrf-regression
BUG Fix regression in gridfield get actions
|
2016-02-26 00:48:14 +00:00 |
|
Damian Mooyman
|
f7caccaa7a
|
BUG Fix regression in gridfield get actions
|
2016-02-26 12:35:00 +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
|
efa13eb10a
|
Merge remote-tracking branch 'origin/3.3.0' into 3.3
|
2016-02-24 17:27:19 +13:00 |
|
Damian Mooyman
|
ff5ed6efeb
|
Merge remote-tracking branch 'origin/3.2.2' into 3.2
|
2016-02-24 17:03:43 +13:00 |
|
Damian Mooyman
|
06d5050321
|
Merge remote-tracking branch 'origin/3.1.17' into 3.1
|
2016-02-24 16:54:18 +13:00 |
|
Damian Mooyman
|
0ec021dac8
|
Added 3.3.0 changelog
|
2016-02-24 16:30:34 +13:00 |
|
Damian Mooyman
|
301155b3e8
|
Update translations
|
2016-02-24 16:06:04 +13:00 |
|
Damian Mooyman
|
531b8b167b
|
Added 3.2.2 changelog
|
2016-02-24 15:33:02 +13:00 |
|