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
13,222 Commits 31 Branches 527 Tags 162 MiB
d01cbbbdc7
Commit Graph

13222 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Morgan
d01cbbbdc7 TestRunner: allow test suite running 2014-05-09 10:03:59 +01:00
Damian Mooyman
76932f7a00 Merge pull request #3114 from dhensby/restful-service-links 
MINOR use `Controller::join_links()` in `RestfulService`
 2014-05-09 08:23:24 +12:00
Daniel Hensby
7617f08ad3 Use Controller::join_links() in RestfulService 
At the moment, `RestfulService` duplicates functionality of
`Controller::join_links` (badly) and it means that one MUST use a base
URL with a trailing slash for the URL to be constructed properly

Plus tests for `RestfulService::getAbsoluteRequestURL()`

API Deprecating `RestfulService::constructURL()`

This function isn't used in core so we should remove it
 2014-05-08 08:59:57 +01:00
Damian Mooyman
0305eb97e7 Merge pull request #3111 from silverstripe-iterators/pulls/gridfield-getrecord 
GridFieldDetailForm_ItemRequest->getRecord()
 2014-05-08 09:13:36 +12:00
Ingo Schommer
802b46bd0a GridFieldDetailForm_ItemRequest->getRecord() 2014-05-07 23:49:04 +12:00
Ingo Schommer
ca1f9a58f4 Merge pull request #3110 from dhensby/pulls/restful-docs 
fixing docs spacing
 2014-05-07 23:13:43 +12:00
Daniel Hensby
b873e32d9e fixing docs spacing 2014-05-07 12:06:44 +01:00
Andrew Short
48240d8fd0 Merge pull request #3109 from dhensby/pulls/restful-docs 
Restful service docs
 2014-05-07 19:26:26 +10:00
Daniel Hensby
bef913aeb9 Updating RestfulService docs to explain how to set cURL options 
see #3108
 2014-05-07 10:12:08 +01:00
Will Rossiter
d01083cfce Merge pull request #3108 from dhensby/master 
Revert "FIX: allow CURLOPT_CONNECTTIMEOUT to be configured."
 2014-05-07 08:47:02 +01:00
Daniel Hensby
87bb99667e Revert "FIX: allow CURLOPT_CONNECTTIMEOUT to be configured." 
This reverts commit 0d493d4eff.
 2014-05-06 22:13:56 +01:00
Ingo Schommer
6d3f7887a6 Merge pull request #3018 from willmorgan/patch-3 
FIX change action variable source to getViewer
 2014-05-07 08:38:33 +12:00
Hamish Friedlander
93cd339ff0 Merge pull request #3060 from tractorcow/pulls/tinymce-blockquote 
API tinymce editor no longer transforms paragraphs with margin-left into blockquotes
 2014-05-06 11:40:44 +12:00
Damian Mooyman
e9c3ff933f Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	composer.json
 2014-05-06 10:22:09 +12:00
Damian Mooyman
aef4b80fda Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	.travis.yml
	forms/ConfirmedPasswordField.php
 2014-05-06 10:06:58 +12:00
Ingo Schommer
aac93669dd Merge pull request #3095 from willmorgan/pulls/templatemanifest-cache-fix 
FIX TemplateManifest prevent cache collision
 2014-05-06 08:20:05 +12:00
Simon Welsh
ddae5825b3 Merge pull request #3102 from ss23/patch-3 
MINOR LeftAndMain::getRecord check $ClassName before use
 2014-05-05 17:47:57 +10:00
Stephen Shkardoon
677f0edcfc MINOR LeftAndMain::getRecord check $ClassName before use 
While the check for `$classname` was done in the first conditional, it was left out of the other two, leading to potential issues when an invalid ID was given, instead of the expected `false`.
 2014-05-05 19:26:05 +12:00
Ingo Schommer
f2b2ee8a68 Merge pull request #3021 from tractorcow/pulls/3.1-htmltext-whitelist 
BUG HTMLText whitelist considers text nodes
 2014-05-05 13:23:52 +12:00
Ingo Schommer
fc8da3fb1d Merge pull request #3087 from tractorcow/pulls/3.0-phpunit 
BUG Allow PHPUnit installation with composer / Fix travis
 2014-05-05 13:20:17 +12:00
Damian Mooyman
1baefab391 Merge pull request #3096 from simonwelsh/nonexclusive-test 
Don't add the class manifest with tests as an exclusive manifest
 2014-05-05 08:43:47 +12:00
Simon Welsh
9116e40eb8 Don't add the class manifest with tests as an exclusive manifest 2014-05-04 11:46:06 +10:00
Ingo Schommer
447c1b97c2 Merge pull request #3079 from timsnadden/3.1 
Fix 'Uncaught ReferenceError: jQuery is not defined'
 2014-05-03 14:29:03 +12:00
