Commit Graph

19032 Commits

Author SHA1 Message Date
Daniel Hensby
292aaf6530
FIX Cache IDs grouped by site first 2017-07-19 11:29:01 +01:00
Damian Mooyman
d053c9aaac Merge pull request #7186 from dhensby/pulls/3.5/cache-prefix
FIX Add unique prefix to cache stores to prevent cache leak
2017-07-19 11:54:49 +12:00
Daniel Hensby
b77274c1a3
FIX Add unique prefix to cache stores to prevent cache leak 2017-07-18 23:43:08 +01:00
Daniel Hensby
d7095c2213
Merge branch '3' into 4 2017-07-18 14:19:16 +01:00
Daniel Hensby
43e0befcc1 Merge pull request #7185 from robbieaverill/patch-8
FIX Exclude thirdparty dir from code coverage
2017-07-18 12:02:21 +01:00
Daniel Hensby
297755d323
Merge branch '3.6' into 3 2017-07-18 12:00:33 +01:00
Daniel Hensby
7e732da709
Merge branch '3.5' into 3.6 2017-07-18 12:00:04 +01:00
Daniel Hensby
fa8f0cc955 Merge pull request #7141 from bummzack/fix-7132-utf8
Fix OS X issue with some string methods.
2017-07-18 11:59:16 +01:00
Daniel Hensby
d59e2dbe5b Merge pull request #7183 from robbieaverill/pulls/4.0/fix-log-in-as-someone-else
FIX Log in as someone else returns user back to login screen
2017-07-18 11:54:33 +01:00
Robbie Averill
ac388a5591 FIX Exclude thirdparty dir from code coverage 2017-07-18 22:21:45 +12:00
Sacha Judd
f367a0aa62 NEW add web accessible colours to web view dev/build 2017-07-18 22:00:35 +12:00
Robbie Averill
ba9ad55274 FIX Base URL defaults to a slash in currentURL if not defined already 2017-07-18 21:56:21 +12:00
Robbie Averill
8b12e97d7a FIX Enable code coverage builds with phpdbg and 7.1.7
PHP 7.1.7 is currently not segfaulting when generating coverage reports with phpdbg
2017-07-18 21:56:21 +12:00
Robbie Averill
a5ca4ecb59 FIX Log in as someone else returns user back to login screen 2017-07-18 17:15:58 +12:00
Damian Mooyman
ed0ed89865 Merge pull request #7055 from robbieaverill/pulls/4.0/polymorphic-has-one-indexes
NEW Ensure polymorphic has_one fields are indexed
2017-07-18 16:39:45 +12:00
Robbie Averill
fb18e441a7 DBIndexable::getIndexSpecs is responsible for returning a DBFields full indexable spec 2017-07-18 15:03:56 +12:00
Chris Joe
1c6505f2e4 Merge pull request #6936 from open-sausages/pulls/4.0/link-inline-toolbar
Remove "Remove link" button from the editor's main toolbar
2017-07-18 13:50:06 +12:00
Saophalkun Ponlu
c2841b6d64 Enhancement Remove "Remove link" button from the editor's main toolbar
Fix behat for selecting link should focus on field
2017-07-18 13:11:27 +12:00
Damian Mooyman
de7b746094 Merge pull request #7180 from robbieaverill/pulls/4.0/remove-config-update-use
Use merge and set instead of update for config calls
2017-07-18 09:16:20 +12:00
Daniel Hensby
be7b2d4970 Merge pull request #7179 from robbieaverill/pulls/4.0/is-cli-for-phpdbg
FIX Ensure phpdbg calls are registered by SilverStripe core as a CLI call
2017-07-17 14:26:39 +01:00
Daniel Hensby
4f095ea61d Merge pull request #7175 from robbieaverill/pulls/4.0/version-provider
FIX Version provider uses non LSB config getters, move LeftAndMain config to admin module
2017-07-17 14:01:22 +01:00
Robbie Averill
da4e46e4de FIX Use merge and set instead of update for config calls 2017-07-17 17:59:40 +12:00
Robbie Averill
ea4181166f FIX Ensure phpdbg calls are registered by SilverStripe core as a CLI call 2017-07-17 16:56:01 +12:00
Robbie Averill
bd5782adca NEW Allow index type to be configured per DBField instance 2017-07-17 14:36:47 +12:00
Robbie Averill
c9c4390619 NEW Ensure polymorphic has_one fields are indexed
* Add tests for config based indexing on composite DBFields
* Allow fields to have "indexed" option passed via field spec
2017-07-17 14:36:29 +12:00
Damian Mooyman
6f50e080ad Merge pull request #7177 from robbieaverill/pulls/4.0/cms-header-tabs-behat-context
NEW Add Behat CMS header tab context methods
2017-07-17 10:51:10 +12:00
Robbie Averill
a8b3da6958 Check for null values when getting CMS tab elements 2017-07-17 10:11:59 +12:00
Robbie Averill
2dd5bb4d19 NEW Add Behat CMS header tab context methods 2017-07-16 23:48:02 +12:00
Robbie Averill
1a38feff22 FIX Version provider uses early bound config getter, move LeftAndMain config to admin module 2017-07-16 16:49:10 +12:00
Daniel Hensby
7fd316d405
Merge branch 3 into 4 2017-07-15 13:20:37 +01:00
Daniel Hensby
be0e16d648 Merge pull request #7170 from robbieaverill/pulls/4.0/ignore-exceptions-on-killing-testdb
FIX Ignore exceptions thrown when deleting test databases
2017-07-14 14:53:51 +01:00
Daniel Hensby
36666eb348
Merge branch '3.6' into 3 2017-07-14 14:53:06 +01:00
Daniel Hensby
a34be33c56
Merge branch '3.5' into 3.6 2017-07-14 14:51:05 +01:00
Daniel Hensby
ddd1584e44 Merge pull request #7125 from robbieaverill/pulls/3.7/version-provider
NEW Add new SilverStripeVersionProvider to provider module versions
2017-07-14 12:03:15 +01:00
Loz Calver
c96faa3043 Merge pull request #7174 from kinglozzer/memstring2bytes
Update Convert::memstring2bytes() logic
2017-07-14 09:57:57 +01:00
Loz Calver
aafd2a573d Update Convert::memstring2bytes() logic 2017-07-14 09:16:05 +01:00
Damian Mooyman
3a7f9e8eb5 Merge pull request #7167 from open-sausages/pulls/4.0/tree-search-in-forest
API TreeDropdown tree parameter
2017-07-14 16:23:30 +12:00
Simon Erkelens
3e97b99e22 [BUG] Fix issues with multiple authenticators for a single task (#7149)
Using multiple 2FA authenticators, logging out, resetting password etc. proved to be handled wrong.
Example scenario:
The result is an error, because the `renderWrappedController` was called, despite the responses being a set of either array with Content or Form, or a redirect action.

The default action should be followed and not try to render if there is nothing to render

Because the logout (or changepassword, or resetpassword, etc.) has already been handled, the first response is the default authenticator's response. This _could_ be a form (in case of logout without valid token), a content set (reset password) or a form (change password).

This edge case only happens when there are multiple authenticators supporting the requested method that is _not_ login.
2017-07-14 09:20:58 +12:00
Robbie Averill
b16896f22b FIX Ignore exceptions thrown when deleting test databases
This will prevent long runnings builds (e.g. code coverage) from failing when the test database connection is gone (MySQL server has gone away) by the time the shutdown handler runs.
2017-07-13 23:33:51 +12:00
Robbie Averill
823e49526f NEW Allow SSViewer and SSViewer_FromString to be injectable 2017-07-13 20:48:58 +12:00
Christopher Joe
ccda816f90 API added flatList argument for generating the json tree list with a context string property 2017-07-13 17:04:35 +12:00
Chris Joe
243304c633 Merge pull request #7168 from open-sausages/pulls/4.0/chain-out-there
BUG Fix registered shutdown function not handling responsibility for outputting redirection response
2017-07-13 16:10:57 +12:00
Damian Mooyman
5fcd7d084f
BUG Fix registered shutdown function not handling responsibility for outputting redirection response 2017-07-13 15:32:39 +12:00
Chris Joe
10f93b71ae Merge pull request #7166 from open-sausages/pulls/4.0/fix-modules
BUG Incorrect module delimited
2017-07-13 15:04:00 +12:00
Aaron Carlino
16b66440c2 BUG: Incorrect module delimiter 2017-07-13 13:15:01 +12:00
Damian Mooyman
4898c0a4ad
BUG Incorrect module delimited 2017-07-13 12:15:12 +12:00
Aaron Carlino
2b266276c2 API Implement new module sorting pattern 2017-07-13 10:27:27 +12:00
Chris Joe
695e0483aa Merge pull request #7143 from open-sausages/pulls/4.0/test-docs
Update sapphiretest docs
2017-07-12 17:00:30 +12:00
Robbie Averill
48d9088ab4 Separate composer.lock load method and add test mocking it 2017-07-11 12:22:25 +12:00
Damian Mooyman
10fd7813ed Merge pull request #7153 from kinglozzer/file-ini2bytes
Fix: Make File::ini2bytes() compliant with binary prefixes (fixes #7145)
2017-07-11 11:29:05 +12:00