Commit Graph

19327 Commits

Author SHA1 Message Date
DouG
d2a6b979d2
Update 05_Template_Inheritance.md
Correct use of backticks rather than single quote
2017-11-20 13:30:09 +13:00
Daniel Hensby
9760c95bc0
Merge pull request #7614 from MichaelJJames/patch-5
Update 01_Extensions.md
2017-11-18 16:16:46 +00:00
Michael James
ff77988056
Update 01_Extensions.md 2017-11-17 16:14:28 +00:00
Damian Mooyman
eae3d0cfaa
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-16 10:16:44 +13:00
Damian Mooyman
42ba89ecac
Merge pull request #7597 from open-sausages/pulls/4/docs-security-process
Moved security process from JIRA to Github
2017-11-16 09:57:20 +13:00
Chris Joe
bbc95eacff
Merge pull request #7600 from open-sausages/pulls/4/dbclassname-base
API Add getShortName to DBClassName
2017-11-15 21:36:21 +13:00
Chris Joe
e78fe401e6
Merge pull request #7601 from open-sausages/pulls/4.0/ensure-assets-writable
ENHANCEMENT Ensure that non-writable assets files are notified during install
2017-11-15 16:37:03 +13:00
Chris Joe
bee3c404fa
Merge pull request #7545 from open-sausages/pulls/4.0/deprecated-each
BUG Remove usage of deprecated each() and use a helper method instead
2017-11-15 16:30:20 +13:00
Damian Mooyman
c9921447b3
Merge pull request #7539 from colintucker/fix-broken-paginated-list
Fixed array/object mismatch bug in PaginatedList
2017-11-15 15:17:15 +13:00
Damian Mooyman
ba86a1dce9
Merge pull request #7595 from andrewandante/pulls/sanitise_select_tag_4
sanitise select tag in DropdownField Docblock
2017-11-15 14:17:55 +13:00
Damian Mooyman
8b063026f0
ENHANCEMENT Ensure that non-writable assets files are notified during install
Fixes #7580
2017-11-15 13:30:19 +13:00
Chris Joe
5077eb8125
Merge pull request #7593 from open-sausages/pulls/4.0/better-perms-docs
DOC Improve file permission docs
2017-11-15 11:44:51 +13:00
Damian Mooyman
f863573d1c
API Add getShortName to DBClassName
Fixes #7586
2017-11-15 11:27:58 +13:00
Ingo Schommer
58da8c47cb Moved security process from JIRA to Github
JIRA isn't fully under the OSS team's control,
and played up in the past (Dan couldn't move issues).
Since Github has project boards now, and we're paying
for private repos on github.com/silverstripe-security already anyway,
there's no reason to introduce another tool (JIRA) into our workflows.

No need to move existing issues, the JIRA board hasn't been used in a while.
Which leads to unclear ownership and status of security issues,
and is exactly the reason for this change ;)
2017-11-15 07:44:17 +13:00
Daniel Hensby
cf321895ba
Merge branch '4.0' into 4 2017-11-14 13:24:15 +00:00
Andrew Aitken-Fincham
3274f29c00 sanitise more docblocks 2017-11-14 10:02:24 +00:00
Andrew Aitken-Fincham
25d8795c70 sanitise FormField docblock 2017-11-14 09:52:06 +00:00
Andrew Aitken-Fincham
6cfb0a3d86 sanitise ListboxField docblock 2017-11-14 09:47:39 +00:00
Andrew Aitken-Fincham
e5b3f82f8c sanitise select tag in DropdownField Docblock 2017-11-14 08:17:39 +00:00
Damian Mooyman
3d4c50d76c
DOC Improve file permission docs
See #7584
2017-11-14 16:07:23 +13: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
Colin Tucker
f952ef747b
Fixed array/object mismatch bug in PaginatedList 2017-11-06 11:23:41 +00: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