tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
17,135 Commits 31 Branches 527 Tags 162 MiB
e7303170c2
Commit Graph

17135 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Damian Mooyman
9998f4b5c8 Merge pull request #5712 from nfauchelle/patch-1 
Fix typo in constructor comment
 2016-06-17 16:17:21 +12:00
Nick
3ba5e2c74c Update DataObject.php 
typo :)
 2016-06-17 15:47:10 +12:00
David Craig
83308689d5 API Initialise React controllers via routes (#5436) 2016-06-16 15:04:14 +12:00
Ironcheese
9b1a4b328c Moving a field between tabs, wrong variable name 2016-06-15 15:36:43 +02:00
Damian Mooyman
7a462cecef Merge pull request #5684 from patricknelson/issue-5683-iframe-backport-pr-fix-5163 
FIX for #5683: Address security warning in CMS on 3.3 and above.
 2016-06-15 14:47:03 +12:00
Hamish Friedlander
51d53f4b50 Merge pull request #5646 from open-sausages/pulls/4.0/config-table-name 
API Allow table_name to be declared / introduce DataObjectSchema
 2016-06-14 15:06:38 +12:00
Stevie Mayhew
7acce81295 Merge pull request #5686 from robbieaverill/feature/extendable-textparser 
Allow extensions for TextParser
 2016-06-14 08:10:29 +12:00
Daniel Hensby
9e3f76832b
Merge branch '3' 2016-06-13 13:41:20 +01:00
Daniel Hensby
0d36899afa
Merge branch '3.4' into 3 2016-06-13 12:30:33 +01:00
Daniel Hensby
4e392a4d43
Merge branch '3.3' into 3.4 2016-06-13 12:30:16 +01:00
Daniel Hensby
695c18ac6d
Merge branch '3.2' into 3.3 2016-06-13 12:29:45 +01:00
Robbie Averill
df3680295c Allow extensions for TextParser 
* Call Object::__construct to make it extendable
* Resolves #5685
 2016-06-13 13:31:58 +12:00
Patrick Nelson
f0d4951815 FIX for #5683: Address security warning in CMS when attempting to access <iframe> contents (Back-porting fix from PR #5163) 2016-06-12 17:26:36 -07:00
Ingo Schommer
33496d870b Merge pull request #5651 from chillu/pulls/4.0/restructure-conventions-docs 
Frontend build tooling docs cleanup
 2016-06-13 08:33:02 +12:00
Ingo Schommer
ac6ada9f10 Document gcc requirement for frontend build tooling 2016-06-13 08:30:45 +12:00