Commit Graph

16567 Commits

Author SHA1 Message Date
Damian Mooyman
859acf571e API mute frontend debugging by default (#5777) 2016-07-07 10:22:24 +01:00
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
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
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
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
Daniel Hensby
53ffc1a0db NEW Defining byID functions in SS_Filterable 2016-07-04 17:48:22 +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
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
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
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
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
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
Ingo Schommer
75a23c0b31 Moved "build tooling" into separate doc
It was getting a bit lost halfway down the contributing/code instructions,
in between the detailed git instructions.

Also reordered the docs TOC for that folder by renaming the files.
2016-06-13 08:30:44 +12:00
Ingo Schommer
c96e031367 Moved coding conventions docs into contributing folder
Also created a contributing/coding_conventions landing page separately from the PHP ones, since we now need to account for JS and CSS conventions as well
2016-06-13 08:30:44 +12:00
Stevie Mayhew
65afd6c354 Merge pull request #5681 from dhensby/pulls/3/injector-login-form
NEW Use injector for MemberLoginForm fields
2016-06-12 16:19:05 +12:00
Daniel Hensby
91aa818bd8 Merge pull request #5662 from kinglozzer/viewabledata-definemethods-pt2
FIX: ViewableData::setFailover() didn't remove cached methods
2016-06-11 10:28:56 +01:00
Daniel Hensby
19b9413432
NEW Use injector for MemberLoginForm fields 2016-06-10 22:50:38 +01:00
Damian Mooyman
a4f64d01c2 Merge pull request #5607 from chillu/pulls/4.0/docs-release-instructiongs
Updated docs instructions on core release
2016-06-10 11:59:30 +12:00
Damian Mooyman
8fdcae5c7d Merge pull request #5608 from chillu/pulls/4.0/contributing-docs-master
Clarify where docs commits go
2016-06-10 11:57:27 +12:00