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,661 Commits 31 Branches 527 Tags 162 MiB
a6c3d1e269
Commit Graph

11661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Ingo Schommer
474dde8012 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	docs/en/reference/grid-field.md
 2013-06-24 14:39:09 +02:00
Damian Mooyman
7340da03a7 Controller::redirect now returns the resulting SS_HTTPResponse, allowing the function to better support chaining 2013-06-24 13:39:05 +12:00
Craig Weber
d8b106e6ee FIX: TestRunner was not cleaning up DB on failure 
When a unit test being run by PHPUnit encountered a fatal error,
TestRunner::tearDown was never being called. This resulted in tmpdb schemas
littering the database from failed test runs. This changeset fixes the issue
by registering TestRunner::tearDown as a shutdown function, so that it gets
called even in the event of a PHP Fatal Error.
 2013-06-24 01:15:09 +02:00
Ingo Schommer
b0e359ddb7 Merge pull request #2144 from micmania1/2143-paginatedlist-method-calls 
ENHANCEMENT: Updated calls to methods instead of direct properties in PaginatedList
 2013-06-23 14:35:13 -07:00
micmania1
49835c3bb1 Updated calls to methods instead of firect properties in PaginatedList 2013-06-23 13:20:38 +01:00
Will Rossiter
e72f9762b0 Merge pull request #2142 from ARNHOE/patch-2 
Updated helplink to 3.1
 2013-06-22 21:10:14 -07:00
ARNHOE
6e7cae50fd Updated helplink to 3.1 2013-06-22 18:08:25 +02:00
Ingo Schommer
e908613c47 Merge pull request #2132 from mateusz/note 
Add a note on the unit of the Session.timeout.
 2013-06-20 16:00:40 -07:00
Mateusz Uzdowski
53a2dbd207 Add a note on the unit of the Session.timeout. 2013-06-21 10:56:00 +12:00
Ingo Schommer
09ca497b36 Merge pull request #2127 from silverstripe-rebelalliance/cookietimestamp 
BUG: Fix for Cookie expiry timeout being passed as a large number on 64 ...
 2013-06-20 15:42:07 -07:00
Ingo Schommer
da0cc25c3b Merge pull request #2129 from tractorcow/3.1-htmleditor-mediaform-fixes 
BUG Fixed issue in file upload via the HTML Editor media dialogue
 2013-06-20 02:10:16 -07:00
Will Rossiter
cf12ccbd2c Merge pull request #2120 from ryanwachtl/patch-1 
Missing directory separators in output of suggested _ss_environment paths
 2013-06-20 00:16:49 -07:00
Will Rossiter
d1756a5a58 Update simple-contact-form.md 2013-06-20 18:35:12 +12:00
Sean Harvey
ba10d270b3 Merge pull request #2128 from hafriedlander/fix/hashleak 
FIX: ConfirmedPasswordField used to expose existing hash
 2013-06-19 20:34:53 -07:00
Damian Mooyman
f47383f52e BUG Fixed issue where file upload via the HTML Editor media dialogue would not prompt users to overwrite existing files 2013-06-20 15:21:18 +12:00
Hamish Friedlander
328467f1b5 FIX: ConfirmedPasswordField used to expose existing hash 2013-06-20 14:09:30 +12:00
Kirk Mayo
dff5447cbc BUG: Fix for Cookie expiry timeout being passed as a large number on 64 bit machines 2013-06-20 12:30:48 +12:00
Simon Welsh
ac729067cd Merge pull request #2124 from CheeseSucker/patch-4 
MINOR: Fixed typo
 2013-06-19 13:22:29 -07:00
Ryan Wachtl
0cf6b78b0e Update cli-script.php 
Use DIRECTORY_SEPARATOR for cross platform
 2013-06-19 10:12:42 -05:00
CheeseSucker
2ac3444675 MINOR: Fixed typo 2013-06-19 16:48:49 +02:00
Ingo Schommer
a4189a6744 Merge pull request #2117 from ohararyan/3.1 
FIX make sure select dropdowns in add page dialog aren't cut off
 2013-06-19 05:30:54 -07:00
Ingo Schommer
8769da5622 CMS UI: Resize iframe alongside dialog 
Fixes regression from 9f600ada2c
 2013-06-19 14:28:34 +02:00
Ingo Schommer
2160fb8000 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.js
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
	tests/control/ControllerTest.php
 2013-06-19 14:03:43 +02:00
Ingo Schommer
c5a7193896 Environment Config: SS_DATABASE_MEMORY 2013-06-19 13:42:28 +02:00
Ingo Schommer
5c3809a165 Merge pull request #2121 from sminnee/allowed-actions-templates 
FIX: Ensure that actions inferred from templates with the "_action" suff...
 2013-06-19 02:16:37 -07:00
Simon Welsh
d774bab988 REGRESSION: fixed background color for PaddedImage 2013-06-19 20:35:24 +12:00
Ingo Schommer
b7a00eea78 Merge pull request #2122 from g4b0/1752-image-manipulation-parameter-regression 
REGRESSION: fixed background color for PaddedImage
 2013-06-19 01:25:44 -07:00
g4b0
c06a9095df REGRESSION: fixed background color for PaddedImage 2013-06-19 10:19:54 +02:00
Sam Minnee
526b40414a FIX: Ensure that actions inferred from templates with the "_action" suffix also respect allowed_actions. 
FIX: Ensure SSViewer::hasTemplate() is aware of themes.

To do this, RequestHandler::definingClassForAction() has been created, splitting out the code that looks up the class that defines a given action into its own method.  This is then overridden in Controller to look at templates.
 2013-06-19 20:11:50 +12:00