Commit Graph

2463 Commits

Author SHA1 Message Date
Daniel Hensby
eb55c27124
Merge branch '4.0' into 4 2017-12-05 12:14:22 +00:00
Christopher Joe
2dcb3fd2ab Enhancement Add documentation for pattern library 2017-11-29 14:37:24 +13:00
Chris Joe
54689a340f
Merge pull request #7645 from open-sausages/pulls/4.0/hot-crosslinked-puns
Add crosslinks to lessons
2017-11-29 10:40:02 +13:00
Aaron Carlino
b56720c6f5 Updates per PK review 2017-11-28 14:11:52 +13:00
Aaron Carlino
ff02fa4ff7 Add crosslinks to lessons 2017-11-27 16:50:38 +13:00
Damian Mooyman
146be6830b
Merge pull request #7644 from michalkleiner/patch-4
MINOR Text fixes in docs
2017-11-27 16:45:34 +13:00
Damian Mooyman
36872c5ea4
Merge remote-tracking branch 'origin/4.0' into 4 2017-11-27 16:02:40 +13:00
Michal Kleiner
878c072f98
Update 02_URL_Variable_Tools.md
Remove value from the name of param (flush), fix pipe symbol (showqueries)
2017-11-27 15:44:34 +13:00
Robbie Averill
2e139dc5fd DOCS Update getRelativeResourcePath (deprecated) to getResource()->getRelativePath() in upgrade examples 2017-11-27 10:53:21 +13:00
Daniel Hensby
0ceb4cfa18
Merge branch '3' into 4 2017-11-25 17:34:24 +00:00
Daniel Hensby
6d5cbe0a0e
Merge branch '4.0' into 4 2017-11-25 17:19:31 +00:00
Daniel Hensby
07a0f75426
Merge branch '3.6' into 4.0 2017-11-25 16:56:50 +00:00
Loz Calver
6797dc950a
Update docs for .env files to explicitly mention naming convention 2017-11-24 10:56:57 +00:00
Damian Mooyman
4439d051cf DOCS Add note on removed deprecated setApplicationLink / setApplicationName
Fixes #7631
2017-11-23 15:20:00 +13:00
IsaacInsoll
2825c67e92
Documentation: 02_Manifests fix Typo 2017-11-21 12:29:39 +10:00
Christopher Joe
2b6b877327 Merge branch '4.0' of https://github.com/silverstripe/silverstripe-framework into 4 2017-11-21 15:08:30 +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
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
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
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
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
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
Daniel Hensby
0baa996cc0
Merge branch '3.6' into 3 2017-11-14 12:13:08 +00:00
Daniel Hensby
4731d3c671
Merge branch '3.5' into 3.6 2017-11-14 12:00:53 +00:00
Damian Mooyman
3d4c50d76c
DOC Improve file permission docs
See #7584
2017-11-14 16:07:23 +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
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
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
Daniel Hensby
102de3d34c
DOCS Add required import for docs example 2017-11-02 11:50:47 +00: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
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