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,972 Commits 31 Branches 527 Tags 162 MiB
7c96feef37
Commit Graph

20972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robbie Averill
7c96feef37 Merge branch '4.3' into 4 2019-01-08 12:27:48 +01:00
Loz Calver
54933c07c4
Merge pull request #8698 from creative-commoners/pulls/4.4/single-uppercase-label 
NEW Scaffolded field labels now only have an uppercased first word
 2019-01-08 11:27:15 +00:00
Robbie Averill
937d73fefc Merge branch '4.2' into 4.3 
# Conflicts:
 #	docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
 #	lang/en.yml
 2019-01-08 12:25:48 +01:00
Robbie Averill
280222abbe Merge branch '4.1' into 4.2 
# Conflicts:
 #	docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
 2019-01-08 12:22:20 +01:00
Robbie Averill
802261aa4b Merge branch '4.0' into 4.1 
# Conflicts:
 #	docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
 2019-01-08 12:21:27 +01:00
Ingo Schommer
f80e16adde DOCS clarified release EOL process 2019-01-08 12:20:17 +01:00
Robbie Averill
4128ae74b4
Merge pull request #8701 from creative-commoners/pulls/4.3/730-stable 
Update Travis to use PHP 7.3 stable
 2019-01-08 11:10:51 +01:00
Robbie Averill
4adac7d591 Update Travis to use PHP 7.3 stable 2019-01-08 10:47:41 +01:00
Robbie Averill
394dd4765c NEW Scaffolded field labels now only have an uppercased first word 2019-01-07 17:52:28 +01:00
Robbie Averill
7cb8256fa0
Merge pull request #8689 from jinjie/fix-checkbox-disabled-items 
Fix for CheckboxSetField not disabling items correctly
 2019-01-07 09:25:34 +00:00
Guy Marriott
9f463236ab
Update README to fix issue reporting guidelines link 2019-01-07 13:06:59 +13:00
Kong Jin Jie
1667af8f5e Add $disabledItems to check for disabled items instead of checking against $defaultItems 
Fixes #8688
 2018-12-31 17:25:11 +08:00
Maxime Rainville
b22af5303f
Merge pull request #8684 from phptek/issue/8459 
FIX: Fixes #8459 Missing conditionals for optional constructor args
 2018-12-19 14:08:32 +13:00
Serge Latyntsev
600918fe39
Merge pull request #8639 from caffeineinc/bugfix/4-duplicate-session-headers-8543 
Stop duplicate session cookies on every request.
 2018-12-19 13:56:24 +13:00
Russell Michell
0397c54b5a FIX: Fixes #8459 
- Missing conditionals for optional constructor args
- Missing calls to FieldList::setForm()
- Missing guards around naive calls to Form::Fields()->foo()
 2018-12-19 13:28:19 +13:00
Simon Gow
d01585cc98 #8543 Resolve Duplicate Headers 
- fix linting
 2018-12-19 12:39:32 +13:00
Simon Gow
1edfa4d956 #8543 Resolve Duplicate Headers 
- Replace session name lookup with function to also check secure cookies
- Added timeout which defaults to 0 (same as PHP)
- Removed php7 style of session_start from PR
- moved session_start into headers sent block to prevent warnings.
 2018-12-19 12:39:32 +13:00
Simon Gow
4eb6669c08 #8543 Resolve Duplicate Headers 
Put cookie_lifetime back into the session parameters.
 2018-12-19 12:39:32 +13:00
Simon Gow
2deb8f4176 Resolve Duplicate Headers 
Ensure only a single Set-Cookie header is returned from Session once
we have data to save. Include backwards compatibility for PHP56
 2018-12-19 12:39:32 +13:00
Ingo Schommer
9bdd5fb162 DOCS Replaced references to core mailinglist with forum 2018-12-19 10:20:46 +13:00
Ingo Schommer
8b601b8ecc DOCS Further wording changes to pre announce release docs 2018-12-19 09:41:59 +13:00
Robbie Averill
828c43fa0b
Merge pull request #8679 from katjad/patch-2 
FIX: broken link under Related Lessons
 2018-12-18 11:28:43 +00:00
