Commit Graph

12416 Commits

Author SHA1 Message Date
Ingo Schommer
3422761a41 Adjust UploadField edit form size
Thanks @kinglozzer for getting this started.
Fixes https://github.com/silverstripe/silverstripe-cms/issues/878
Replaces https://github.com/silverstripe/silverstripe-framework/pull/2221
2013-10-23 11:16:56 +02:00
Stephen Shkardoon
d2360ec8aa MINOR typo where display_errors wasn't checked properly 2013-10-23 22:00:05 +13:00
Ingo Schommer
0e37eaf5fa Merge pull request #2586 from ss23/3.0-staging-fix
FIX: Move stage choosing into a pre-request filter.
2013-10-23 01:47:57 -07:00
Ingo Schommer
6694fc5980 Merge pull request #2585 from ss23/3.1-staging-fix
FIX: Move stage choosing into a pre-request filter.
2013-10-23 01:47:41 -07:00
Andrew Short
156bb87d57 FIX: Move stage choosing into a pre-request filter.
This ensures that the correct stage is selected, even if the request
does not come through the model as controller system. This fixes an
issue where custom controllers would always be on the "Stage" stage.
2013-10-23 18:29:13 +13:00
Andrew Short
e7c8fed6ab FIX: Move stage choosing into a pre-request filter.
This ensures that the correct stage is selected, even if the request
does not come through the model as controller system. This fixes an
issue where custom controllers would always be on the "Stage" stage.
2013-10-23 18:22:15 +13:00
Simon Welsh
699272a2e7 Merge pull request #2584 from ss23/patch-3
MINOR typo where display_errors wasn't checked properly
2013-10-22 20:34:33 -07:00
Stephen Shkardoon
696e6f65ab MINOR typo where display_errors wasn't checked properly 2013-10-23 16:32:31 +13:00
Ingo Schommer
ea5b3e4269 Merge pull request #2520 from wilr/destructivestyles
Style destructive actions destructively
2013-10-22 17:07:38 -07:00
Ingo Schommer
77696e207a Merge pull request #2557 from camspiers/template-parser-configurable
Feature to allow changing the SSTemplateParser used in SSViewer
2013-10-22 17:00:03 -07:00
Ingo Schommer
ad09d4297f Merge pull request #2582 from kinglozzer/2567-add-existing-gridfield-styling
GridField 'Add existing' action styling improvements (fixes #2567)
2013-10-22 11:54:17 -07:00
Ingo Schommer
6f02c5bd98 Email fluent API regression (fixes #2581) 2013-10-22 20:31:29 +02:00
Loz Calver
e9fdfb05b2 GridField 'Add existing' action styling improvements 2013-10-22 16:44:28 +01:00
Ingo Schommer
39efaca54f Disable "lost password" feature, breaks on "php -S"
PHP's built-in webserver doesn't reliably expose SCRIPT_NAME,
see https://github.com/silverstripe/silverstripe-framework/issues/2580.
This breaks URL routing on /Security/passwordsent/admin%40test.com
2013-10-22 15:26:20 +02:00
Ingo Schommer
d9aa7acfbd Merge pull request #2578 from JayDevlin/fix-session-get_timeout
BUG Session::get_timeout()
2013-10-22 05:56:29 -07:00
Devlin
112e08e5f2 FIX Session::get_timeout 2013-10-22 14:20:18 +02:00
Ingo Schommer
f2d362b629 Merge pull request #2576 from halkyon/fulltextsearch_test
FulltextSearchableTest doesn't clean up after itself.
2013-10-22 01:56:29 -07:00
Sean Harvey
acaf0e40cc FulltextSearchableTest doesn't clean up after itself.
The extension doesn't get unloaded correctly at the end of the test,
resulting in tests afterwards sometimes failing because the table
type is reset back to InnoDB.

See silverstripe/silverstripe-cms ed8ee4e9b for a similar fix done
in the cms module.
2013-10-22 17:52:51 +13:00
mandrew
56d7c1fde2 Behat tests for lost password 2013-10-22 00:06:36 +02:00
Daniel Hensby
2a6f1f1949 FIX #2496 ConfirmedPasswordField mismatch passwords saved
Fixes #2496

Also fixes another issue where 'Password' is hard coded as field name in `validate()`
2013-10-21 22:27:41 +01:00
Ingo Schommer
8ef14d2df4 Fluent API for Email 2013-10-21 10:58:45 +02:00
Zauberfisch
32bb98b0d7 API: DataObject->getRemoteJoinField() no longer defaults to ParentID but throws an exception instead 2013-10-21 04:11:00 +00:00
Zauberfisch
8de1ce4a56 array check to ensure getRemoteJoinField() gets an array from Config::inst()->get($remoteClass, 'has_one') (related issue: #2570) 2013-10-21 04:04:28 +00:00
Ingo Schommer
5c1a9d9da5 Using Behat EmailContext by default 2013-10-21 00:50:29 +02:00
colymba
19928ff5e8 NEW GDBackend can save interlaced image
Disabled by default use config GDBackend.image_interlace: 1 to enable
2013-10-19 14:46:23 +03:00
Ingo Schommer
f532b8483b Merge remote-tracking branch 'origin/3.0' into 3.1 2013-10-19 12:01:53 +02:00
Ingo Schommer
69c888a2ac Merge pull request #2563 from tractorcow/pulls/3.1-error-control-usage
BUG Less misuse of error control operator (@)
2013-10-18 02:06:32 -07:00
Che Van Lawrence
2be25e70ba Merge pull request #2545 from hafriedlander/fix/protocol_and_oembed
FIX oembed to avoid mixed media issues
2013-10-17 19:09:35 -07:00
Damian Mooyman
371ccca350 BUG Less misuse of error control operator (@)
This is necessary to prevent get_last_error() from returning suppressed errors when retrieving values from nested arrays
2013-10-18 14:30:51 +13:00
Cam Spiers
ac418ce99e Feature to allow that changing the SSTemplateParser through the Injector system
The motivation for this was to allow module developers to change what parser is used to parse SilverStripe templates.
This change enables people to compile their own version of the SilverStripe template parser and use it without modifying core files.
2013-10-18 12:42:39 +13:00
Ingo Schommer
8051f5586c Merge pull request #2539 from dhensby/patch-2
FIX Changing `public` statics to `private`
2013-10-17 04:02:08 -07:00
Daniel Hensby
a1ad45486b FIX Changing public static $priority to private
Deprecation error thrown in master whilst this is public
2013-10-17 11:55:59 +01:00
Ingo Schommer
e1b7df38ef HTML attr encoding for UploadField config
Also fixed UploadField operation with canUpload=false,
which broke the JS because no config could be found,
since the <input> field wasn't present. We can't put the data-config
attribute on the field holder, since fields can be rendered
without their field holder through FormField->SmalLFieldHolder().

Fixes https://github.com/silverstripe/silverstripe-cms/issues/874
2013-10-17 10:55:11 +02:00
Ingo Schommer
b6c16fcbf1 Merge pull request #2554 from tractorcow/pulls/3.1-moneyfield-style-fix
BUG Fixed incorrect CSS class on MoneyField holder
2013-10-17 01:22:01 -07:00
Ingo Schommer
15845c8547 Merge pull request #2556 from tractorcow/pulls/3.1-bug-fieldgroup-name-fix
BUG Fixes serious issue with FieldList::addFieldsToTab failing to accept multiple field groups.
2013-10-17 01:21:08 -07:00
Hamish Friedlander
8801a50704 FIX oembed to avoid mixed media issues 2013-10-17 17:06:40 +13:00
Damian Mooyman
24950692cd BUG Fixes serious issue with FieldList::addFieldsToTab failing to accept multiple field groups.
Additional groups beyond the first are ignored.
Test cases included.
2013-10-17 15:38:22 +13:00
Andrew Short
688d853a95 Merge pull request #2555 from halkyon/readme_fixes
Use quotes around composer require argument for some shells.
2013-10-16 18:38:58 -07:00
Sean Harvey
d7e1a1c45f Use quotes around composer require argument for some shells.
The asterisk is a reserved character in some shells and will cause an error
if you don't put quotes around the argument, as it will be interpreted.
2013-10-17 14:36:34 +13:00
Damian Mooyman
702b6c94c4 BUG Fixed incorrect CSS class on MoneyField holder 2013-10-17 13:28:27 +13:00
Ingo Schommer
0d1c9602e8 Merge pull request #2550 from Zauberfisch/3.1
formatted install.php5 according to SilverStripe coding conventions
2013-10-16 15:28:36 -07:00
Ingo Schommer
559743c75f Merge pull request #2549 from Zauberfisch/3.1
suggest that arg_separator.output to be &
2013-10-16 13:53:43 -07:00
zauberfisch
48049647d8 formatted install.php5 according to SilverStripe coding conventions (spaces) 2013-10-16 21:17:22 +01:00
zauberfisch
0b4c3946ff formatted install.php5 according to SilverStripe coding conventions (tabs instead of spaces, no 1 line if with else, ...) 2013-10-16 21:11:06 +01:00
zauberfisch
c4810b8e0f changed install.php5 to respect line length limit according to SilverStripe coding conventions 2013-10-16 21:00:20 +01:00
Ingo Schommer
0d993c1aac Merge pull request #2535 from Martimiz/3.1
Strip duplicate querystrings from the url before adding document.location.search
2013-10-16 12:41:52 -07:00
zauberfisch
e357fa298e suggest that arg_separator.output to be &, if set to something else it may result in issues with url parameters 2013-10-16 20:37:15 +01:00
Ingo Schommer
472bb4d2e2 Running Behat tests on PHP 5.4 (needs integrated webserver) 2013-10-16 14:51:40 +02:00
Ingo Schommer
156140340b Regression in travis.yml ($WEBROOT undefined, matrix broken) 2013-10-16 14:47:35 +02:00
Ingo Schommer
98f79172a4 Running Travis+Behat through Selenium, save artifacts 2013-10-16 14:01:14 +02:00