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
20,386 Commits 31 Branches 527 Tags 162 MiB
37a266f2f0
Commit Graph

20386 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
37a266f2f0 Merge branch '4.1' into 4.2 2018-08-27 16:14:24 +12:00
Scott Hutchinson
4da5569232 FIX ensure createFromVariables takes correct params on CLIRequestBuilder 2018-08-27 16:12:52 +12:00
Robbie Averill
66c09afc9c Merge branch '4.0' into 4.1 2018-08-27 16:12:04 +12:00
Robbie Averill
3178fbf3bb
Merge pull request #8028 from andrewandante/pulls/4.0/unset_http_scheme_on_cli 
unset http scheme on CLIRequestBuilder
 2018-08-27 16:11:42 +12:00
Robbie Averill
a87165c299
Merge pull request #8326 from creative-commoners/pulls/4.2/remove-double-encoding 
FIX Remove double escaping of HTML values in print views
 2018-08-27 13:37:32 +12:00
Robbie Averill
c459130986
Merge pull request #8323 from lekoala/patch-11 
email rendering should not include requirements
 2018-08-23 15:10:41 +12:00
Thomas Portelange
27ac001d5b FIX email rendering should not include requirements 
If no body is defined, the email is rendered according to a template. Clearing requirements prevent unnecessary styles/scripts to be included in the html (and that needs to be processed/stripped down the line).
 2018-08-23 14:01:27 +12:00
Robbie Averill
373326e49c
Merge pull request #8324 from creative-commoners/pulls/4.2/request-before-init 
FIX Pass request to dummy controller before calling init
 2018-08-21 12:08:14 +12:00
Daniel Hensby
aa153cb5c7
Merge pull request #8315 from open-sausages/pulls/4.2/changing-change 
FIX Paginating a gridfield causing a change event
 2018-08-20 17:59:50 +01:00
Daniel Hensby
90dae07493
Merge pull request #8335 from creative-commoners/pulls/4.2/correct-lost-password-links 
FIX Message when changing password with invalid token now contains correct links to login
 2018-08-20 12:22:43 +01:00
Robbie Averill
18fff5c16c Remove past tense for "log in" in expired token message 2018-08-20 22:31:23 +12:00
Robbie Averill
dbab696690 FIX Message when changing password with invalid token now contains correct links to login 
The Security controller should be used to return these links rather than the
ChangePasswordHandler
 2018-08-20 22:30:12 +12:00
Luke Edwards
9f5b0086cb FIX Paginating a gridfield causing a change event 2018-08-17 09:35:57 +12:00
Robbie Averill
0db594b2d3 FIX Remove double escaping of HTML values in print views 
Print view uses the SilverStripe templating to render values which means that
values are safely escaped by default. This can be tested by chaing `$CellString`
to `$CellString.RAW` in the GridField_print.ss template to see this escaping
being disabled.

This pull request removes double escaping of HTML in strings.
 2018-08-15 17:57:40 +12:00
Robbie Averill
48c6dec47d Merge branch '4.1' into 4.2 2018-08-15 13:23:07 +12:00
Robbie Averill
1ad2d6535e Merge branch '4.0' into 4.1 2018-08-15 13:22:46 +12:00
Robbie Averill
873873dc30 FIX Pass request to dummy controller before calling init 2018-08-15 10:14:25 +12:00
Robbie Averill
88d3794828
Merge pull request #8321 from scott1702/patch-4 
Fix indentation on pagination guide
 2018-08-14 15:39:07 +12:00
Scott Hutchinson
3bd2cbf199 DOCS indentation on pagination guide [ci skip] 
For all those copy + paste fiends
 2018-08-14 15:36:52 +12:00
Daniel Hensby
518f798ff8
Merge pull request #8292 from creative-commoners/pulls/4.2/fix-id-conflict 
FIX Altering ID of authenticator tabs to resolve ID conflict
 2018-07-31 00:35:06 +01:00
Daniel Hensby
17dbb86257
Merge pull request #8293 from open-sausages/pulls/4.2/restore-default-delete-action-of-record-editor 
FIX Restore default delete action on GridFieldConfig_RecordEditor
 2018-07-30 17:00:09 +01:00
root
9d7eefce1d Added 4.2.1 changelog 2018-07-30 14:12:55 +00:00
root
c4b2f758c1 Update translations 2018-07-30 14:12:40 +00:00
Daniel Hensby
ec5640cbd9
Merge tag '4.2.0' into 4.2 
Release 4.2.0
 2018-07-30 11:04:57 +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
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
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
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