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
11,948 Commits 31 Branches 527 Tags 162 MiB
dfc8dbdee0
Commit Graph

11948 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Welsh
dfc8dbdee0 Merge remote-tracking branch 'origin/3.1' 2013-07-05 10:23:59 +12:00
Simon Welsh
fbce9fd7cd Merge branch '3.1' 
Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js
 2013-07-05 10:22:58 +12:00
Ingo Schommer
c3e9e44204 Merge pull request #2197 from hafriedlander/fix/dbapichange 
FIX Recent patch to DataObject#db changed API which broke core
 2013-07-04 15:20:52 -07:00
Simon Welsh
d844c74e3c Merge branch '3.0' into 3.1 
Conflicts:
	.travis.yml
	control/HTTP.php
	email/Mailer.php
	tests/control/HTTPTest.php
 2013-07-05 10:17:14 +12:00
Hamish Friedlander
ca63e33c19 FIX Recent patch to DataObject#db changed API which broke core 2013-07-05 10:11:35 +12:00
Mateusz U
3ac22ed638 Merge pull request #2182 from hafriedlander/fix/sanitise 
FIX HtmlEditorField not re-checking sanitisation server side
 2013-07-04 14:56:37 -07:00
Sam Minnée
7f461ddd75 Merge pull request #2192 from dangerdan/patch-1 
Fixed broken github issue tracker link
 2013-07-04 14:55:08 -07:00
Simon Welsh
fb457e47eb Removes PHP 5.5 from allowed failures 2013-07-05 09:45:30 +12:00
Damian Mooyman
11f4b2c620 API HTTP::urlRewriter with (string)$code deprecated in 3.1. Fixed regressions and CSS urls. 
urlRewriter will expect a callable as a second parameter,
but will work with the current api and simply raise a deprecation error.

HTTP::absoluteURLs now correctly rewrites urls into absolute urls. Resolves introduced in c56a80d6ce

HTTP::absoluteURLs now handles additional cases where urls were not translated.

Test cases for HTTP::absoluteURLs added for both css and attribute links.

Cleaned up replacement expression and improved documentation.
 2013-07-05 09:08:58 +12:00
Simon Welsh
9deb11f9a0 Use preg_replace_callback over preg_replace with e modifier 2013-07-05 09:08:58 +12:00
Ingo Schommer
c809bd7183 Merge pull request #2196 from chillu/pulls/travis-matrix 
PHP 5.5 CI, don't allow failures for sqlite3 and postgres
 2013-07-04 13:59:33 -07:00
Ingo Schommer
2845f76ade PHP 5.5 CI, don't allow failures for sqlite3 and postgres 2013-07-04 22:55:49 +02:00
Ingo Schommer
067a94bd93 Postgres compat in MemberCsvBulkLoaderTest and GroupTest 2013-07-04 22:46:23 +02:00
Ingo Schommer
cf20923fd6 Postgres compat in SQLQueryTest 2013-07-04 22:28:13 +02:00
Dan Brooks
409be9a840 Fixed broken github issue tracker link 2013-07-04 16:41:53 +01:00
Damian Mooyman
a862b4da99 BUG Fixed missing allowed_actions on UploadField_SelectHandler 2013-07-04 12:38:57 +12:00
Hamish Friedlander
dacb2aa638 FIX HtmlEditorField not re-checking sanitisation server side 2013-07-04 08:53:23 +12:00
Ingo Schommer
d003c96c62 Fixed HTMLEditorField extension call ("updateFieldsForOembed") 2013-07-03 10:15:46 +02:00
Simon Welsh
29c2b21a2a Merge pull request #2175 from jthomerson/fix_2174 
FIX #2174: SearchFilter needs casting helper for DataObject base fields
 2013-07-02 20:15:47 -07:00
Jeremy Thomerson
50e9eee2e9 FIX #2174: SearchFilter needs casting helper for DataObject base fields 
Commit 964b3f2 fixed an issue where dbObject was returning casting helpers for
fields that were not actually DB objects, but had something in $casting config.

However, because dbObject was no longer calling DataObject->castingHelper, this
exposed a bug that the underlying function db($fieldName) was not returning
field specs for the base fields that are created by SS automatically on all
DataObjects (i.e. Created, LastEdited, etc).

This commit fixes the underlying issue that DataObject->db($fieldName) should
return the field specs for *all* DB fields like its documentation says it will,
including those base fields that are automatically created and do not appear in
$db.
 2013-07-03 03:03:40 +00:00
Ingo Schommer
429bbc5223 Merge pull request #2137 from jthomerson/pulls/fix_viewable_data_wrapped_value 
FIX: ViewableData wasn't setting values when using default cast
 2013-07-02 00:40:56 -07:00
Mateusz Uzdowski
21844a8a07 Merge branch 'pr/2173' into 3.1 2013-07-02 15:52:31 +12:00
Mateusz Uzdowski
f9ede95e5b Add configuration system tests for Only and Except combinations. 2013-07-02 15:51:53 +12:00
Hamish Friedlander
df218d76da Clarify how Only and Except rules combine 2013-07-02 14:09:11 +12:00
Hamish Friedlander
5484283a25 FIX changing environment in config.php changes matched yaml rules 2013-07-02 13:21:27 +12:00
carlos barberis
47147eb3df API: delete simplepie from framework thirdparty 2013-07-01 09:41:57 +02:00
Hamish Friedlander
e74c002647 FIX Only and Except rules in Configs not working 2013-07-01 15:47:37 +12:00
Ingo Schommer
a6c3d1e269 Flag "insert image" behat test as @assets 
Required in order to run them remotely, which currently
doesn't support file upload through Selenium
 2013-06-28 12:21:00 +02:00
