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
21,507 Commits 31 Branches 527 Tags 162 MiB
895353c795
Commit Graph

21507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
895353c795
Merge pull request #9185 from oddnoc/nginx-protected-assets 
DOCS: update nginx config to protect .protected
 2019-08-21 08:57:52 +12:00
Fred Condo
5a534e3ba5 DOCS: update nginx config to protect .protected 
This change replicates what the apache .htaccess for the .protected
assets folder does.
 2019-08-20 13:13:59 -07:00
Guy Marriott
f676672f76
Merge branch '4.4' into 4 2019-08-19 16:10:30 +12:00
Guy Marriott
92300051a7
Update translations 2019-08-19 15:10:41 +12:00
Guy Marriott
a6614d8a77
Added 4.4.3 changelog 2019-08-19 15:01:22 +12:00
Robbie Averill
d81f281710
Merge pull request #9179 from purplespider/patch-2 
4.4.0 Upgrade Docs: Clarified that the shortcode task isn't run automatically
 2019-08-17 02:00:25 +12:00
James Cocker
f68fac2c47
4.4.0 Upgrade Docs: Clarified that the shortcode task isn't run automatically 2019-08-16 14:42:16 +01:00
Robbie Averill
a5d6b998fc Merge branch '4.4' into 4 2019-08-16 16:40:39 +12:00
Garion Herman
f4a5f5dc35
Merge pull request #9177 from creative-commoners/pulls/4.4/change-password-fix 
FIX Member::changePassword() no longer applies password validation rules to the hashed value
 2019-08-16 14:25:06 +12:00
Robbie Averill
11a7d6ccb4
Rename test to be clearer about its intent 
Co-Authored-By: Guy Marriott <guy@scopey.co.nz>
 2019-08-16 09:49:36 +12:00
Robbie Averill
bae7e32680 FIX Member::changePassword() no longer applies password validation rules to the hashed value 2019-08-16 09:06:07 +12:00
Robbie Averill
f354e2018d FIX Set minimum test scores and password length for Members while running fixtured DataObject tests 2019-08-15 15:23:11 +12:00
Robbie Averill
45f86658ca Merge branch '4.4' into 4 2019-08-14 09:31:05 +12:00
Robbie Averill
4b44272367 Merge branch '4.3' into 4.4 2019-08-14 09:30:53 +12:00
Robbie Averill
d63e4b520c Merge branch '4.2' into 4.3 2019-08-14 09:30:41 +12:00
Robbie Averill
2e2c56249e
Merge pull request #9147 from webbuilders-group/sort-order-fix 
BUGFIX: Fixed issue where multiple relationship sort order columns would be lost in favor of only the last relationship column in the sort order
 2019-08-14 09:29:20 +12:00
Robbie Averill
c6607c3e5e
Merge pull request #9176 from Rhym/patch-1 
Update pagination code snippet
 2019-08-13 15:18:56 +12:00
Ryan Potter
fa325d2360
Update pagination code snippet 
Update pagination snippet to use summarised pagination.
 2019-08-13 15:17:38 +12:00
Aaron Carlino
684f5311a0 Merge branch '4.4' into 4 2019-08-13 12:15:39 +12:00
Aaron Carlino
8cfd3f07ba Added 4.4.2 changelog 2019-08-12 16:08:07 +12:00
Aaron Carlino
8aa2005f8d Update translations 2019-08-12 16:06:24 +12:00
Robbie Averill
05d5db43f3
Merge pull request #9173 from creative-commoners/pulls/4.3/column-content-for-print-csvs 
FIX Use content generated by DataColumns component for print and csv export
 2019-08-09 15:21:50 +12:00
Guy Marriott
3d989a6eae
FIX Use content generated by DataColumns component for print and csv export 2019-08-09 15:04:38 +12:00
Robbie Averill
4936d265a2
DOCS Remove statement about a strict error when overloading PDOQuery constructor 
Constructors are not bound by method signature match rules in PHP
 2019-08-09 09:16:31 +12:00
Guy Marriott
f3132c89d7
Merge pull request #9170 from open-sausages/pulls/4/add-option-to-disable-user-agent-session-check 
API Add option to disable user-agent header session validation
 2019-08-08 11:47:07 +12:00
Maxime Rainville
54647aa0e1
Merge pull request #9072 from open-sausages/pulls/4.4/good-griddance 
BUGFIX: Nested gridfields accessing incorrect URL state
 2019-08-08 08:24:44 +12:00
