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
ee6c08a0e4
Merge remote-tracking branch 'origin/3.3' into 3
2016-02-29 17:16:13 +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
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
9050761f17
Added 3.2.3 changelog
2016-02-29 15:22:39 +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
3f18b2f8cd
Update translations
2016-02-29 15:01:10 +13:00
Damian Mooyman
31e04862a8
Update translations
2016-02-29 14:57:30 +13:00
mikeyc7m
be2769244f
fix to support facebook autodiscover
...
the autodiscover function was failing on facebook because it returned the wrong match. also added a thumbnail lookup for facebook.
2016-02-29 12:19:34 +11: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#5056 to be semver compatible.
2016-02-28 21:40:34 +01:00
Matthew Hailwood
5810ecf7b9
Populate foreign key before getting CMS fields
...
In it's current state you need to revert to something like `Session::get('CMSMain.currentPage')` to get the foreign key of what the item you are creating relates to (e.g. a Book => has_many Author) - if you create a new Author you may need to reference the owning Book in the `getCMSFields` function.
This is just a small quality of life buff that populates that foreign key before calling `getCMSFields()` rather than after.
This should not break backwards compatibility in any way and isn't exactly a new feature so could be considered a bug fix.
2016-02-28 20:56:10 +13:00
Damian Mooyman
2b26511faa
Merge branch '3.3' into 3
2016-02-27 21:20:15 +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
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
d27be2b325
Merge branch '3.3' into 3
...
# Conflicts:
# javascript/GridField.js
2016-02-26 17:45:06 +13: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
