Commit Graph

2568 Commits

Author SHA1 Message Date
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
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
Chris Joe
db3c074643
Merge pull request #7533 from open-sausages/pulls/4.0/document-compositefield-setid
DOCS Upgrade path for CompositeField::setID()
2017-10-31 22:22:20 +13:00
Damian Mooyman
cdcb01d9fd
Update template inheritance docs
Fixes #5924
2017-10-31 14:39:57 +13:00
Damian Mooyman
d48e8960b4
DOCS Fix broken docs hashlink
Fixes #7534
2017-10-31 11:56:29 +13:00
Damian Mooyman
a145e24fd2
DOCS Upgrade path for CompositeField::setID()
Fixes #7264
2017-10-31 11:18:50 +13:00
Damian Mooyman
ab581646e1
DOCS Remove AssetField reference
Fixes #7529
2017-10-31 09:08:10 +13:00
Christopher Darling
7b1c89fdea
DOCS: fix links to getting_started/environment_management 2017-10-30 12:56:54 +00:00
Aaron Carlino
5b48a9a07b Remove reference to database_fields 2017-10-30 16:13:41 +13:00
Aaron Carlino
46ce733b9a Update changelogs to include notes about database_fields 2017-10-30 12:36:01 +13:00
Damian Mooyman
cdfb413395
Code block whitespace / formatting cleanup 2017-10-27 15:38:27 +13:00
Aaron Carlino
e7274b0ee4 Add namespaces 2017-10-27 12:45:26 +13:00
Gabrijel Gavranović
6fd737d252
caching.md, false examples: updated
The previous exmaple for adding a Mamcached backend was not working properly. Using this example results in Zend_Cache_Backend_Memcached using the default (fallback) settings (which are exactly the same as in the exmaple though).

