Commit Graph

16695 Commits

Author SHA1 Message Date
Hamish Friedlander
a2cc0690da Merge pull request #5741 from open-sausages/pulls/4.0/namespace-security
API Apply SilverStripe\Security namespace
2016-07-07 13:24:38 +12:00
Damian Mooyman
af22a83166 API Apply Framework\Security namespace 2016-07-07 11:32:28 +12:00
Damian Mooyman
1c4900969f Merge pull request #5778 from assertchris/check-for-resource-before-closing-mysql-connection
Checking for resource before closing MySQL connection
2016-07-07 10:33:17 +12:00
assertchris
8b4311f020 Checking for resource before closing MySQL connection 2016-07-07 10:01:33 +12:00
Damian Mooyman
20efb0e8e1 Merge pull request #5687 from silverstripe-terraformers/fixes/new-node-class
remove adding "original classes"
2016-07-06 23:30:11 +12:00
Christopher Joe
b8d634166f remove adding "original classes" 2016-07-06 21:44:11 +12:00
Chris Joe
dfe375e87e Fix MemberDatetime helper description, and shifted them to templates (#5766)
* Fix MemberDatetime helper description, and shifted them to templates

* added descriptionTemplate for setting the description

* Unit test for description with templates
2016-07-06 09:16:27 +01:00
Daniel Hensby
7a1914e645 Merge pull request #5775 from SilbinaryWolf/fix-listboxwrite
FIX calling $record->write() on ListboxField::saveInto breaks other 3rd party fields that write to an UnsavedRelationList.
2016-07-06 09:14:05 +01:00
Jake Bentvelzen
9afd602007 FIX calling $record->write() breaks other 3rd party fields that write to an UnsavedRelationList. 2016-07-06 09:42:06 +10:00
Daniel Hensby
5ba1c477e6 Merge pull request #5751 from open-sausages/pulls/4.0/better-tree-hint
BUG Don't hard-code folder into treedropdownfield search hint
2016-07-05 20:42:48 +01:00
Daniel Hensby
a449045b09
Merge branch '3.4' into 3 2016-07-04 23:54:27 +01:00
Daniel Hensby
c35dc508cb
Merge branch '3.3' into 3.4 2016-07-04 23:53:55 +01:00
Daniel Hensby
dfc557afd4
Merge branch '3.2' into 3.3 2016-07-04 23:43:44 +01:00
Damian Mooyman
4bf601ec1f Merge pull request #5761 from dhensby/pulls/3.2/fix-shortcode-parsing
[3.2] FIX Parse shortcodes in template helpers
2016-07-05 10:36:20 +12:00
Daniel Hensby
39238d908e
FIX falsey attribute values in shortcodes now work 2016-07-04 15:17:24 +01:00
Daniel Hensby
765f45eaf1
Check for shortcode tag before trying to parse shortcodes 2016-07-04 15:10:42 +01:00
Daniel Hensby
2cdfe6cc21
FIX Use RAW for DBField template helpers 2016-07-04 14:39:56 +01:00
Daniel Hensby
b0f237bb3a
FIX Use RAW instead of Value for parsing shortcodes 2016-07-04 13:53:56 +01:00
Daniel Hensby
e7da798914 Merge pull request #5770 from tractorcow/pulls/3/restore-icons
BUG Fix missing icons (3 branch)
2016-07-04 10:27:02 +01:00
Daniel Hensby
3cb8b5cae5 Merge pull request #5769 from tractorcow/pulls/3.4/restore-icons
BUG Fix missing icons (3.4 branch)
2016-07-04 10:26:55 +01:00
Damian Mooyman
efd35045ec Merge pull request #5768 from silverstripe-terraformers/fixes/xml-unittest-fix
Fix unit test for xml content check
2016-07-04 18:11:56 +12:00
Damian Mooyman
0b7dab3f66 BUG Fix missing icons
Fixes #5657
2016-07-04 18:09:22 +12:00
Damian Mooyman
637167f2f9 BUG Fix missing icons
Fixes #5657
2016-07-04 18:07:11 +12:00
Daniel Hensby
53ffc1a0db NEW Defining byID functions in SS_Filterable 2016-07-04 17:48:22 +12:00
Damian Mooyman
4dadc276b5 Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
2016-07-04 17:35:47 +12:00
Christopher Joe
1931ed497f Fix unit test for xml content check 2016-07-04 17:25:53 +12:00
Damian Mooyman
4a22c2bd78 BUG Revert incorrect class rename (#5765) 2016-07-04 16:32:45 +12:00
Daniel Hensby
ee326f6394
Merge branch 'hailwood/patch-5' into 3 2016-07-01 14:53:02 +01:00
Matthew Hailwood
4f0969f119
Make lost password url a config option like login_url and logout_url
Also makes the login_url, logout_url and new lost_password_url functions
return their link relative to the base url rather than assuming the base tag
2016-07-01 14:47:51 +01:00
Ingo Schommer
ff846134f2 Merge pull request #5734 from open-sausages/pulls/4.0/namespace-orm
API Apply Framework\ORM Namespace to model
2016-07-01 15:04:47 +12:00
Damian Mooyman
efef025027
BUG Fix missing use statements
BUG Fix incorrect method visibility on SS_Database
BUG Fix obvious PHPDoc errors in SilverStripe\ORM\FieldType
BUG Fix incorrect case on some method invocations
API Remove some deprecated code
2016-07-01 14:26:18 +12:00
Damian Mooyman
06623537c4
BUG Don't hard-code folder into treedropdownfield search hint
Fixes https://github.com/silverstripe/silverstripe-cms/issues/1518
2016-06-30 18:01:58 +12:00
Daniel Hensby
9b061edb44 Merge pull request #5605 from open-sausages/pulls/3.3/fix-cmsall-perm
BUG fix CMS_ACCESS permission being ignored if in incorrect order in array
2016-06-29 15:25:21 +01:00
Daniel Hensby
f728b144ca
Merge branch '3' 2016-06-29 11:44:18 +01:00
Daniel Hensby
390b1fc6c4
Merge branch '3.4' into 3 2016-06-29 11:43:02 +01:00
Daniel Hensby
2ab0dcf618
Merge branch '3.3' into 3.4 2016-06-29 11:42:05 +01:00
Daniel Hensby
da0b62f853
Merge branch '3.2' into 3.3 2016-06-29 11:40:58 +01:00
Daniel Hensby
3fe8d30c2c
Merge branch '3.1' into 3.2 2016-06-29 11:40:27 +01:00
Jonathan Little
f6fc18e369 Update GridFieldAddExistingAutocompleter.php
When saving by hitting enter, was receiving an error message 'Can't handle action "find"'

Traced this back to GridFieldAddExistingAutocompleter setting a 'find' action in getHTMLFragments (107) and then not declaring it on line 140
2016-06-29 10:58:06 +01:00
Hamish Friedlander
80d4af6b6e
API Apply Framework\ORM Namespace to model 2016-06-29 10:02:32 +12:00
Damian Mooyman
fd9f29c515 Merge pull request #5732 from open-sausages/pulls/4.0/convert-lowercase
Convert::upperCamelToLowerCamel()
2016-06-29 09:48:35 +12:00
Daniel Hensby
c11ac5d248 Merge pull request #4162 from kinglozzer/pulls/object-parse-class-spec
FIX: Object::parse_class_spec failed to parse associative arrays
2016-06-28 16:07:12 +01:00
Damian Mooyman
803cef4f3c Merge pull request #5606 from Firesphere/patch-1
Show the query number as part of debugging
2016-06-28 17:59:10 +12:00
Damian Mooyman
f1a0aef0d7
BUG fix CMS_ACCESS permission being ignored if in incorrect order in array 2016-06-28 17:45:15 +12:00
Damian Mooyman
24bea79cd9 Merge pull request #5481 from mikenz/file-name-filter-test
Explictly set the FileNameFilter replacements before testing them
2016-06-28 17:03:19 +12:00
Robbie Averill
1991e7d63e Use plural name for ModelAdmin tab name (#5736)
* Fixes #3362
2016-06-27 08:56:35 +12:00
Ingo Schommer
fd0c8ad4c0 Convert::upperCamelToLowerCamel()
Used to expose lowercase web service object keys in SS4,
without requiring an explicit field mapping for these.

The first use case is exposing File data:
[ID => 99, FileName => 'test'] becomes {"id": 99, "fileName": "test"} in JSON.
2016-06-23 12:27:54 +12:00
Hamish Friedlander
012526f5e7 Merge pull request #5731 from open-sausages/pulls/4.0/react-configure-models
API Move dependency on model class from form schema API
2016-06-23 11:41:56 +12:00
Damian Mooyman
80e5b9149e
API Move dependency on model class from form schema API
API Refactor hard-coded dataobject class references from CampaignAdmin
Fixes #5730
2016-06-23 11:04:42 +12:00
Damian Mooyman
27ce71390a Documentation for https://github.com/silverstripe/silverstripe-upgrader/ (#5695) 2016-06-20 12:07:29 +12:00