Damian Mooyman
b7b3e4b1f8
Merge remote-tracking branch 'origin/3.6' into 3
2017-12-07 14:09:33 +13:00
Damian Mooyman
c22726bfd7
Merge remote-tracking branch 'origin/3.5' into 3
2017-12-07 14:09:02 +13:00
Damian Mooyman
b1a0a515f7
Merge branch '4.0' into 4
2017-12-07 14:06:14 +13:00
Damian Mooyman
6b384f4b35
Merge branch '4.0' into 4
2017-12-07 13:52:00 +13:00
Damian Mooyman
e3c382a4de
Added 4.0.1 changelog
2017-12-07 13:46:52 +13:00
Damian Mooyman
bf74e8347a
Added 3.6.3 changelog
2017-12-07 13:35:49 +13:00
Damian Mooyman
b6a7e47441
Added 3.5.6 changelog
2017-12-07 13:27:17 +13:00
Damian Mooyman
50aa1f22a6
Merge branch '3.6' into 3
2017-12-07 13:20:58 +13:00
Damian Mooyman
4ff1fb32dd
Added 4.0.1-rc1 changelog
2017-12-07 12:16:58 +13:00
Damian Mooyman
16be39aa06
Added 4.0.1-rc1 changelog
2017-12-07 11:21:44 +13:00
Daniel Hensby
2e43780a8a
NEW Add sort columns to DB index automatically
2017-12-06 13:38:25 +00:00
John Milmine
d44197530e
Updating searchable fields w namespaces
2017-12-06 22:37:25 +13:00
Damian Mooyman
8537dd56dd
Added 3.6.3-rc2 changelog
2017-12-06 18:11:03 +13:00
Damian Mooyman
d6a93f5215
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6
...
# Conflicts:
# security/Member.php
2017-12-06 17:26:45 +13:00
Damian Mooyman
d09c2d7b03
Added 3.5.6-rc1 changelog
2017-12-06 16:27:12 +13:00
Damian Mooyman
5f7f1ea150
Added 3.5.6-rc1 changelog
2017-12-06 16:27:08 +13:00
Andrew Aitken-Fincham
4fa3cf59d3
Update index.md
2017-12-05 17:18:46 +00:00
Daniel Hensby
eb55c27124
Merge branch '4.0' into 4
2017-12-05 12:14:22 +00:00
JorisDebonnet
2717f01344
Fix link to nginx.org wiki
2017-11-29 21:31:56 +01: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
