Myles Beardsmore
06730bc1b3
updated field name for caption text field.
2015-05-28 13:34:59 +01:00
Damian Mooyman
50e33b8e5e
Merge remote-tracking branch 'origin/3.1.13' into 3.1
2015-05-28 19:08:12 +12:00
Damian Mooyman
04b803dfc6
Added 3.1.13 changelog
2015-05-28 18:59:11 +12:00
Damian Mooyman
f55eb5e2cf
Merge pull request #4236 from nyeholt/fix_hostname-whitelist
...
FIX Allow users to specify allowed hosts
2015-05-28 18:09:59 +12:00
Marcus Nyeholt
9c8fa51321
FIX Allow users to specify allowed hosts
...
Allow users to explicitly state which Hosts are allowed to be requested via
this application instance to avoid Host: header forgery attacks.
2015-05-28 15:58:39 +10:00
Hamish Friedlander
b21fd8480a
Merge pull request #4233 from tractorcow/3.1.13
...
Fix merge / test regressions
2015-05-28 17:01:12 +12:00
Damian Mooyman
0a8f328947
Fix merge / test regressions
2015-05-28 16:59:05 +12:00
Damian Mooyman
e8d652b1aa
Merge pull request #4234 from michalkleiner/patch-2
...
DOCS Fixed code example for Requirements::set_write_js_to_body call
2015-05-28 16:06:58 +12:00
Michal Kleiner
4843913f31
Update 03_Requirements.md
...
Fixed code example for setting write_js_to_body value to false
2015-05-28 14:28:05 +12:00
Damian Mooyman
a978b891e1
BUG Fix handling of empty parameter token
2015-05-28 10:13:10 +12:00
Damian Mooyman
75137dbab2
Ensure only trusted proxy servers have control over certain HTTP headers
2015-05-28 10:12:46 +12:00
Damian Mooyman
22a35e48a9
BUG Fix malformed urls redirecting to external sites
2015-05-28 10:12:18 +12:00
Damian Mooyman
79cfa2bb64
Bug fix sqlquery select
2015-05-28 10:11:32 +12:00
Loz Calver
50d88edd37
Merge pull request #4230 from 3Dgoo/patch-1
...
Fixed typo in GridField API doc
2015-05-27 10:43:58 +01:00
3Dgoo
23c098cd20
Fixed typo in GridField API doc
2015-05-27 10:04:16 +09:30
Damian Mooyman
d43115e320
Merge pull request #4220 from gregsmirnov/pulls/fix-setting-Page-LastEdited-from-fixture-2
...
BUG Fixed setting LastEdited for DataObject with class ancestry
2015-05-26 13:48:48 +12:00
Loz Calver
cc6a2ef757
Merge pull request #4219 from gregsmirnov/pulls/3.1/fixed-filesystem-mkdir-expects-one-parameter
...
Fixed Filesystem::mkdir() expects one parameter
2015-05-22 21:32:27 +01:00
Will Morgan
ba98c74df9
Merge pull request #4214 from rotassator/patch-2
...
Template Syntax doco grammar cleanup
2015-05-22 10:35:20 +01:00
Gregory Smirnov
94f6a13729
BUG Fixed setting LastEdited for DataObject with class ancestry
2015-05-22 11:32:59 +02:00
Gregory Smirnov
bfa57af37e
Fixed Filesystem::mkdir() expects one parameter
2015-05-22 11:11:53 +02:00
Steve Dixon
63eb6c2a24
Template Syntax doco grammar cleanup
...
Some simple edits to improve some grammatical mistakes and consistency.
2015-05-21 12:56:26 +10:00
Ingo Schommer
85cff0ad8f
Merge pull request #4210 from gregsmirnov/pulls/fix-transliterator-for-polish-locale
...
fixed Transliterator for pl_PL letters
2015-05-21 08:17:47 +12:00
Gregory Smirnov
77a50d153e
fixed Transliterator for pl_PL letters
2015-05-20 19:05:48 +02:00
Damian Mooyman
d0e0e75935
Merge pull request #4197 from mthomsonnz/patch-1
...
DOCS: Fix 404 errors on all lesson links
2015-05-19 15:24:12 +12:00
Matt Thomson
f5a72783a8
Fix 404 errors on all lesson links
2015-05-19 14:05:12 +12:00
Damian Mooyman
0ba3ada15b
Merge pull request #4191 from jonom/changefieldorder-fix
...
BUG: FieldList::changeFieldOrder() leftovers discarded
2015-05-18 11:35:03 +12:00
Damian Mooyman
07f42f179d
Merge pull request #4192 from patricknelson/pr-list-typo
...
Fixed typo in SS_List ->toArray() return type.
2015-05-18 10:26:56 +12:00
Patrick Nelson
b43d79cff5
Fixed typo in SS_List ->toArray() return type.
2015-05-17 18:24:24 -04:00
Jonathon Menz
c6bcfea3e3
BUG: FieldList::changeFieldOrder() leftovers discarded
...
Logical error. Use of + operator means items from second array are only merged if the key does not already appear in the first array. The first array has numeric keys 0,1,2 etc. The second array is keyed by field name, but array_values() resets the keys to be numberic starting at 0. This means that some or all leftovers are discarded instead of appended.
2015-05-17 09:09:35 -07:00
Damian Mooyman
c1d500dedc
Added 3.1.13-rc1 changelog
2015-05-14 14:34:09 +12:00
Damian Mooyman
69a244e03f
Update translations
2015-05-14 13:45:03 +12:00
Damian Mooyman
a96b100fe2
Merge pull request #4182 from assertchris/add-better-scrutinizer-support
...
Added better Scrutinizer support
2015-05-14 11:49:25 +12:00
Damian Mooyman
102ef033f9
Merge pull request #4183 from flashbackzoo/pulls/fix-panel-collapse
...
Fix behaviour of panels
2015-05-14 10:37:43 +12:00
David Craig
232ed3cb4f
Fix panel collapse
2015-05-13 10:15:50 +12:00
Christopher Pitt
a868b6b1dc
Added better Scrutinizer support
2015-05-12 23:27:36 +12:00
Loz Calver
3b7aff28d5
Merge pull request #3946 from dhensby/pulls/php-7-tests
...
Test against php 7
2015-05-12 11:40:12 +01:00
Daniel Hensby
069bf40f34
Test against php 7
2015-05-12 11:12:47 +01:00
Damian Mooyman
3907688f7d
Merge pull request #4164 from wilr/fixssreportarraylist
...
FIX: Modifications to GridFieldExportButton to allow ArrayList use in SS_Report
2015-05-11 19:17:40 +12:00
Ingo Schommer
2ea8dd86e1
Merge pull request #4176 from tractorcow/pulls/3.1/fix-combine-media
...
Fix missing media parameter on Requirements::combine_files
2015-05-11 17:36:44 +12:00
Damian Mooyman
b195132407
Fix missing media parameter on Requirements::combine_files
...
Regression from #4136
2015-05-11 17:30:59 +12:00
Will Rossiter
85c51167c0
Merge pull request #4136 from nikrolls/requirements-docblock-improvements
...
Documentation tidy for Requirements.php
2015-05-11 15:08:26 +12:00
Damian Mooyman
11f13119c6
Merge pull request #4161 from assertchris/improve-iis-security
...
Improve IIS security
2015-05-11 12:10:22 +12:00
Christopher Pitt
8d51eea66f
Improve IIS security
2015-05-11 12:01:30 +12:00
Damian Mooyman
dca8e2ad52
Merge pull request #4171 from dhensby/pulls/having-count
...
SQLQuery::Count errors with having clause
2015-05-08 09:37:48 +12:00
Aram Balakjian
be10d90cc5
BUG count breaks when having clause defined
2015-05-07 21:26:12 +01:00
Daniel Hensby
e94c2a944e
Test to prove having count issue
2015-05-07 21:26:11 +01:00
Will Rossiter
828ad6eeca
FIX: Modifications to GridFieldExportButton to allow ArrayList use in SS_Report
2015-05-07 08:43:22 +12:00
Loz Calver
5f5662b069
Merge pull request #4159 from marijnkampf/patch-1
...
Fix link
2015-05-05 13:54:34 +01:00
Marijn Kampf
18fb548fd2
Fix link
2015-05-05 12:13:08 +01:00
Damian Mooyman
cd794a78ac
Merge pull request #4151 from xini/patch-1
...
fix typo
2015-05-04 13:49:07 +12:00