Aaron Carlino
b3093b7a1a BUGFIX: Allow state to be shared across nested GridFields 2019-08-07 23:09:51 +12:00
Maxime Rainville
4380d7d155 API Add option to disable user-agent header session validation 2019-08-06 22:00:01 +12:00
Robbie Averill
4268db069d
Merge pull request #9165 from sminnee/fix-multiline-gridfield 
FIX: Allow multi-line content in grid field cells
 2019-08-05 09:59:22 +12:00
Sam Minnee
6ec02da577 FIX: Allow multi-line content in grid field cells 
It’s amazing that this but has been present for 7 years, but there you
go!
 2019-08-02 17:46:56 +12:00
Guy Marriott
7533ac7099
NEW HTTPRequest now has hasSession() to determine whether a ses… (#9159) 
NEW HTTPRequest now has hasSession() to determine whether a session exists for it
 2019-08-02 13:08:54 +12:00
Robbie Averill
0672f8b76b NEW HTTPRequest now has hasSession() to determine whether a session exists for it 2019-08-02 11:29:23 +12:00
Robbie Averill
3224c9971b Merge branch '4.4' into 4 2019-08-02 11:24:54 +12:00
Robbie Averill
3b96c51688 Merge branch '4.3' into 4.4 2019-08-02 11:24:45 +12:00
Will Rossiter
82cc8b40a4 Create SearchContext via Injector (#9156) 2019-08-01 14:39:58 +12:00
Loz Calver
6f19cb3a83
Merge pull request #9152 from creative-commoners/pulls/4.3/session-exists-check 
FIX Prevent setting session value when no session exists yet
 2019-07-30 09:42:45 +01:00
Robbie Averill
5c794dfcdd FIX Prevent setting session value when no session exists yet 2019-07-29 17:16:01 +02:00
UndefinedOffset
c1ffc4edfb Added unit tests for multiple relationship sorting 2019-07-29 10:45:10 -03:00
UndefinedOffset
40cd66852e BUGFIX: Fixed issue where multiple relationship sort order columns would be lost in favor of only the last relationship column in the sort order 2019-07-26 11:54:10 -03:00
Robbie Averill
89eb6c88b2 FIX Do not try and load fixtures from directories, fixes PHP 7.4 build errors 2019-07-26 10:13:47 +02:00
Robbie Averill
2d2b0b82f0 DOCS Fix incorrect rendering of note on list item 
[ci skip]
 2019-07-25 12:03:12 +02:00
Robbie Averill
d1c927ff23 FIX Remove curly brace access to string offsets, deprecated in PHP 7.4 2019-07-24 12:17:49 +02:00
Robbie Averill
f1d8a04928
DOCS Fix broken markdown links for docs.silverstripe.org 
[ci skip]
 2019-07-22 13:02:57 +02:00
Chee Wai
cb91f5fa06 NEW Added SRI support for Requirements::css, Requirements::javascript (#9139) 2019-07-21 09:51:22 +02:00
Robbie Averill
79fa61edf8 FIX Type safety on nullable argument, fixes PHP 7.4 test 2019-07-19 12:05:27 +02:00
Robbie Averill
2a1394bed7 Merge branch '4.4' into 4 2019-07-19 10:46:00 +02:00
Robbie Averill
40f06fafa9 Merge branch '4.3' into 4.4 2019-07-19 10:45:44 +02:00
Robbie Averill
c7b15eaef5 Merge branch '4.2' into 4.3 2019-07-19 10:45:29 +02:00
Robbie Averill
92881eacb7
Merge pull request #9138 from caffeineinc/bugfix/9114-context-summary-breaks-with-line-breaks 
#9114 - DBText::ContextSummary() cuts line breaks
 2019-07-19 10:28:59 +02:00
Simon Gow
22b514c421 #9114 - DBText::ContextSummary() cuts line breaks 
ContextSummary() was cutting the HTML which was added by nl2br because
it expected plain text elements as it's stripping and replacing text.
Instead this fix changes the behaviour to apply the nl2br after the text
changes have been made. That way we can't cut anything in the middle of
a HTML tag, but new lines, or paragraphs are replaced by BRs after,
should they exist.

- Added tests to ensure text is not cut in the middle of a sentence.
- Added test to ensure that <br>'s are added in the correct place should
the summary span between new lines.
 2019-07-19 12:43:20 +12:00