Ingo Schommer
a9f150126c Fix CMSBatchActionHandler::$allowed_actions 
Regression from earlier API change to deny actions unless specified
 2013-06-28 10:07:57 +02:00
Hamish Friedlander
03aa9e4b41 FIX ConfigManifest caching to not use existing cache from wrong $base 2013-06-28 11:25:14 +12:00
Andrew Short
973a23fac8 Merge pull request #2162 from simonwelsh/sec-redirect 
Only redirect on logout if we're not already redirecting
 2013-06-26 15:56:56 -07:00
Simon Welsh
1d5ac5876b Only redirect on logout if we're not already redirecting 2013-06-27 09:49:10 +12:00
Ingo Schommer
bcc09deb08 Merge pull request #2153 from chillu/pulls/form-fortemplate-access 
Allow Form->forTemplate() URL access (fixes #788)
 2013-06-26 13:56:56 -07:00
Simon Welsh
aecda4882b Merge pull request #2150 from hafriedlander/fix/templatevars-v2 
FIX Arguments to method calls reseting scope
 2013-06-25 21:59:14 -07:00
Hamish Friedlander
5c46acc018 Merge pull request #2156 from simonwelsh/staticnamesapce 
FIX: ConfigStaticManifest not handling multipart namespaces
 2013-06-25 21:23:36 -07:00
Simon Welsh
e55be50783 FIX: ConfigStaticManifest not handling multipart namespaces 
Fixes #2126
 2013-06-26 16:01:55 +12:00
Ingo Schommer
09b31c642f Allow Form->forTemplate() URL access (fixes #788) 
Need to specifically whitelist URL-accessible actions now.
Used in "Insert Link" form in HtmlEditorField.
Regression from 1edf45fbed
 2013-06-25 16:33:00 +02:00
Will Morgan
83726b21a2 Using extendedCan for can* 2013-06-25 16:26:38 +02:00
Ingo Schommer
755a95e3f7 FIX UploadField: IE10 single click for upload trigger 
Fixes https://github.com/silverstripe/silverstripe-cms/issues/644.
See d45deb15f4
 2013-06-25 15:35:45 +02:00
Ingo Schommer
2a4fd90316 Docs: Note about branch merging 2013-06-25 10:35:30 +02:00
Ingo Schommer
50e8e3e46e Merge pull request #2146 from jonom/Configurable-default-width-for-Media 
NEW: Allow configuration of initial insertion width for images and media
 2013-06-25 00:27:47 -07:00
Hamish Friedlander
ae3e3f3b44 FIX Arguments to method calls reseting scope 2013-06-25 17:35:16 +12:00
Sean Harvey
7349682d44 Merge pull request #2145 from tractorcow/3.1-controller-redirect 
Controller::redirect now returns the resulting SS_HTTPResponse
 2013-06-24 14:16:18 -07:00
jonom
ffc764dc3c NEW: Allow configuration of initial insertion width for images and media 
Moved default insertion dimensions logic from JS to PHP to allow setting through config API
 2013-06-24 14:25:16 -06:00
Simon Welsh
1edf45fbed Merge pull request #2130 from chillu/pulls/allowed_actions-deny 
API Enforce $allowed_actions in RequestHandler->checkAccessAction()
 2013-06-24 12:41:15 -07:00
Ingo Schommer
18299322bc "Insert Media" dialog: Fixed event names 
Fixes https://github.com/silverstripe/silverstripe-cms/issues/781
Regression from 9f600ada which uses jQuery UI widget "subclass"
that also affects event names.
 2013-06-24 18:58:46 +02:00
Ingo Schommer
1046530ff6 "Insert Media" dialog: Prevent loading indicator in IE8+ 
Fixes https://github.com/silverstripe/silverstripe-cms/issues/782
 2013-06-24 17:14:32 +02:00
Ingo Schommer
8c9ef8feb9 "Insert Media" dialog: Reposition separately (fixes #783) 
FF21 and IE10 seem to propagate the DOM attribute changes differently
from Chrome: The dimensions can't be set in the same setOptions()
call through jQuery UI here. Fixed this by a separate setOption() call.
 2013-06-24 16:13:29 +02:00
Ingo Schommer
2f9eaeea41 Merge pull request #2021 from jthomerson/fix_if_link_not_working 
FIX: <% if Link %> wasn't working
 2013-06-24 06:16:21 -07:00
Ingo Schommer
fb784af738 API Enforce $allowed_actions in RequestHandler->checkAccessAction() 
See discussion at https://groups.google.com/forum/?fromgroups#!topic/silverstripe-dev/Dodomh9QZjk

Fixes an access issue where all public methods on FormField were allowed,
and not checked for $allowed_actions. Before this patch you could e.g.
call FormField->Value() on the first field by using action_Value.

Removes the following assertion because it only worked due to RequestHandlingTest_AllowedControllerExtension
*not* having $allowed_extensions declared: "Actions on magic methods are only accessible if explicitly allowed on the controller."
 2013-06-24 14:50:40 +02:00