Commit Graph

15303 Commits

Author SHA1 Message Date
Ingo Schommer
5609b9ae25 Merge pull request #5153 from tractorcow/pulls/3.2/imagick-travis
BUG Don't install imagick on php 5.3
2016-03-08 10:55:26 +13:00
Damian Mooyman
aa57427874 BUG Don't install imagick on php 5.3 2016-03-08 10:37:01 +13:00
Damian Mooyman
661e5ca03a Merge pull request #5152 from jonom/filesync-fix-3.2
FIX file sync removes folders with dot in name
2016-03-08 09:57:16 +13:00
Jonathon Menz
86b1c8fc28 FIX file sync removes folders with dot in name
Prevent file extension validation being applied to folders during sync (fixes #4746)
2016-03-07 12:27:18 -08:00
Damian Mooyman
6a2245474d BUG Fix FulltextsearchEnable 2016-03-07 14:47:20 +13:00
Damian Mooyman
f35786de0a Merge pull request #5123 from webbuilders-group/ImagickBackendFix
BUGFIX: Deleting images with ImagickBackend fails
2016-03-07 10:17:18 +13:00
Damian Mooyman
9a1793a7ef Merge pull request #5135 from chillu/pulls/3.2/dropdown-window-resize
Fix TreeDropdownField auto-close regression
2016-03-04 11:26:56 +13:00
Ingo Schommer
7bb6295c79 Fix TreeDropdownField auto-close regression
Causes build failures due to Behat not being able to select
a link from a dropdown in "Insert Media".

Follow on effect from triggering a window.resize event
when the window wasn't actually resized (in order to force a layout redraw).

See https://github.com/silverstripe/silverstripe-framework/pull/5087 for context
2016-03-03 17:54:07 +13:00
Damian Mooyman
ba8f984940 Merge pull request #5121 from dhensby/pulls/3.1/fix-ip-from-LB
FIX getIP from behind a load-balancer that adds many IPs to the header
2016-03-02 10:25:02 +13:00
Daniel Hensby
817b836870 FIX getIP from behind a load-balancer that adds many IPs to the header 2016-03-01 21:07:48 +00:00
Ingo Schommer
8f0bbcbc7b Merge pull request #4889 from dhensby/pulls/docs-version
DOCS Explicitly noting lack of PHP 7 support
2016-03-02 07:58:06 +13:00
Ryan McLaren
2079844647 BUGFIX: fixes "Uncaught ImagickException: Can not process empty Imagick object" when deleting an image 2016-03-01 12:19:23 -04:00
Daniel Hensby
b8c8875303 DOCS Explicitly noting lack of PHP 7 support 2016-03-01 10:14:14 +00:00
Ingo Schommer
ff5fd7a944 Merge pull request #5112 from tractorcow/pulls/3.2/update-docs-process
Improve documentation on documentation
2016-03-01 20:24:11 +13:00
Damian Mooyman
22c0025d47 Improve documentation on documentation 2016-03-01 12:18:11 +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
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
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
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
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
14aa497b80 Merge branch '3.2.3' into 3.2 2016-02-27 21:11: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
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
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
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
531b8b167b Added 3.2.2 changelog 2016-02-24 15:33:02 +13:00
Damian Mooyman
1fe7d029db Added 3.1.17 changelog 2016-02-24 15:31:12 +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