Commit Graph

14617 Commits

Author SHA1 Message Date
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
Daniel Hensby
ce5a8f2b41 NEW Cookie names with dots are now handled more gracefully 2015-05-12 10:49:58 +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
Stevie Mayhew
9e8a5c9ba5 FIX: remove validation type constraint from form fields for 3.2 release 2015-05-11 12:32:00 +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
Sam Minnée
3e88e1210d Merge pull request #4154 from tractorcow/pulls/3/fix-prepared-statements-beta
API Use mysql buffered statements
2015-05-08 14:37:35 +12:00
Damian Mooyman
e8d6f15f28 API Use mysql buffered statements
Avoids the usage of any MySQL Native Driver specific API
2015-05-08 13:23:53 +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
Damian Mooyman
d3f5d491e6 Merge pull request #4169 from kinglozzer/recompile-scss
Recompile SCSS
2015-05-08 08:52:29 +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
Loz Calver
8b4a9a3988 Store current page before marking tree nodes (fixes #4137, fixes silverstripe/silverstripe-cms#1135) 2015-05-07 16:01:24 +01:00
Loz Calver
f38836df37 Recompile SCSS 2015-05-07 12:38:18 +01:00
Sean Harvey
2a04713323 Merge pull request #4153 from tractorcow/pulls/3/filter-page-highlight
API Enable tree filter highlighting
2015-05-07 10:14:33 +12:00
Will Rossiter
828ad6eeca FIX: Modifications to GridFieldExportButton to allow ArrayList use in SS_Report 2015-05-07 08:43:22 +12:00
Damian Mooyman
9b1bea0d17 Merge pull request #4163 from kinglozzer/pulls/deprecation-versions
Change deprecation notice version for DataObject component methods
2015-05-07 08:35:23 +12:00
Loz Calver
d673fc1514 Change deprecation notice versions for DataObject component methods 2015-05-06 19:36:34 +01: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
a1676436b7 Merge pull request #4158 from scott1702/drag-drop-cursor
Change cursor for drag + drop icon on hover/active
2015-05-05 16:45:50 +12:00
scott1702
8107e86d01 Change cursor for drag + drop icon on hover/active 2015-05-05 16:43:47 +12:00
Damian Mooyman
37d6c829dd Merge pull request #4157 from kinglozzer/pulls/orm-null-limit
NEW: Allow 'null' limit for database queries (closes #3487)
2015-05-05 10:40:31 +12:00
Loz Calver
23fc498c27 NEW: Allow 'null' limit for database queries (closes #3487) 2015-05-04 22:50:33 +01:00
Damian Mooyman
8863797b76 API Enable tree filter highlighting
Decoupling of CMS / Framework
2015-05-04 17:06:16 +12:00
Damian Mooyman
cd794a78ac Merge pull request #4151 from xini/patch-1
fix typo
2015-05-04 13:49:07 +12:00
Florian Thoma
045b2c569a fix typo
customise instead of customize
2015-05-03 13:35:05 +10:00
Damian Mooyman
4cacebdb88 Merge pull request #4128 from assertchris/clean-up-label-field
Clean up LabelField
2015-05-01 10:10:12 +12:00
Christopher Pitt
e1df8ec2fc Clean up LabelField 2015-04-30 16:21:33 +12:00
Christopher Pitt
05c2d04b42 Clean up HeaderField 2015-04-30 16:19:58 +12:00
Damian Mooyman
204d3b1fec Merge pull request #4127 from assertchris/clean-up-hidden-field
Clean up HiddenField
2015-04-30 16:14:09 +12:00
Ingo Schommer
f275076908 Merge pull request #4141 from stevie-mayhew/pulls/getrequest
UPDATE: change all instances of $this->request to use appropriate getter/setter
2015-04-30 11:56:26 +12:00
Christopher Pitt
f1524d9d31 Clean up HiddenField 2015-04-30 11:53:50 +12:00
Christopher Pitt
4c6ec7afd9 Clean up LiteralField 2015-04-30 11:53:02 +12:00
Christopher Pitt
7963a0b870 Clean up EmailField 2015-04-30 11:52:49 +12:00
Christopher Pitt
53cf2929d4 Clean up TextareaField 2015-04-30 11:52:37 +12:00
Christopher Pitt
c59eb1bb70 Clean Up ToggleCompositeField 2015-04-30 11:52:21 +12:00