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
16,922 Commits 31 Branches 527 Tags 162 MiB
52f9e28131
Commit Graph

16922 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Loz Calver
fac6e6a929
Merge pull request #8317 from silverstripe/pulls/3.7/application-json-plz 
FIX txt/json is not a valid content type
 2018-08-13 14:34:45 +01:00
Daniel Hensby
5f48b3e5d2
FIX txt/json is not a valid content type 2018-08-13 12:16:42 +01:00
Ingo Schommer
a6cab8850d
Merge pull request #8270 from sminnee/fix-afterCallActionHandler 
FIX: Correct afterCallActionHandler arguments to match SS4.
 2018-07-18 23:13:24 +12:00
Sam Minnee
a4bf2cd1f3 FIX: Correct afterCallActionHandler arguments to match SS4. 
The extension point RequestHandler::afterCallActionHandler was missing a critical
argument that has since been added to SS4. This patch backports the change to 3.x.
 2018-07-18 17:25:50 +12:00
Daniel Hensby
01f29bfa5e
Merge branch '3.7' into 3 2018-07-17 20:53:41 +01:00
Daniel Hensby
d430763a87
Merge remote-tracking branch 'upstream/3.7.1' into 3.7 2018-07-17 20:52:12 +01:00
Daniel Hensby
d096a37f32
Added 3.7.1 changelog 2018-07-17 16:53:27 +00:00
Daniel Hensby
259a0a50ad
Merge pull request #8268 from dhensby/pulls/3.7.1/fix-installer-error 
FIX sizeof doesnt work with null types
 2018-07-17 16:24:02 +01:00
Daniel Hensby
e38c30ff0d
FIX sizeof doesnt work with null types 2018-07-17 15:53:38 +01:00
Ingo Schommer
13e8b155ec
Merge pull request #8242 from sminnee/simpler-vary-header 
FIX: Remove X-Requested-With from default Vary header.
 2018-07-05 13:32:46 +12:00
Daniel Hensby
6f833aa0de
Merge pull request #8239 from alex-dna/patch-2 
Make column work
 2018-07-04 14:54:25 +01:00
Daniel Hensby
5a5de201c5
Merge pull request #8238 from alex-dna/patch-1 
Make column work
 2018-07-04 14:54:09 +01:00
Sam Minnee
fa7f1954be Fix test to match 2018-07-04 15:56:47 +12:00
Sam Minnee
72ce2b422d Update docs for Vary: X-Requested-With 2018-07-04 15:55:52 +12:00
Sam Minnee
9c9872ebac FIX: Remove X-Requested-With from default Vary header. 
The X-Requested-With header does modify the result of Director::is_ajax
and so this should strictly be in there. In practise, this can cause
issues with CDNs such as Incapsula, and LeftAndMain adds this vary
header itself, which is the principle place where Director::is_ajax
is used.
 2018-07-04 13:35:47 +12:00
Alex Saelens
fd7efba7d9
Make column work 
The ColumnCount is set on the CompositeField class, and not on its FieldList. So to get the ColumnCount, we need to use $Top to get out of the loop.
 2018-07-04 09:48:39 +12:00
Alex Saelens
ed3c0b8d4e
Make column work 
The ColumnCount is set on the CompositeField class, and not on its FieldList. So to get the ColumnCount, we need to use $Top to get out of the loop.
 2018-07-04 09:46:31 +12:00
Loz Calver
00a263092e
Merge pull request #8226 from botzkobg/3.7 
Add 'updateComponents' extend in DataObject->getComponents()
 2018-06-28 13:53:40 +01:00
botzkobg
d247027d0f
Add 'updateComponents' extend in DataObject->getComponents() 2018-06-28 11:07:20 +01:00
Luke Edwards
2b05d803f3
Merge pull request #8214 from open-sausages/pulls/3/docs-upgrading-session-usage 
DOCS Upgrading 3.x docs on session stage param
 2018-06-26 10:34:58 +12:00
Aaron Carlino
ef09092450 Added 3.7.1-rc1 changelog 2018-06-25 11:44:14 +12:00
Ingo Schommer
1fe8cf77d1 DOCS Upgrading 3.x docs on session stage param 
[ci skip]
 2018-06-25 11:10:49 +12:00