+ Added an extra example for Memcached instances which are listening on a Unix socket.
2017-10-26 12:57:45 +01:00
Damian Mooyman
10894b53a4 Merge pull request #7515 from open-sausages/pulls/4.0/fix-changelog-anchors
Fix changelog anchors
2017-10-26 11:15:39 +13:00
Russell Michell
00f1ad5d69 FIX: Fixes #7116 Improves server requirements docs viz: OpCaches. 2017-10-26 09:22:07 +13:00
Ingo Schommer
8725672eae Fix changelog anchors
See https://raw.githubusercontent.com/silverstripe/silverstripe-docsviewer/f61751b19e5d22dba7e72d2c195b723376dc2b71/tests/docs/en/test.md for correct format.
2017-10-26 08:41:18 +13:00
Daniel Hensby
92a429b935
DOCS Update sake location where relevant 2017-10-25 11:48:50 +01:00
Damian Mooyman
97948eb41d Added 4.0.0-rc1 changelog 2017-10-25 16:47:04 +13:00
Damian Mooyman
f52eecdc7f Merge pull request #7507 from open-sausages/pulls/4.0/changelog
Improve changelog
2017-10-25 12:36:05 +13:00
Damian Mooyman
ebe20bb643
Remove obsolete ToC
Update composer recommendations
2017-10-25 12:04:04 +13:00
Ingo Schommer
d56c756074 Fixed changelog indentation 2017-10-25 07:24:57 +13:00
Ingo Schommer
69f16c605c Consistent anchors in changelog headliens 2017-10-24 22:41:18 +13:00
Ingo Schommer
19d33f4de7 Moved up file migration in changelog 2017-10-24 22:37:04 +13:00
Ingo Schommer
862fcec553 Moved up .env docs in changelog
They're needed much earlier
2017-10-24 22:34:48 +13:00
Ingo Schommer
ff0b648d75 Detail links in changelogs 2017-10-24 22:33:20 +13:00
Ingo Schommer
a08c1f42d9 Deprioritised docs on minor upgrade paths 2017-10-24 22:21:49 +13:00
Ingo Schommer
5027af3926 Consistent 4.0 changelog presentation
- Use "Removed/Changed/Added/Moved" prefixes to make content more scannable
- Removed "change" vs "remove" distinction in subheadings (hard to separate, and not meaningful in practice)
- Linearised messages, less nesting - easier to parse (don't need to remember context from a few lines above)
- Simplified language (e.g. "use" instead of "please use")
- Simplified headline wording (remove repetitive "upgrade code that uses X")
- More anchor links across sections
- More use of diffs to clearly communicate before/after states
- Consistently apply backtick code formatting
- Consistently use "()" to denote methods (easier to read)
- Removed duplicate SQLQuery instructions (and simplified the augmentSQL example)
- Add new composer.json intro
2017-10-24 22:18:46 +13:00
Damian Mooyman
56b49dad34 DOCS Improve high level file documentation (#7501)
* DOCS Improve high level file documentation
Fixes https://github.com/silverstripe/silverstripe-assets/issues/62

* Updates based on feedback
2017-10-24 22:12:28 +13:00
Damian Mooyman
a4b88c776f Merge pull request #7505 from open-sausages/pulls/4/ch-ch-ch-ch-ch-angesets
Document changesets
2017-10-24 17:05:35 +13:00
Aaron Carlino
4039a2ab61 Remove revert() method reference 2017-10-24 16:13:40 +13:00
Aaron Carlino
47917856c1 Revisions per Damian 2017-10-24 16:08:20 +13:00
Damian Mooyman
e76f01ebfa Merge pull request #7496 from open-sausages/pulls/4/inspect-upgrade-warnings
Upgrading rules for new inspect/warning capabilities
2017-10-24 15:25:34 +13:00
Aaron Carlino
dee0754b5a document changesets 2017-10-24 10:30:37 +13:00
Damian Mooyman
b9cb1e69e6 BUG Replace phpdotenv with thread-safe replacement 2017-10-20 18:43:11 +13:00
Ingo Schommer
297253170c Upgrading rules for new inspect/warning capabilities 2017-10-19 08:51:18 +11:00
Daniel Hensby
6a8540d6d6 Merge pull request #7488 from open-sausages/pulls/4.0/you-have-my-permission-to-htaccess
BUG Fix documentation for permissions
2017-10-18 15:33:30 +01:00
Martin D
adfe275cde Small fix to nginx.conf
Source: https://github.com/silverstripe/silverstripe-framework/blob/4.0/docs/en/00_Getting_Started/01_Installation/How_To/Setup_Nginx_and_HHVM.md
2017-10-18 05:52:45 -04:00
Jake B
97dfd9ac47 DOC Add example for using resource location for pages / modeladmin 2017-10-18 15:55:50 +11:00
Christopher Joe
0b3363d0a0 BUG Fix documentation for permissions 2017-10-18 13:21:55 +13:00
Reece Alexander
8a1e466c75
get_environment_type() still exists in SS4 2017-10-17 13:00:24 +01:00
Damian Mooyman
cacd3fbae4 Added 4.0.0-beta4 changelog 2017-10-11 17:46:52 +13:00
Ingo Schommer
feadca875c Clearer .htaccess upgrading instructions 2017-10-10 10:28:02 +02:00
Ingo Schommer
823bc3b9ce Simplified upgrading docs around index.php
No need to paste the file there if we're auto upgrading it.
The guide is long enough already :)
2017-10-10 10:26:11 +02:00
Damian Mooyman
11b2c74533
ENHANCEMENT Improve upgrade experience for beta3 -> beta4 upgrade 2017-10-10 15:27:41 +13:00
Damian Mooyman
5d6a10ca58 Merge pull request #7444 from open-sausages/pulls/4/fix-docs-paths
Fixed docs paths (fixes #7075)
2017-10-10 09:53:17 +13:00
Ingo Schommer
1e913bb938 Remove rewrite-less routing through index.php
It's currently broken (doesn't rewrite subsequent links),
and is of questionable use. It was introduced during a time
when PHP didn't have a built-in webserver (I think).
Virtually ever webserver will have rewriting capabilities these days (even IIS!),
and if you struggle with the setup as a new user, you can just fall back to PHP's built-in webserver.

This doesn't affect installation capabilities, since these are triggered via install.php.
2017-10-09 17:21:43 +13:00
Ingo Schommer
cea5cd1c3e Reflect index.php change in server install docs 2017-10-09 17:21:43 +13:00
Ingo Schommer
4a94dfe55b Remove "url" query param reliance, use index.php
See https://github.com/silverstripe/silverstripe-framework/issues/7430
2017-10-09 17:21:43 +13:00
Christopher Joe
3560a0418d rename TEMP_FOLDER to TEMP_PATH 2017-10-09 12:41:34 +13:00
Chris Joe
b2eb121370 Merge pull request #7448 from open-sausages/pulls/4.0/fix-minifier-docs
BUG Fix missing property in requirements minificaction docs
2017-10-09 12:05:30 +13:00
Chris Joe
13b4722aaf Merge pull request #7443 from open-sausages/pulls/4/remove-php-spellchecker
Remove TinyMCE spellchecker instructions
2017-10-09 12:01:55 +13:00
Chris Joe
566d7baa48 Merge pull request #7437 from open-sausages/pulls/4.0/stateless-extensions
API Extensions are now stateless
2017-10-09 11:45:33 +13:00
Sam Minnée
f69f35eead DOCS: Fixed incorrect statement on ID generation 2017-10-09 11:36:23 +13:00
Sam Minnée
6bc716d7c9 Fixed incorrect statement on ID generation 2017-10-09 11:34:36 +13:00
Christopher Joe
89db5870bc Fix typo in docs 2017-10-09 10:56:02 +13:00
Damian Mooyman
504e762c6e
BUG Fix missing property in requirements minificaction docs
Fixes #7441
2017-10-09 10:46:31 +13:00
Ingo Schommer
bd874ca91f Fixed docs paths (fixes #7075) 2017-10-06 16:00:32 +01:00
Ingo Schommer
dcdaccc40f Remove TinyMCE spellchecker instructions
They're broken since you can't access PHP files in the vendor dir any more,
and they're not easily fixed by creating a new rpc.php file in the webroot.
There's something around TinyMCE missing a base_uri.

Regardless, browsers have great built-in spellcheck these days,
so server-side spellchecking is more of an edge case that we don't have to cater for in core.
2017-10-06 15:46:41 +01:00
Ingo Schommer
7406318f03 Merge pull request #7436 from creative-commoners/pulls/4.0/consistent-change-password-api
NEW Ensure changePassword is called by onBeforeWrite for a consistent API
2017-10-06 11:26:37 +01:00
Damian Mooyman
b996e2c22c
API Extensions are now stateless
ENHANCEMENT Injector now lazy-loads services more intelligently
2017-10-06 14:53:44 +13:00
Daniel Hensby
16cac4e3bd
Merge branch '3' into 4 2017-10-05 16:40:31 +01:00
Robbie Averill
413034f684 Remove psuedo-property SetPassword from Member 2017-10-05 16:55:24 +13:00
Ingo Schommer
7d63acb221 Better .htaccess upgrading instructions 2017-10-04 09:51:29 +01:00
Ingo Schommer
924e2a714f Fix sake path relative to vendor 2017-10-04 09:32:05 +01:00
Matthew Hailwood
b044fefc91 Difference between a single array call vs multiple calls to exclude
This table should best summarise the difference - 1 = row is visible, 0 = row is excluded

| Name | SELECT * FROM Player WHERE (FirstName != 'A' OR LastName != 'B') | SELECT * FROM Player WHERE FirstName != 'A' AND LastName != 'B' |
| A B | 0 | 0 |
| A C | 1 | 0 |
2017-10-03 16:28:08 +13:00
Damian Mooyman
f64c95b33c
Add new ModuleResourceLoader helper 2017-10-03 12:20:49 +13:00
Ingo Schommer
85a951584e Update main.php path to support framework in vendor 2017-10-03 09:03:37 +13:00
Damian Mooyman
c8925c93a0
Update documentation for file migration 2017-10-02 15:30:37 +13:00
Damian Mooyman
fa57deeba4
ENHANCEMENT Allow vendor modules with url rewriting
API Introduce ModuleResource feature
2017-09-29 10:28:38 +13:00
Daniel Hensby
b49d1d7fbd
Merge branch '3.6' into 3 2017-09-28 17:17:19 +01:00
Daniel Hensby
e81b503441
Merge branch '3.5' into 3.6 2017-09-28 17:17:04 +01:00
Daniel Hensby
3f5ddc7d00
Added 3.6.2 changelog 2017-09-28 16:05:53 +00:00
Daniel Hensby
393d1a9be6
Added 3.5.5 changelog 2017-09-28 15:37:07 +00:00
Christopher Joe
7e92b053f4 Enhancement Add setter and getter for certain classes, so that LeftAndMain no longer updates config during init 2017-09-28 16:47:13 +13:00
Damian Mooyman
da27948777 Merge pull request #7373 from dhensby/pulls/4/rate-limit-security
NEW RateLimiter for Security controller
2017-09-28 11:01:37 +13:00
Daniel Hensby
c077abf353
DOCS new rate limiting docs 2017-09-27 17:40:04 +01:00
Damian Mooyman
a478939ea9
Update docs for i18n 2017-09-26 12:08:40 +13:00
Daniel McClure
d1cd3b7d49 Updated Minimum Default PHP Version 2017-09-22 17:33:35 +12:00
Daniel Hensby
5956e63745 Merge pull request #7387 from chhschou/patch-1
update RHEL distro used from `box-cutter/centos70` to `box-cutter/cen…
2017-09-21 12:51:47 +01:00
Daniel Hensby
b4412cedf6
Added 3.6.2-beta2 changelog 2017-09-21 09:11:36 +00:00
Daniel Hensby
bd7abc73de
Merge branch '3.5.5' into 3.6.2 2017-09-20 16:26:30 +01:00
Daniel Hensby
1209b2ae13
Added 3.5.5-beta2 changelog 2017-09-20 13:41:04 +00:00
Damian Mooyman
f1a12e15be
BUG Fix sub-template lookup for includes 2017-09-20 18:04:01 +12:00
Damian Mooyman
09b3a24f30
BUG Detect, warn, and fix invalid SS_BASE_URL
Fixes #7362
2017-09-20 10:42:13 +12:00
Chris Chou
2d8f0fadd7 update RHEL distro used from box-cutter/centos70 to box-cutter/centos73
`box-cutter/centos70` no longer available
2017-09-20 09:51:03 +12:00
Daniel Hensby
fc79a76718
Added 3.6.2-beta1 changelog 2017-09-19 16:51:57 +00:00
Daniel Hensby
1f256cf2d2
Added 3.5.5-beta1 changelog 2017-09-19 15:25:41 +00:00
Daniel Hensby
3fe14afbb1
DOCS Fix Image docs regarding setting image quality 2017-09-15 15:07:26 +01:00
Damian Mooyman
21f2da4962 Added 4.0.0-beta3 changelog 2017-09-11 15:13:51 +12:00
Damian Mooyman
c2bd9e2216
DOCS Update documentation / upgrading for file permissions
Fixes #7350
2017-09-08 11:54:36 +12:00
Damian Mooyman
b270eee1b0 Merge pull request #7102 from Firesphere/pulls/auth-docs
DOCS Authentication
2017-09-06 13:08:49 +12:00
Damian Mooyman
6f7b0d9ae0 Merge pull request #7323 from martinduparc/patch-5
Missing namespace
2017-09-05 11:04:16 +12:00
Damian Mooyman
45998444d7
Remove redundant gc_collect_cycles()
Cleanup dead references to DataObject::$destroyed
Fixes #7326
2017-09-04 09:23:07 +12:00
Damian Mooyman
fdc5ad7337
DOCS Upgrading file docs 2017-09-01 13:14:43 +12:00
Matt Peel
acc58c2b68 Fix incorrect $has_one documentation
The first mention of `$has_one` and `$db` in this file is incorrect, which is misleading. It's explained properly later on in the document, but it's easy to get it wrong based on this first code snippet.
2017-09-01 00:48:07 +12:00
Christopher Joe
02c1a5199b Docs tweaked sentence wording to be more descriptive 2017-08-30 10:41:01 +12:00
Ingo Schommer
64af679c35 DOCS Corrected env type docs (fixes #7290) 2017-08-30 08:35:41 +12:00