Guy Marriott
2d1bd84c51
Merge pull request #8680 from open-sausages/pulls/4/testing-cache-docs 
DOC Clarify testing cache behaviour changes in 4.3
 2018-12-18 17:05:20 +13:00
Ingo Schommer
cc51ffea68 DOCS Minor wording changes on release process docs 2018-12-18 16:39:32 +13:00
Ingo Schommer
783b104039 DOC Clarify testing cache behaviour changes in 4.3 2018-12-18 16:19:36 +13:00
Katja Durrani
bbaba60199
Update link to first theme tutorial to link to first project (link was broken) 2018-12-17 23:56:36 +00:00
Robbie Averill
b8e63e215e
Merge pull request #8674 from open-sausages/pulls/4/update-session-php-doc 
Correct session doc typo
 2018-12-14 08:25:53 +00:00
Maxime Rainville
7f6b80f87d Correct session doc typo 2018-12-14 13:01:22 +13:00
Guy Marriott
1586f223b9
Merge pull request #8671 from open-sausages/pulls/4/update-session-php-doc 
DOCS Updating Session doc to reflect that you need to operation on an instance
 2018-12-14 10:22:33 +13:00
Maxime Rainville
7d1aa44786
Merge pull request #8654 from creative-commoners/pulls/4.3/password-complexity-test-fixes 
Update tests to pass in CWP kitchen sink context
 2018-12-13 16:50:25 +13:00
Daniel Hensby
1644765a9f Rebase against satis changes (#8298) 2018-12-13 16:49:12 +13:00
Damian Mooyman
22314de559 DOCS Update security release docs / satis instructions (#7681) 
* DOCS Update security release docs / satis instructions

* Update based on testing
 2018-12-13 15:50:50 +13:00
Guy Marriott
87b74b9cc1
Correcting Max's eggrigious typos 
Co-Authored-By: maxime-rainville <maxime@rainville.me>
 2018-12-13 13:50:35 +13:00
Maxime Rainville
6e214e2e8b DOCS Updating Session doc to reflect that you need to operation on an instance. 2018-12-13 11:05:49 +13:00
Robbie Averill
79887cbea7
Merge pull request #8585 from zzdjk6/patch-1 
DOC: Update documentation on `How to extend the CMS interface`
 2018-12-12 19:53:18 +00:00
Robbie Averill
470093de2f
Merge pull request #8650 from sminnee/nested-vendor 
FIX: Manifest should ignore vendor folders within packages contained in vendor
 2018-12-12 19:52:03 +00:00
Robbie Averill
fcc37350a1 Merge branch '4.3' into 4 2018-12-12 12:17:37 +00:00
Guy Marriott
020c6fd479
Merge pull request #8663 from open-sausages/pull/4.3/wait-for-loading-after-step 
FIX behat CmsUiContext waits for cms-loading-container after step
 2018-12-12 18:26:31 +13:00
Aaron Carlino
ab116cd5d9 Merge branch '4.1' into 4.2 2018-12-12 15:56:53 +13:00
Aaron Carlino
8e8a8cae9f Update changelog 2018-12-12 14:54:31 +13:00
Aaron Carlino
4ff891fc87 Add changelog 2018-12-12 14:21:23 +13:00
Aaron Carlino
2f9dae2c71 Add changelog 2018-12-12 14:11:21 +13:00
Aaron Carlino
00e996f164 Add changelog 2018-12-12 13:47:17 +13:00
Aaron Carlino
9939719ae3 Update translations 2018-12-12 12:50:47 +13:00
Aaron Carlino
90a50649dd Update translations 2018-12-12 12:34:51 +13:00
Aaron Carlino
fed9afb046 Update translations 2018-12-12 12:21:17 +13:00
Robbie Averill
74698af402 [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection 2018-12-11 20:57:18 +13:00
Robbie Averill
8bd747d12a [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection 2018-12-11 20:56:55 +13:00
Robbie Averill
fecedc2d98 [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection 2018-12-11 20:56:40 +13:00
Robbie Averill
48bd335648 [SS-2018-020] Ensure that table names are escaped to prevent possible SQL injection 2018-12-11 20:55:58 +13:00