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

19661 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damian Mooyman
a3c52f901a
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Core/TempFolder.php
#	src/ORM/DataObject.php
#	src/View/ThemeResourceLoader.php
#	src/includes/constants.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
#	tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
#	tests/php/View/RequirementsTest.php
 2018-01-22 14:57:05 +13:00
Loz Calver
4a8f9a8da8
Merge pull request #7773 from open-sausages/pulls/4.0/safer-gridfield-version 
BUG Make GridFieldConfig less susceptible to error when versioned isn't installed
 2018-01-18 09:23:06 +00:00
Damian Mooyman
16ad7e8fea
BUG Make GridFieldConfig less susceptible to error when versioned isn't installed 2018-01-18 16:43:51 +13:00
Damian Mooyman
24e6794352
Merge pull request #7771 from DrMartinGonzo/patch-1 
Added style_formats example + links to docs
 2018-01-18 10:50:43 +13:00
Damian Mooyman
6b69907d1e
Merge pull request #7770 from dhensby/pulls/4.0/add-public-dir-constants 
Add `PUBLIC_*` constants to 4.0.x for easier compatibility
 2018-01-18 09:02:36 +13:00
Martin Portevin
0ca152c156
Added style_formats example 2018-01-17 18:27:28 +01:00
Daniel Hensby
3eaa83ed82
Add PUBLIC_* constants to constants.php for easier backwards compatible support of 4.0 and 4.1 2018-01-17 15:16:15 +00:00
Daniel Hensby
6aaee429db
Remove inaccurate comment from constants.php 2018-01-17 15:15:38 +00:00
Daniel Hensby
7a0d432ece
Merge pull request #7744 from dhensby/pulls/4.0/force-spaces-around-string-concat 
CS Force spaces around string concat operators
 2018-01-17 11:00:15 +00:00
Daniel Hensby
bb63031b35
Merge pull request #7766 from dhensby/pulls/4/test-ns-fix 
FIX Misnamed test namespaces
 2018-01-17 10:36:09 +00:00
Robbie Averill
40b2aeb7a3
Merge pull request #7760 from open-sausages/pulls/4/fix-editor-public-resolve 
BUG Fix themed editor.css url not being resolved properly
 2018-01-17 12:08:32 +13:00
Daniel Hensby
db610aaf3b
Fixing string concat CS issues 2018-01-16 18:39:30 +00:00
Daniel Hensby
ff05a7265e
CS Force spaces around string concat operators 2018-01-16 18:39:24 +00:00
Daniel Hensby
c959160375
FIX Misnamed test namespaces 2018-01-16 17:41:18 +00:00
Daniel Hensby
5203ddff42
Merge pull request #7486 from wernerkrauss/improve-test-dataproviders 
Improve test dataproviders
 2018-01-16 15:57:50 +00:00
Daniel Hensby
42511d8061
Merge pull request #7714 from @zanderwar 2018-01-16 15:43:18 +00:00
Werner M. Krauß
422857f381
SapphireTestTest: use named data providers and more error messages 
* use keys for naming each data set
* adding error messages
* clean up a bit
 2018-01-16 15:25:40 +00:00
Daniel Hensby
ebeaf3e40d
Merge branch '3' into 4 2018-01-16 11:47:39 +00:00
Loz Calver
daac577e62
Merge pull request #7763 from creative-commoners/pulls/4.0/fix-remove-header 
FIX HTTPResponse::removeHeader incorrectly converts header name to lowercase
 2018-01-16 11:04:03 +00:00
Robbie Averill
a8c156ae98
Merge pull request #7756 from dhensby/pulls/4.0/fix-bad-request-form-handlers 
Forms with FormHandlers don't have access to current request object
 2018-01-16 23:32:00 +13:00
Robbie Averill
4618998479
Merge pull request #7758 from open-sausages/pulls/4.0/prevent-unlogout-basicauth 
BUG Prevent basic-auth from disallowing logout
 2018-01-16 23:30:40 +13:00
Daniel Hensby
7f6af0f0ed
Merge branch '4.0' into 4 2018-01-16 10:28:24 +00:00
Daniel Hensby
9b30024d86
Merge branch '3.6' into 4.0 2018-01-16 10:26:21 +00:00
Robbie Averill
cc90cb0125 FIX HTTPResponse::removeHeader incorrectly converts header name to lowercase 2018-01-16 23:20:52 +13:00
Daniel Hensby
58a8463441
Merge pull request #7759 from open-sausages/pulls/4/fix-doctor-public 
BUG Fix `upgrade-code doctor` with public path
 2018-01-16 08:40:18 +00:00
