Commit Graph

2511 Commits

Author SHA1 Message Date
Damian Mooyman
a3c52f901a
Merge remote-tracking branch 'origin/4.0' into 4
# Conflicts:
#	src/Core/TempFolder.php
#	src/ORM/DataObject.php
#	src/View/ThemeResourceLoader.php
#	src/includes/constants.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
#	tests/php/Forms/HTMLEditor/HTMLEditorFieldTest.php
#	tests/php/View/RequirementsTest.php
2018-01-22 14:57:05 +13:00
Martin Portevin
0ca152c156
Added style_formats example 2018-01-17 18:27:28 +01:00
Daniel Hensby
ebeaf3e40d
Merge branch '3' into 4 2018-01-16 11:47:39 +00:00
Daniel Hensby
7f6af0f0ed
Merge branch '4.0' into 4 2018-01-16 10:28:24 +00:00
Daniel Hensby
9b30024d86
Merge branch '3.6' into 4.0 2018-01-16 10:26:21 +00:00
Damian Mooyman
e770146141
Merge remote-tracking branch 'origin/3.6' into 3 2018-01-16 17:06:59 +13:00
Damian Mooyman
bb37bc5491 Added 3.6.4 changelog 2018-01-16 16:40:43 +13:00
Damian Mooyman
971a1f0703
DOCS Update editor.css usage docs 2018-01-16 12:36:00 +13:00
Daniel Hensby
e4b936c7c7
Merge branch '4.0' into 4 2018-01-12 14:40:33 +00:00
Damian Mooyman
8d077203d4 API Implement support for public/ webroot folder (#7741)
* API Implement support for public/ webroot folder

* Bugfixes and refactor based on feedback
2018-01-12 16:25:02 +13:00
Daniel Hensby
3312a68dc2
Merge pull request #7747 from open-sausages/pulls/4.0/fix-nginx-try
DOCS Fix try_files index.php reference
2018-01-11 21:25:18 +00:00
Ingo Schommer
fb1be0619f
Removed version numbers from OS req docs
Too icky to keep updated as version numbers change. It's really just a matter of what PHP version supports which OS, from a SilverStripe side we don't have any constraints there. Well, technically Windows 3.11 won't work because the filesystem will fall over, but otherwise LAMP/WAMP is pretty forgiving.
2018-01-12 10:24:13 +13:00
Damian Mooyman
2b868b09f5
DOCS Fix try_files index.php reference
Fixes https://github.com/silverstripe/silverstripe-cms/issues/2067#issuecomment-356879060
2018-01-12 09:26:37 +13:00
Damian Mooyman
164edd7df3
DOCS Correct docs on polymorphic dataobject usage
Fixes #7732
2018-01-08 14:10:11 +13:00
David Lloyd
b3ae11fe47 Fix Missing Part of Sentence
It seems to be missing the words **PHP error log**.

Add words (without bold type).
2018-01-08 09:48:22 +13:00
elliot sawyer
b61debe3fb
Update CMS_Alternating_Button.md
The URL that points to ReactJS development appears to be case-sensitive. This fixes the link
2017-12-31 21:15:56 +13:00
Ingo Schommer
bf8790a893 Docs: Remove forum and IRC references 2017-12-19 11:45:27 +13:00
Ingo Schommer
2fa1114bd3 Removed deprecated tutorials from docs 2017-12-19 11:45:27 +13:00
Ingo Schommer
7526f6e9de Docs about debug toolbar 2017-12-19 09:25:10 +13:00
Chris Joe
17ff90c614
Merge pull request #7711 from open-sausages/pulls/4/css-conventions
Update CSS conventions doc
2017-12-19 07:38:35 +13:00
Saophalkun Ponlu
e0e50c79fd Update CSS conventions doc 2017-12-18 16:01:52 +13:00
Robbie Averill
2ff0cf7bfb
Merge pull request #7697 from open-sausages/pulls/4/validate-nine-ten
DOC: Add documentation for FormValidationManager
2017-12-17 17:13:22 +13:00
Robbie Averill
cd9695eda9
Merge pull request #7695 from open-sausages/pulls/4/versions-of-atlantis
Update framework docs / phpdoc for versioning changes
2017-12-17 16:33:59 +13:00
Daniel Hensby
e4bf9a31ed
Merge branch '4.0' into 4 2017-12-14 21:20:11 +00:00
Daniel Hensby
1c72d6946d
Merge branch '3.6' into 4.0 2017-12-14 21:01:35 +00:00
Daniel Hensby
b9405bcca0
DOCS Clarify SMTP mailer setup 2017-12-14 13:07:37 +00:00
Damian Mooyman
00a73cdb6d
DOCS Update versioning documentation for unversioned ownership 2017-12-14 15:14:06 +13:00
Aaron Carlino
db8a6d71a9 DOC: supporting docs for FormValidationManager 2017-12-13 11:53:18 +13:00
Gorrie Coe
3ae8838285
Added Name to example 2017-12-12 14:40:34 +13:00
Gorrie Coe
849038a60b
Added after priority to replace default authenticator. 2017-12-12 12:52:52 +13:00
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