Commit Graph

628 Commits

Author SHA1 Message Date
Robbie Averill
1ad2d6535e Merge branch '4.0' into 4.1 2018-08-15 13:22:46 +12:00
Scott Hutchinson
3bd2cbf199 DOCS indentation on pagination guide [ci skip]
For all those copy + paste fiends
2018-08-14 15:36:52 +12:00
Daniel Hensby
ec9281ee02
Merge branch '4.0' into 4.1 2018-07-13 16:42:00 +01:00
Daniel Hensby
d80ef3d9e6
DOCS Update docs to reflect true config merge priorities 2018-07-13 15:43:56 +01:00
Robbie Averill
c8b0bc0ad7 Merge branch '4.0' into 4.1
# Conflicts:
  #	src/ORM/DataObject.php
  #	tests/php/ORM/DataObjectDuplicationTest.php
  #	tests/php/ORM/DataObjectDuplicationTest/Class1.php
2018-05-30 14:52:07 +12:00
Robbie Averill
6d98a912c9 Merge branch 'heads/4.1.1' into 4.1 2018-05-28 18:26:20 +12:00
Robbie Averill
3a537bc745 Merge branch 'heads/4.0.4' into 4.0 2018-05-28 17:50:07 +12:00
Robbie Averill
722202fef4 Merge remote-tracking branch 'origin/4.0.4' into 4.1.1
# Conflicts:
  #	src/Control/Director.php
2018-05-24 15:41:11 +12:00
Damian Mooyman
299131ed22 [ss-2018-012] File security documentation 2018-05-14 17:16:36 +12:00
DorsetDigital
67fbaf3423
Update 06_Themes.md
Remove reference to theme picker in settings page which was removed in SS4
2018-04-13 12:12:55 +01:00
Daniel Hensby
773511a6c3
Merge branch '4.0' into 4.1 2018-03-28 11:18:08 +01:00
Loz Calver
cd6923965c DOCS: fix memcached example (closes #7934) 2018-03-16 16:30:48 +00:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-03-13 14:26:18 +13:00
Daniel Hensby
da5e73c115
Merge pull request #7918 from silverstripe-terraformers/pulls/updated-docs
Updated docs for Rate Limiting.
2018-03-09 10:52:12 +00:00
Christopher Darling
278f19068e
DOCS add missing trailing ; in code block 2018-03-08 20:41:11 +00:00
cpenny
fdbf4c2134 Updated docs for Rate Limiting. 2018-03-09 08:15:11 +13:00
Daniel Hensby
ade88ef0ea
DOCS update email docs to use correct config syntax 2018-02-23 11:49:13 +00:00
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1 2018-02-21 13:40:30 +00:00
Fred Condo
2f2390be59 DOCS: remove backticks from Markdown link
Markdown does not render links within backticks.
2018-02-20 16:54:18 -08:00
Damian Mooyman
e809c0fd62
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-02-15 09:27:51 +13:00
Christopher Joe
f2b82b1f77 Fix docs for configuring before/after a specific config file 2018-02-13 16:31:51 +13:00
Daniel Hensby
2fb2caba06
Merge branch '4.0' into 4.1 2018-02-12 10:24:30 +00:00
Martin Portevin
90f77a7134
Removed bad quote 2018-02-10 03:05:59 +01:00
Damian Mooyman
aa2c71424d
API Implement cascade_duplications
API Add DataObject::setComponent()
API Support unary components as getter and setter fields
API ManyManyList::add() now supports unsaved records
ENHANCEMENT Animal farm
2018-02-05 12:04:57 +13:00
Chris Joe
f1628e3252 Docs updated injector docs to reflect inject() changes (#7768)
* Docs updated injector docs to reflect inject() changes and added example for the change

* Minor docs revision

* Added notes about context
2018-01-27 09:18:45 +13:00
Damian Mooyman
0eaebe54f9
DOCS Correct usage of publishRecursive() in docs 2018-01-24 14:41:06 +13:00
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
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
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
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
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
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
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
Christopher Joe
2dcb3fd2ab Enhancement Add documentation for pattern library 2017-11-29 14:37:24 +13:00
Aaron Carlino
b56720c6f5 Updates per PK review 2017-11-28 14:11:52 +13:00