Commit Graph

19306 Commits

Author SHA1 Message Date
Daniel Hensby
cf321895ba
Merge branch '4.0' into 4 2017-11-14 13:24:15 +00:00
Chris Joe
571f770d58
Merge pull request #7575 from open-sausages/pulls/4.0/remove-imagick
Remove imagick install
2017-11-13 13:31:05 +13:00
Chris Joe
87453490d7
Merge pull request #7570 from open-sausages/pulls/4.0/docs-update
Adjust getting started docs
2017-11-13 11:53:52 +13:00
Damian Mooyman
a34e802050
Merge pull request #7581 from phptek/sapphiretest-stateisnull2
FIX: Fixes SapphireTest masking userland coding errors.
2017-11-09 17:55:56 +13:00
Russell Michell
bf20d59cb8 FIX: Fixes SapphireTest masking userland coding errors. 2017-11-09 15:39:20 +13:00
Damian Mooyman
f1865cc798
Merge pull request #7557 from sminnee/fix-1396
FIX: Fix ContextSummary behaviour with UTF8 chars
2017-11-09 13:40:43 +13:00
Damian Mooyman
7f27840926
Merge pull request #7573 from dhensby/pulls/4.0/required-fields-docblock
DOCS Improve return tags for requiredfields class
2017-11-09 13:39:15 +13:00
Damian Mooyman
6dc59a1f9f
Merge pull request #7571 from dhensby/pulls/4.0/didnt-they-tell-you-4-is-stable
DOCS Update 4.0.0 changelog to indicate stable release
2017-11-09 13:38:41 +13:00
Damian Mooyman
d73b285671
Merge pull request #7574 from dhensby/pulls/4.0/email-render-fix
FIX Make sure plain parts are rendered when re-rendering emails
2017-11-09 12:24:32 +13:00
Damian Mooyman
fba33ad2e0
Remove imagick install 2017-11-09 11:52:44 +13:00
Daniel Hensby
6139de8680
FIX Make sure plain parts are rendered when re-rendering emails 2017-11-08 15:32:51 +00:00
Daniel Hensby
2f9fae32c1
DOCS Improve return tags for requiredfields class 2017-11-08 15:29:15 +00:00
Daniel Hensby
3cd0b23172
DOCS add import to upgrade example 2017-11-08 14:56:13 +00:00
Daniel Hensby
079fffb0f0
DOCS Update 4.0.0 changelog to indicate stable release 2017-11-08 12:58:30 +00:00
Damian Mooyman
e696d87b9c
Adjust getting started docs 2017-11-08 17:10:58 +13:00
Damian Mooyman
1284ee86d8
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-08 15:29:26 +13:00
Damian Mooyman
6d8df46b8a Added 4.0.0 changelog 2017-11-08 15:14:54 +13:00
Chris Joe
39fae32ab1
Merge pull request #7567 from open-sausages/pulls/4.0/fix-directoryindex
BUG Disable directory index with missing slash
2017-11-08 13:35:41 +13:00
Damian Mooyman
8497b9e1e6
BUG Disable directory index with missing slash 2017-11-08 12:12:10 +13:00
Reece Alexander
642cbdafc8 API Allow an array as a param to makeFieldReadOnly() 2017-11-07 15:51:13 +13:00
Sam Minnee
d8b4ca91d9 FIX: Fix ContextSummary behaviour with UTF8 chars
Fixes https://github.com/silverstripe/silverstripe-framework/issues/1396

