Commit Graph

20499 Commits

Author SHA1 Message Date
Robbie Averill
7d1ce41e49
Merge pull request #8296 from open-sausages/pulls/4/doc-update-minimum-composer-version
FIX Specify minimum composer version
2018-07-30 13:01:54 +12:00
Maxime Rainville
fde7b9ddc5 FIX Specify minimum composer version
Specify the minimal version of composer to use in upgrading guide.
2018-07-30 12:35:49 +12:00
Robbie Averill
8d1af25e27
Merge pull request #8294 from kinglozzer/manymanythrough-docs
Update many-many-through docs (closes #8290)
2018-07-27 20:56:02 +12:00
Loz Calver
ef335a8a30 Update many-many-through docs (closes #8290) 2018-07-27 09:30:13 +01:00
Maxime Rainville
85b4b48fb5 FIX Restore default delete action on GridFieldConfig_RecordEditor 2018-07-27 17:19:09 +12:00
Guy Marriott
0d90cdb05d
FIX Altering ID of authenticator tabs to resolve ID conflict 2018-07-27 16:01:52 +12:00
Ingo Schommer
36834075df
Merge pull request #8288 from open-sausages/pulls/4/recommend-install-upgrader-with-phar
BUG Recommend install of upgrader with PHAR exec.
2018-07-26 16:19:02 +12:00
Maxime Rainville
900ca9c8d7 BUG Recommend install of upgrader with PHAR exec.
Update the Upgrading guide to recommend installing of the PHAR
executable of the upgrader over using `composer glboal require`.
2018-07-26 14:41:32 +12:00
Robbie Averill
8723336b1c
Merge pull request #8287 from michalkleiner/pulls/4/update-4.2.0-changelog
Fix backtick in changelog breaking sentence formatting
2018-07-26 10:14:58 +12:00
Michal Kleiner
0035f4a907
Fix backtick in changelog breaking sentence formatting 2018-07-26 10:07:29 +12:00
Maxime Rainville
97c7caf1f1
Merge pull request #8281 from michalkleiner/pulls/4/update-php-parser-dependency
MINOR Allow version 4 of nikic/php-parser
2018-07-25 09:36:45 +12:00
Robbie Averill
aa5adaf958
Merge pull request #8282 from mspacemedia/patch-1
Make removeDuplicates() chainable
2018-07-25 08:37:04 +12:00
root
1bcd449ace Added 4.2.0 changelog 2018-07-24 19:10:40 +00:00
root
bdf3bc965c Update translations 2018-07-24 19:07:41 +00:00
Mark Muller
e154aa170c
Make removeDuplicates() chainable
Added the return to allow removeDuplicates to be chained.
2018-07-24 13:50:37 +01:00
Michal Kleiner
63feab98b9
Allow version 4 of nikic/php-parser dependency 2018-07-24 16:18:44 +12:00
Daniel Hensby
ae00147de1
Merge pull request #8280 from open-sausages/pulls/4/simpler-vary-header
FIX: Remove X-Requested-With from default Vary header
2018-07-24 01:45:07 +01:00
Daniel Hensby
e1cdc8fba3
Merge pull request #8274 from open-sausages/pulls/4.2/cache-docs-and-deprecation-handling
Corrected caching docs and deprecation behaviour (fixes #8272)
2018-07-24 01:41:48 +01:00
Ingo Schommer
d12c2fe631
Properly deprecate HTTP.cache_control 2018-07-23 19:09:11 +01:00
Ingo Schommer
0f5420b6a5
Removed unused classes 2018-07-23 19:09:11 +01:00
Ingo Schommer
9300e802f7
Updated caching docs (out of sync with implementation)
See https://github.com/silverstripe/silverstripe-framework/issues/8272
2018-07-23 19:09:10 +01:00
Ingo Schommer
d426ecbb89
Add $maxAge arg for caching API
See https://github.com/silverstripe/silverstripe-framework/issues/8272
2018-07-23 19:09:10 +01:00
Daniel Hensby
cc0320b2a7
Merge branch '4.2' into 4 2018-07-23 17:42:43 +01:00
Sam Minnee
bde3121a33
FIX: Remove X-Requested-With from default Vary header
3.x forward port of https://github.com/silverstripe/silverstripe-framework/pull/8242
2018-07-23 14:18:05 +01:00
Daniel Hensby
24bd0a625c
Merge pull request #7971 from dhensby/pulls/4.0/fix-extension-config
This is a cherry-picked PR from 4.2 -> 4.2.0
2018-07-23 14:15:37 +01:00
Daniel Hensby
ef97164c0a
DOCS Update docs to reflect true config merge priorities 2018-07-23 14:15:25 +01:00
Daniel Hensby
ccbbcd45a2
FIX Fixed bug in config merging priorities so that config values set by extensions are now least important instead of most important 2018-07-23 14:15:24 +01:00
Daniel Hensby
d06234fcc7
Merge pull request #8223 from dhensby/pulls/4.0/remove-email-from-pswdrecovery
This is a cherry-picked PR from 4.2 -> 4.2.0
2018-07-23 14:14:11 +01:00
Daniel Hensby
6e1c7c2781
FIX remove personal information from password reset confirmation screen 2018-07-23 14:13:52 +01:00
Daniel Hensby
b6db400f56
Merge pull request #8184 from open-sausages/pulls/4.1/fix-issue-with-loading-submitted-value-from-session
This is a cherry-picked PR from 4.2 -> 4.2.0
2018-07-23 14:12:50 +01:00
Maxime Rainville
c77042aa8b
Fix linting. 2018-07-23 14:12:44 +01:00
Maxime Rainville
7fda52b2cd
Add a MERGE_AS_SUBMITTED_VALUE flag for Form::loadDataFrom 2018-07-23 14:12:43 +01:00
Maxime Rainville
3fa2c056d7
FIX Don't reload form session data using FormField::setSubmittedValue (#8056) 2018-07-23 14:12:43 +01:00
Daniel Hensby
5f6eec6403
Merge pull request #8269 from open-sausages/pulls/4/session-lazy
This is a cherry-picked PR from 4.2 -> 4.2.0
2018-07-23 14:10:16 +01:00
Ingo Schommer
73026292bf
Test coverage for session data change 2018-07-23 14:09:43 +01:00
Ingo Schommer
74b655d3fc
Fix tests on unset session data
Thanks Robbie!
2018-07-23 14:09:42 +01:00
Ingo Schommer
76ac8465de
BUG Lazy session state (fixes #8267)
Fixes regression from 3.x, where sessions where lazy started as required:
Either because an existing session identifier was sent through with the request,
or because new session data needed to be persisted as part of the request execution.

Without this lazy starting, *every* request will get a session,
which makes all those responses uncacheable by HTTP layers.

Note that 4.x also changed the $data vs. $changedData payloads:
In 3.x, they both contained key/value pairs.
In 4.x, $data contains key/value, while $changedData contains key/boolean to declare isChanged.
While this reduces duplication in the class, it also surfaced a bug which was latent in 3.x:
When an existing session is lazily resumed via start(), $data is set back to an empty array.
In 3.x, any changed data before this point was *also* retained in $changedData,
ensuring it gets merged into existing $_SESSION data.
In 4.x, this clears out data - hence the need for a more complex merge logic.

Since isset($this->data) is no longer an accurate indicator of a started session,
we introduce a separate $this->started flag.

Note that I've chosen not to make lazy an opt-in (e.g. via start($request, $lazy=false)).
We already have a distinction between lazy starting via init(), and force starting via start().
2018-07-23 14:09:42 +01:00
Daniel Hensby
ad850a187d
Merge pull request #8263 from dhensby/4.1/mask-backtrace
This is a cherry-picked PR from 4.2 -> 4.2.0
2018-07-23 14:08:44 +01:00
Daniel Hensby
e37b3b95f4
FIX updateValidatePassword calls need to be masked from backtraces 2018-07-23 14:08:26 +01:00
Daniel Hensby
ab942c9290
Merge pull request #8245 from dhensby/pulls/4.2/http-cache-fixes
This is a cherry-picked PR from 4.2 -> 4.2.0
2018-07-23 14:07:25 +01:00
Daniel Hensby
540c9aba69
TEST Add tests for (im)mutablity of states 2018-07-23 14:07:11 +01:00
Daniel Hensby
a3687147fe
State default should be state enabled (no-cache is an enabled state) 2018-07-23 14:07:10 +01:00
Daniel Hensby
9f1471332d
Make augmentState method more efficient 2018-07-23 14:07:10 +01:00
Daniel Hensby
cebed776ab
FIX If theres a max-age set remove no-cache and no-store 2018-07-23 14:07:09 +01:00
Daniel Hensby
2b1c55bc4e
FIX Allow setNoCache(false) to remove no-cache directive 2018-07-23 14:07:09 +01:00
Daniel Hensby
842b39e988
FIX Add must-revalidate to default state so its common on all our core states 2018-07-23 14:07:09 +01:00
Daniel Hensby
997730aa7f
FIX Allow cache control changes to affect default state 2018-07-23 14:07:08 +01:00
Daniel Hensby
d46410c49b
Merge pull request #8233 from dhensby/pulls/4.2/caching-fixes
This is a cherry-picked PR from 4.2 -> 4.2.0
2018-07-23 14:05:41 +01:00
Daniel Hensby
c52be7fe09
Consolidate disabling cache logic 2018-07-23 14:05:12 +01:00
Daniel Hensby
f7f567a12e
Make config private (notation isnt working) 2018-07-23 14:05:12 +01:00