Will Morgan
9cbfd14d9d FIX TemplateManifest prevent cache collision 2014-05-02 17:57:28 +01:00
Hamish Friedlander
d5b76a87d0 Merge pull request #3088 from tractorcow/pulls/3.1-phpunit 
BUG Allow PHPUnit installation with composer / Fix travis
 2014-05-02 18:37:59 +12:00
Damian Mooyman
b9872c0856 Allow PHPUnit installations with composer 
Instruct travis to use composer version of phpunit
 2014-05-02 18:23:58 +12:00
Will Morgan
bec8927a08 BUG Allow PHPUnit installation with composer / Fix travis 2014-05-02 18:22:04 +12:00
Damian Mooyman
7a772b2480 Merge pull request #3086 from hafriedlander/fix/CWPBUG-155 
FIX Folder Title not being exactly the same as Name field
 2014-05-02 18:17:37 +12:00
Simon Welsh
48f65669c8 Change PHP 5.6 to an allowed failure 2014-05-02 15:24:51 +10:00
Hamish Friedlander
8e841cc471 FIX folder Title not being exactly the same as Name field if setName modified the value 2014-05-02 14:41:10 +12:00
Damian Mooyman
73b2c7fe35 Merge pull request #3070 from dhensby/patch-3 
Oembed warning if GD function is missing
 2014-05-02 08:37:38 +12:00
Sean Harvey
e79e894970 Merge pull request #3083 from mparkhill/patch-1 
FIX: parent::init is not called first
 2014-05-01 15:53:57 +12:00
Michael Parkhill
bd5abb62ff FIX: parent::init is not called first 
In the controller's init function, parent::init() should be called before any other method calls.
 2014-05-01 15:35:45 +12:00
Ingo Schommer
512c7140cc Merge pull request #3082 from PapaBearNZ/patch-1 
FIX: corrected link to CMS Alternating Button Page
 2014-05-01 11:43:57 +12:00
James Pluck
4fd3015ea4 FIX: corrected link to CMS Alternating Button Page 2014-05-01 10:45:12 +12:00
Tim Snadden
afad65ee71 Fix 'Uncaught ReferenceError: jQuery is not defined' if jQuery is not included in template. 2014-04-30 09:30:22 +12:00
Ingo Schommer
612a096765 Merge pull request #3022 from tractorcow/pulls/3.2-upload-restrictions 
API Remove html,htm,xhtml,xml as default allowed uploadable file types
 2014-04-29 21:36:15 +12:00
Ingo Schommer
ff42ad268e Merge pull request #3077 from tractorcow/pulls/fix-imagetest 
BUG Fix ImageTest
 2014-04-29 21:34:04 +12:00
Ingo Schommer
5524bd4ebb Merge pull request #3078 from tractorcow/pulls/3.1-remove-thirdparty-demo 
Removed demo folder
 2014-04-29 21:33:31 +12:00
Mateusz U
2c9f99c1f0 Merge pull request #3031 from tractorcow/pulls/3.1-fix-tree-duplication 
BUG Fix jstree when duplicating subtrees
 2014-04-29 16:19:00 +12:00
Damian Mooyman
0b4f62dfd8 BUG Fix jstree when duplicating subtrees 2014-04-29 16:00:07 +12:00
Damian Mooyman
cff42700ff Removed demo folder 2014-04-29 12:51:47 +12:00
Damian Mooyman
91034d1341 BUG HTMLText whitelist considers text nodes 
Minor improvement to #2853.
If a list of whitelisted elements are specified, text nodes no longer evade the whitelist
 2014-04-29 11:52:16 +12:00
Damian Mooyman
2e73dcb891 API Remove swf,html,htm,xhtml,xml as default allowed upload able file types 2014-04-29 11:09:30 +12:00
Damian Mooyman
a46f5f133a Merge pull request #3068 from kinglozzer/patch-1 
DOCS: Minor fixes to RestfulService documentation
 2014-04-29 09:04:29 +12:00
Damian Mooyman
8673b11cd9 BUG Fix ImageTest 
Image test would erroneously reset the Image::$backend to null if the test was skipped, breaking subsequent test cases
 2014-04-29 08:57:23 +12:00
Ingo Schommer
781eee1620 Merge pull request #3076 from martinduparc/patch-4 
Fixed config setting link
 2014-04-29 08:15:56 +12:00
Martin D.
6b3a21653b Fixed config setting link 2014-04-28 10:31:54 -04:00
Ingo Schommer
280ab2dcd3 Merge pull request #3026 from tractorcow/pulls/3.1-gridfield-paging 
API Make default gridfield paging configurable
 2014-04-28 23:06:23 +12:00
Loz Calver
61f6f2e814 DOCS: Minor fixes to RestfulService documentation 2014-04-28 09:14:27 +01:00