Ensure that DBTextTest has UTF8 test cases
2017-11-06 12:09:08 +13:00
Damian Mooyman
420041f2b6
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-03 17:04:44 +13:00
Damian Mooyman
c942ca5be6 Added 4.0.0-rc3 changelog 2017-11-03 16:57:41 +13:00
Chris Joe
39eba56821
Merge pull request #7556 from open-sausages/pulls/4.0/fix-functionaltest-bootstrap
BUG Prevent logOut() from clearing site stage during bootstrapping du…
2017-11-03 16:53:38 +13:00
Damian Mooyman
1929ec46bb
BUG Prevent logOut() from clearing site stage during bootstrapping due to flushed session 2017-11-03 16:22:11 +13:00
Chris Joe
38f7f87661
Merge pull request #7552 from dhensby/pulls/4.0/session-destroy-on-logout
FIX Sessions must be destroyed on logout
2017-11-03 14:50:48 +13:00
Damian Mooyman
cf381ddf51
Merge pull request #7550 from zanderwar/patch-3
Added missing @deprecated tags
2017-11-03 12:13:33 +13:00
Damian Mooyman
5f8613631f
Merge pull request #7553 from dhensby/pulls/4.0/upload-be-gone
DOCS Add required import for docs example
2017-11-03 12:12:58 +13:00
Damian Mooyman
6a73466b41 BUG Fix basicauth 2017-11-03 12:08:38 +13:00
Damian Mooyman
ad36b8f6a9 Use restart instead of destroy 2017-11-03 12:08:38 +13:00
Daniel Hensby
a61ce077c6 FIX Sessions must be destroyed on logout 2017-11-03 12:08:38 +13:00
Damian Mooyman
3298cf061b
Merge pull request #7543 from zanderwar/patch-1
Allow chain-ability on adding and removing fields
2017-11-03 11:15:51 +13:00
Damian Mooyman
fc2a20d6e8
Merge pull request #7551 from JayDevlin/4.0-install-theme-writeable
BUG Installer - Warn if theme.yml isn't writeable
2017-11-03 11:14:05 +13:00
Daniel Hensby
102de3d34c
DOCS Add required import for docs example 2017-11-02 11:50:47 +00:00
Jay Devlin
af9caa4e51 Warn if theme.yml isn't writeable 2017-11-02 11:34:36 +01:00
Reece Alexander
9c836c0d3d
Added missing @deprecated tags
This PR just adds a couple of @deprecated tags where they were missing, where IDE's like PHPStorm immediately alert the user that it's deprecated.
2017-11-02 20:28:01 +13:00
Damian Mooyman
0b3ed7ff15
Merge 4.0 -> 4 2017-11-02 16:52:05 +13:00
Damian Mooyman
f2c938a023 Added 4.0.0-rc2 changelog 2017-11-02 16:41:52 +13:00
Damian Mooyman
f8bde9de32 Update translations 2017-11-02 16:30:42 +13:00
Chris Joe
49ca45f6d9
Merge pull request #7548 from open-sausages/pulls/4.0/guzzle-dep
BUG Use parse_str in place of guzzle library
2017-11-02 14:37:02 +13:00
Chris Joe
44847d8118
Merge pull request #7547 from creative-commoners/pulls/4.0/member-logout-extensibility
FIX Move Member log out extension points to non-deprecated methods
2017-11-02 13:18:32 +13:00
Damian Mooyman
df50c8da03
BUG Use parse_str in place of guzzle library
Fixes #7540
2017-11-02 11:52:39 +13:00
Robbie Averill
897cba55cb FIX Move Member log out extension points to non-deprecated methods 2017-11-02 11:39:02 +13:00
Ingo Schommer
84b4ac0941
Merge pull request #7542 from christopherdarling/patch-9
DOCS ReactJS, Redux and GraphQL link broken
2017-11-02 11:21:16 +13:00
Chris Joe
cd55a039e7
Merge pull request #7520 from open-sausages/pulls/4.0/config-redirect-works
API / BUG - Introduce new request resolver middleware and fix broken forceWWW / forceSSL
2017-11-02 10:01:58 +13:00
zanderwar
91f1a58018 ENHANCEMENT: Allow chain-ability on adding and removing fields 2017-11-01 14:24:21 +13:00
Christopher Darling
fe3b0887be
DOCS ReactJS, Redux and GraphQL link broken 2017-10-31 21:18:40 +00:00
Chris Joe
326f74ebe6
Merge pull request #7535 from open-sausages/pulls/4.0/fix-object-replace-link
DOCS Fix broken docs hashlink
2017-10-31 23:34:08 +13:00
Chris Joe
31ac379f07
Merge pull request #7532 from open-sausages/pulls/4.0/docs-template-inheritance
Update template inheritance docs
2017-10-31 23:32:33 +13:00
Chris Joe
5a35ccf7f0
Merge pull request #7536 from open-sausages/pulls/4.0/tinymce-footer
ENHANCEMENT Adjust tinymce footer, remove branding and restore path
2017-10-31 22:25:25 +13:00