Robbie Averill
d279702366 Merge branch '3.7' into 3 2018-06-22 18:13:43 +12:00
Robbie Averill
81b2d84171
Merge pull request #8196 from open-sausages/pulls/3.7/reverse-performance-breakage 
Reverse 5b6a39e71a
 2018-06-20 11:26:37 +12:00
Daniel Hensby
677d28b044
Merge pull request #8198 from creative-commoners/pulls/3.7/remove-precise 
FIX Switch to Trusty in Travis
 2018-06-19 14:04:07 +01:00
Robbie Averill
4de82ae828 Remove duplicate localhost hostname (fixed Selenium bug) 2018-06-19 23:13:45 +12:00
Robbie Averill
58bd6c2248 FIX Switch to Trusty in Travis 2018-06-19 21:41:46 +12:00
Robbie Averill
ce4186dcaf
Merge pull request #8161 from open-sausages/pulls/3.7/cleanup-travis-builds 
Simplify travis builds
 2018-06-19 21:30:56 +12:00
Damian Mooyman
4035b3ff87
Reverse 5b6a39e71a 2018-06-19 11:06:13 +12:00
Damian Mooyman
95f6ed9017
Simplify travis builds 
3 framework phpunit
1 framework behat
1 cms phpunit
1 cmsbehat
 2018-06-18 13:25:54 +12:00
Daniel Hensby
587737ffaf
Merge branch '3.7' into 3 2018-06-13 14:23:57 +01:00
Daniel Hensby
936fd775c5
DOCS Fix bad usage of HTTPCacheControl::inst() 2018-06-13 14:23:05 +01:00
Damian Mooyman
1acb80851c
Merge pull request #8154 from xini/patch-4 
fix Versioned::choose_site_stage() if no request given
 2018-06-13 13:45:00 +12:00
Robbie Averill
520138f081
Merge pull request #8160 from open-sausages/pulls/3.7/validate-by-stage 
BUG Error if invalid stage specified for get_by_stage
 2018-06-12 11:51:34 +12:00
Damian Mooyman
d271d522ce
Remove blank extra 2018-06-12 11:26:34 +12:00
Florian Thoma
c9005b2a70 add check for currentl controller 2018-06-11 08:07:37 +02:00
Damian Mooyman
02cd32acb3
BUG Error if invalid stage specified for get_by_stage 2018-06-11 15:04:43 +12:00
Florian Thoma
42e799bc43
fix Versioned::choose_site_stage() if no request given 
Load request from curent controller as a fallback
 2018-06-09 20:37:52 +02:00
Damian Mooyman
046d36b0e7
Merge remote-tracking branch 'origin/3.7' into 3 2018-06-08 12:56:58 +12:00
Damian Mooyman
d9261af1f3 Added 3.7.0 changelog 2018-06-08 12:19:40 +12:00
Damian Mooyman
f88d2a9a27 Remove obsolete branch-alias 2018-06-08 12:19:35 +12:00
Daniel Hensby
2b4954035f NEW Add better HTTP cache-control manipulation (#8086) 2018-06-08 11:56:31 +12:00
Robbie Averill
1d0cffd0e4
Merge pull request #8146 from open-sausages/pulls/3/fix-weird-crash 
BUG Fix crash on ID in default_sort
 2018-06-07 15:57:42 +12:00
Damian Mooyman
4a0e5b6367
BUG Fix crash on fixed_fields in default_sort 2018-06-07 14:54:04 +12:00
Daniel Hensby
3139b246d9
Merge pull request #8144 from open-sausages/pulls/3/the-big-shortcode 
NEW: StringField exists() checks don't have to use RAW()
 2018-06-06 15:51:49 +01:00
Aaron Carlino
c639ffa9ce New isPopulated method to allow StringField subclasses to check existence without RAW 2018-06-06 23:26:07 +12:00
Damian Mooyman
aecac871cf
Merge pull request #8109 from open-sausages/pulls/3/docs-3.7.0-guide 
Object upgrade notice for 3.7.0 changelog
 2018-06-06 14:12:58 +12:00
Damian Mooyman
b6374506ea
Merge branch '3' into pulls/3/docs-3.7.0-guide 2018-06-06 09:25:27 +12:00
Daniel Hensby
baf4450961
Merge pull request #8122 from open-sausages/pulls/3/fix-dev-build-stage 
BUG Prevent stage querystring args during dev/build
 2018-06-05 16:35:49 +01:00
Daniel Hensby
9eeebceaa1
Merge branch '3.6' into 3 2018-06-05 16:31:22 +01:00