Damian Mooyman
7f61dbdea5
Merge pull request #4227 from scott1702/compass-compile
...
Update css to most recent changes
2015-05-25 10:50:33 +12:00
scott1702
2f2ba8600b
Run compass compile
2015-05-25 10:44:31 +12:00
Damian Mooyman
2936e55a1a
Merge pull request #4223 from kinglozzer/pulls/3923-groupeddropdownfield-validation
...
Add validation for GroupedDropdownField, validate against disabled items (closes #3923 )
2015-05-25 10:34:11 +12:00
Loz Calver
68d8df4e04
FIX: DropdownField didn't consider disabled items
2015-05-22 21:14:11 +01:00
Loz Calver
dfb9b76b95
Add validation for GroupedDropdownField ( closes #3923 )
2015-05-22 20:55:54 +01:00
Damian Mooyman
1b94aa2c04
Merge pull request #4204 from scott1702/tree-highlight
...
Updated SiteTree status overlay colours
2015-05-22 10:35:55 +12:00
scott1702
fe15016e2b
Updated SiteTree status overlay colours
2015-05-21 11:34:33 +12:00
Loz Calver
332350ff35
Merge pull request #4198 from scott1702/drag-drop
...
Change drag/drop icon and make them only appear on hover
2015-05-20 10:48:20 +01:00
scott1702
2670828cdc
Change drag/drop icons and only appear on hover
2015-05-20 11:00:16 +12:00
Kamran Vighio
20c9d6f02e
Implement validate() method for TextField to validate max length ( closes #4073 )
2015-05-19 09:36:51 +01:00
Damian Mooyman
a2ecb3f086
Merge pull request #4175 from stevie-mayhew/pulls/validation
...
FIX: remove validation type constraint from form fields for 3.2 release
2015-05-19 15:28:09 +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
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
d3f5d491e6
Merge pull request #4169 from kinglozzer/recompile-scss
...
Recompile SCSS
2015-05-08 08:52:29 +12: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
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
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
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
Stevie Mayhew
0d94cf15a5
UPDATE: change all instances of $this->request to use appropriate getter/setter
2015-04-30 11:04:08 +12:00
Damian Mooyman
ee7ff8b5cf
Merge pull request #4123 from flashbackzoo/pulls/toggle-description-files
...
Toggleable descriptions for files
2015-04-28 11:14:58 +12:00
David Craig
fa6f446867
Add styling to handle toggleable descriptions for files
2015-04-28 10:49:17 +12:00
Damian Mooyman
6c069ce7d5
Merge pull request #4094 from flashbackzoo/pulls/toggle-description
...
This adds the ability to toggle a field description
2015-04-24 13:42:34 +12:00
David Craig
3122226273
Add toggleable description to CMS fields
2015-04-24 11:40:29 +12:00
Daniel Hensby
178057aea2
Merge pull request #4066 from tractorcow/pulls/3.2/from-end-iterator
...
API Introduce $FromEnd variable for iterators
2015-04-09 08:40:27 +01:00
Damian Mooyman
e91606e494
API Introduce $FromEnd variable for iterators
2015-04-09 17:02:30 +12:00
Damian Mooyman
2cc9d02f75
Merge pull request #4034 from dhensby/pulls/debug-viewable-data-3
...
NEW ViewableData_Debugger implements __toString
2015-04-02 09:56:31 +13:00
Daniel Hensby
aea3512e61
Merge pull request #4051 from tractorcow/pulls/3/fix-security-returnurl
...
API Security better respects BackURL on login
2015-03-31 21:44:04 +01:00
Damian Mooyman
9aa60ed4f3
Merge pull request #4052 from Turnerj/feature-max-size-by-upload-type
...
FEATURE: Added maximum upload file size by type (on 3)
2015-04-01 09:32:56 +13:00
Turnerj
ae8dbe309b
FEATURE - Added maximum upload file size by type
...
This support is on both an instance level and a global default level.
2015-03-31 21:57:32 +10:30
Damian Mooyman
95c162ef0d
API Security better respects BackURL on login
...
BUG Restore missing authentication message not appearing in the login form $Content area (regression from #1807 )
2015-03-31 20:22:35 +13:00
Damian Mooyman
43f49e8434
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/ModelAdmin.php
control/Director.php
model/SQLQuery.php
security/Member.php
tests/control/HTTPTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
tests/view/SSViewerTest.php
2015-03-31 19:54:15 +13:00
Damian Mooyman
e81fdad14a
Merge pull request #4045 from flashbackzoo/pulls/gridfield
...
Don't submit when disabled buttons are clicked
2015-03-31 12:37:14 +13:00
David Craig
3a3c8c937b
Disable gridfield 'add' button when autocompleter is empty
2015-03-31 12:34:35 +13:00
Daniel Hensby
adbf9b80f7
Merge pull request #4046 from ehyland/patch-1
...
DOCS Updated example code
2015-03-30 10:56:07 +01:00
ehyland
77a51c79ab
Updated example code
...
Made class extend FunctionalTest.
2015-03-30 16:59:31 +11:00
Damian Mooyman
d71e2ea552
Merge pull request #4040 from halkyon/user-agent
...
BUG Check for existence of HTTP_USER_AGENT to avoid E_NOTICE error.
2015-03-26 13:19:02 +13:00
Sean Harvey
a7d3f89136
BUG Check for existence of HTTP_USER_AGENT to avoid E_NOTICE error.
...
In some cases, a request may not have an HTTP_USER_AGENT. This should
check the variable exists before attempting to check it. The specific
case where it failed for me was Active Directory Federation Services
sending a web request to a SilverStripe site, but failing because it
doesn't have an agent string.
2015-03-26 12:17:22 +13:00
Daniel Hensby
a4388f923b
Merge pull request #4036 from tractorcow/pulls/3.1/fix-auth-login
...
BUG Fix some database errors during dev/build where an auth token exists for the current user
2015-03-25 10:26:27 +00:00
Damian Mooyman
8d6cd1529f
BUG Fix some database errors during dev/build where an auth token exists for the current user
...
Fixes #3660
2015-03-25 11:34:13 +13:00
Daniel Hensby
16f0e7b0d3
NEW ViewableData_Debugger implements __toString
...
This fixes an issue were ViewableData can be 'debugged' and no information is output - related #4030
2015-03-24 10:40:25 +00:00
Loz Calver
ed4db4f135
Merge pull request #4031 from dhensby/pulls/detail-form-item-callback-fix
...
FIX GridFieldDetailForm::setItemEditFormCalback broke chaining
2015-03-23 16:42:23 +00:00
Daniel Hensby
aba0b70964
FIX GridFieldDetailForm::setItemEditFormCalback broke chaining
2015-03-23 15:16:09 +00:00
Daniel Hensby
06ccac1a2b
Merge branch 'jeffreyguo-patch-3' into 3.1
...
Fixes #4003
2015-03-23 10:15:53 +00:00
