tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-06 01:31:22 +02:00
Code Issues Projects Releases Wiki Activity
18,705 Commits 29 Branches 525 Tags 150 MiB
be7b2d4970
Commit Graph

18705 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ea4181166f FIX Ensure phpdbg calls are registered by SilverStripe core as a CLI call 2017-07-17 16:56:01 +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
Daniel Hensby
b2831b809c Merge pull request #7133 from kinglozzer/cache-classname 
Cache ClassInfo::class_name() calls
 2017-07-10 13:23:45 +01:00
Loz Calver
960a0f8343
Fix: Make File::ini2bytes() compliant with binary prefixes (fixes #7145) 2017-07-10 09:41:36 +01:00
Damian Mooyman
7032c4a478
Update sapphiretest docs 2017-07-07 10:45:39 +12:00
Chris Joe
0b09a510f4 Merge pull request #7136 from open-sausages/pulls/4.0/fix-installer-create-admin 
BUG Ensure that installer can create an initial admin account
 2017-07-07 09:15:41 +12:00
Chris Joe
0f02c67b8c Merge pull request #7112 from open-sausages/feature/form-injector-simplify 
Documentation updates for new form injector API
 2017-07-06 17:06:56 +12:00
Damian Mooyman
85359ad59e
BUG Ensure that installer can create an initial admin account 
Fixes #7124
 2017-07-06 13:30:04 +12:00
Loz Calver
e3e16fe835 Cache ClassInfo::class_name() calls 2017-07-05 15:15:08 +01:00
Daniel Hensby
f769d9a13f Merge pull request #7059 from mfendeksilverstripe/3.5 
Html editor selection is now properly stored while the dialog is open
 2017-07-05 15:03:18 +01:00
Daniel Hensby
aafa054cf7 Merge pull request #7129 from mfendeksilverstripe/master 
Limited nodes with too many children are no longer accessible
 2017-07-05 12:37:26 +01:00
Daniel Hensby
2c5e237a93
Merge pull request #7103 from dnadesign/fix-numericfield-null 2017-07-05 11:45:45 +01:00
Daniel Hensby
2f551c91d7 Merge pull request #6922 from kinglozzer/debugview-styles 
Update DebugView styles
 2017-07-05 11:35:04 +01:00
Daniel Hensby
24a7a64c39
Merge pull request #6440 from open-sausages/pulls/4.0/requirements-module-resource-port 2017-07-05 11:31:43 +01:00
Aaron Carlino
2b1587894a
Documentation updates for new form injector API 2017-07-05 11:09:18 +01:00
Loz Calver
713b01ebc7 Update DebugView styles 2017-07-05 09:14:26 +01:00
Damian Mooyman
55dc3724db FIX Invalid composer.json 2017-07-05 16:24:15 +12:00
Christopher Joe
6492b8edae Update composer alias 2017-07-05 16:22:06 +12:00
Aaron Carlino
c836a2e2d2 BUGFIX: Module resource regex does not allow ports 2017-07-05 13:26:30 +12:00
Mojmir Fendek
3f2d217a45 Limited nodes that have more children than allowed limit are no longer accessible to the user. 2017-07-05 11:34:24 +12:00
John Milmine
f14e6bae2c fix numeric field for null values 2017-07-05 07:35:13 +12:00
Daniel Hensby
c472957bd2 Merge pull request #7126 from andrewandante/patch-1 
FIX remove info div to fix formatting
 2017-07-04 13:46:18 +01:00
Daniel Hensby
64005bff91 Merge pull request #6440 from open-sausages/pulls/4.0/json-detection 
ENHANCEMENT: Debug class emits plain text for application/json requests
 2017-07-04 13:42:42 +01:00
Andrew Aitken-Fincham
7812f34a2d remove info div to fix formatting 2017-07-04 12:50:57 +01:00