Damian Mooyman
e770146141
Merge remote-tracking branch 'origin/3.6' into 3 2018-01-16 17:06:59 +13:00
Damian Mooyman
bb37bc5491 Added 3.6.4 changelog 2018-01-16 16:40:43 +13:00
Damian Mooyman
ca2fe3b1f6
BUG Fix themed editor.css url not being resolved properly 2018-01-16 16:25:17 +13:00
Damian Mooyman
20348b5f42
BUG Fix upgrade-code doctor with public path 2018-01-16 15:38:12 +13:00
Damian Mooyman
f86b855c90
BUG Prevent basic-auth from disallowing logout 
Fixes #7555
 2018-01-16 15:24:20 +13:00
Robbie Averill
fc0e0442c8
Merge pull request #7757 from open-sausages/pulls/4.0/update-editorcss-docs 
DOCS Update editor.css usage docs
 2018-01-16 14:34:10 +13:00
Damian Mooyman
971a1f0703
DOCS Update editor.css usage docs 2018-01-16 12:36:00 +13:00
Chris Joe
5a18c3c405
Merge pull request #7755 from open-sausages/pulls/4/soft-declare-public 
BUG Don't re-declare manually-declared variables for public folder
 2018-01-16 11:59:17 +13:00
Daniel Hensby
f3d00f1b4b
Merge branch '3.6' into 4.0 2018-01-15 16:51:20 +00:00
Daniel Hensby
bb90751cc8
Merge branch '3.6' into 3 2018-01-15 16:44:48 +00:00
Daniel Hensby
dc96862cac
FIX Forms run through FormHandler rather than Controllers now have access to current Request 2018-01-15 13:08:43 +00:00
Damian Mooyman
15ef769e1d
BUG Don't re-declare manually-declared variables for public folder 2018-01-15 14:45:15 +13:00
Damian Mooyman
39a8410460
Merge pull request #7754 from oetiker/patch-1 
JSON.parse does not like empty strings
 2018-01-15 10:56:15 +13:00
Tobias Oetiker
396005381f
JSON.parse does not like empty strings 
Add some protection for the case that envent.data is empty or null
 2018-01-12 16:21:33 +01:00
Daniel Hensby
e4b936c7c7
Merge branch '4.0' into 4 2018-01-12 14:40:33 +00:00
Loz Calver
67ea95bc2a
Merge pull request #7750 from creative-commoners/pulls/4.1/remove-relation-setters 
NEW Add getter and setter for removeRelation in GridFieldDeleteAction
 2018-01-12 09:58:23 +00:00
Damian Mooyman
a15c6887fc
Merge pull request #7746 from dhensby/pulls/4.0/allow-injector-extensions 
FIX Allow extension instances to be overridden by injector
 2018-01-12 17:10:04 +13:00
Damian Mooyman
8d077203d4 API Implement support for public/ webroot folder (#7741) 
* API Implement support for public/ webroot folder

* Bugfixes and refactor based on feedback
 2018-01-12 16:25:02 +13:00
Robbie Averill
9fddb5de99 NEW Add getter and setter for removeRelation in GridFieldDeleteAction 
This allows users to modify the property value in the component without having to
remove it and add a new one when they want to change it.
 2018-01-12 14:23:22 +13:00
Daniel Hensby
7d66342496
FIX Allow extension instances to be overridden by injector 2018-01-12 00:38:15 +00:00
Daniel Hensby
3312a68dc2
Merge pull request #7747 from open-sausages/pulls/4.0/fix-nginx-try 
DOCS Fix try_files index.php reference
 2018-01-11 21:25:18 +00:00
Ingo Schommer
fb1be0619f
Removed version numbers from OS req docs 
Too icky to keep updated as version numbers change. It's really just a matter of what PHP version supports which OS, from a SilverStripe side we don't have any constraints there. Well, technically Windows 3.11 won't work because the filesystem will fall over, but otherwise LAMP/WAMP is pretty forgiving.
 2018-01-12 10:24:13 +13:00
Damian Mooyman
2b868b09f5
DOCS Fix try_files index.php reference 
Fixes https://github.com/silverstripe/silverstripe-cms/issues/2067#issuecomment-356879060
 2018-01-12 09:26:37 +13:00
Daniel Hensby
de6afd4405
TEST Cant reliably use Injector to replace Extensions 2018-01-11 14:08:29 +00:00
Daniel Hensby
4c51cf67e7
Merge pull request #7742 from nglasl/3.6 
FIX, adding a missing return statement.
 2018-01-09 23:43:18 +00:00