Christopher Joe
2b6b877327
Merge branch '4.0' of https://github.com/silverstripe/silverstripe-framework into 4
2017-11-21 15:08:30 +13:00
Chris Joe
b1da49ff89
Merge pull request #7618 from open-sausages/pulls/4.0/no-resample-prz
...
DOCS Update docs for force_resample
2017-11-21 10:28:41 +13:00
Damian Mooyman
2a3abcec0d
DOCS Update docs for force_resample
2017-11-20 17:14:23 +13:00
Damian Mooyman
c49f954c08
Merge pull request #7612 from mr-macedawg/patch-1
...
Update form template directory
2017-11-20 13:50:48 +13:00
Damian Mooyman
f3611e527e
Merge pull request #7611 from SpiritLevel/patch-2
...
Update 04_GridField.md
2017-11-20 13:48:44 +13:00
Damian Mooyman
2e07a499c5
Merge pull request #7609 from SpiritLevel/patch-1
...
Update 04_GridField.md
2017-11-20 13:48:26 +13:00
Damian Mooyman
d338c33f4c
Merge pull request #7615 from zarocknz/patch-1
...
Update 05_Middlewares.md
2017-11-20 13:48:07 +13:00
Damian Mooyman
6fabf8121c
Merge pull request #7616 from zarocknz/patch-2
...
Update 05_Template_Inheritance.md
2017-11-20 13:47:49 +13:00
DouG
d2a6b979d2
Update 05_Template_Inheritance.md
...
Correct use of backticks rather than single quote
2017-11-20 13:30:09 +13:00
DouG
e8c12793b3
Update 05_Middlewares.md
...
Add missing semicolon.
2017-11-20 13:10:37 +13:00
Chris Joe
d8ca223e15
Merge pull request #7605 from open-sausages/pulls/4.0/fix-enum-defaults
...
BUG Fix DBEnum ignoring empty defaults
2017-11-20 11:32:45 +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
mr-macedawg
b6c1294860
Update form template directory
...
As of SS4.0, template files for forms need to be in the root template directory as the core forms folder no longer exists.
2017-11-17 20:43:33 +10:00
David Alexander
0f12f2c1a4
Update 04_GridField.md
2017-11-17 15:11:05 +13:00
David Alexander
907fead4ac
Update 04_GridField.md
2017-11-17 14:04:32 +13:00
Damian Mooyman
cbf9e40115
BUG Fix postgres / PDO support
2017-11-17 12:35:55 +13:00
Damian Mooyman
ef58799103
BUG Fix DBEnum ignoring empty defaults
...
FIxes #7582
2017-11-17 12:35:39 +13:00
Daniel Hensby
d020ec3958
Merge pull request #7599 from open-sausages/pulls/4.0/time-and-relative-date-in-silverstripe
...
WIP - BUG Fix don't treat zero-date as invalid
2017-11-16 12:48:51 +00:00
Daniel Hensby
4d1e659fed
Merge branch pull request #7604 from open-sausages/pulls/4.0/owns-example-upgrading
...
DOCS Adjust owns upgrading example
Fixes #7598
2017-11-16 10:53:38 +00:00
Christopher Joe
2bc7edbf47
BUG Fix don't treat zero-date as invalid
2017-11-16 13:30:15 +13:00
Damian Mooyman
6a6cf2f9eb
ENHANCEMENT Raise warning if DBField::create_field() would behave unpredictably and improve PHPDoc
2017-11-16 12:55:31 +13:00
Damian Mooyman
58b43f29a9
DOCS Adjust owns upgrading example
...
Fixes #7598
2017-11-16 11:38:26 +13: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
