Daniel Hensby
9f4c836072
Merge pull request #7940 from kinglozzer/docs-memcached
...
DOCS: fix memcached example (closes #7934 )
2018-03-18 08:33:46 +00:00
Robbie Averill
3826e61482
Merge pull request #7942 from MichaelJJames/patch-6
...
Missing a semicolon in the caching docs
2018-03-18 20:32:52 +13:00
Michael James
f139569ba3
Missing semicolon
2018-03-18 06:06:30 +00:00
Reece Alexander
ee50a4897c
Update 4.1.0.md
2018-03-17 15:09:13 +10:00
Loz Calver
cd6923965c
DOCS: fix memcached example ( closes #7934 )
2018-03-16 16:30:48 +00:00
Daniel Hensby
35bfce28fc
Merge branch '3' into 4
2018-03-16 15:04:26 +00:00
Daniel Hensby
80d15fc4f5
Merge branch '4.1' into 4
2018-03-16 14:58:40 +00:00
Daniel Hensby
9ed3cd4042
Merge branch '4.0' into 4.1
2018-03-16 14:57:05 +00:00
Damian Mooyman
548e9358b0
Merge pull request #7939 from lekoala/patch-9
...
Ensure tmpData exists
2018-03-16 10:03:59 +13:00
Thomas Portelange
2e1c70b56c
Ensure tmpData exists
...
Otherwise you might get illegal string offset
2018-03-15 20:40:05 +01:00
Daniel Hensby
fcf0796dbd
Merge pull request #7936 from 3Dgoo/patch-1
...
Fixing HTMLEditorField API documentation
2018-03-15 12:16:23 +00:00
3Dgoo
61ce4771f9
Fixing HTMLEditorField API documentation
...
The SS3 API documentation for HTMLEditorField was broken before change #7904 :
http://api.silverstripe.org/3/HtmlEditorField.html
This was because there was an unescaped textarea tag in the class description. In #7904 we escaped the tag.
However in a similar pull request #7927 it was suggested we should use backticks instead.
This changes the documentation to use backticks around the textarea tag.
2018-03-15 21:27:45 +10:30
Robbie Averill
d64fedd5e1
Merge pull request #7927 from 3Dgoo/patch-3
...
Fixing FormAction API documentation
2018-03-15 16:12:20 +13:00
3Dgoo
05b2979458
Update FormAction.php
2018-03-15 13:38:15 +10:30
Daniel Hensby
fb945690b1
Merge pull request #7875 from sminnee/devbuild-record-count
...
Suggested feature: dev/build record count
2018-03-14 14:26:49 +00:00
Daniel Hensby
c41ebd3279
Merge pull request #7930 from creative-commoners/pulls/4.1/return-self
...
FIX Ensure consistent return type for FieldList::removeByName
2018-03-14 14:21:47 +00:00
Daniel Hensby
069744bb21
Merge branch '3' into 4
2018-03-14 14:15:51 +00:00
Daniel Hensby
fd449618b2
Merge branch '4.1' into 4
2018-03-14 14:11:03 +00:00
Daniel Hensby
ec6ff71107
Merge branch '4.0' into 4.1
2018-03-14 14:09:40 +00:00
Daniel Hensby
d28a1b5cfc
Merge branch '3.6' into 4.0
2018-03-14 14:08:41 +00:00
Daniel Hensby
2c6f588785
Merge branch '3.6' into 3
2018-03-14 13:53:37 +00:00
Daniel Hensby
a7931e7a11
Merge branch '3.5' into 3.6
2018-03-14 13:49:29 +00:00
Robbie Averill
a9cc4d4844
FIX Ensure consistent return type for FieldList::removeByName
2018-03-14 19:40:17 +13:00
3Dgoo
1d74b3a22d
Update FormAction.php
2018-03-14 13:34:12 +10:30
3Dgoo
97f22cbaa5
Fixing FormAction API documentation
...
The API documentation for FormAction is currently broken:
http://api.silverstripe.org/3/FormAction.html
This is because there are unescaped tags in the class description.
This fix changes the tag in the description to be escaped.
2018-03-14 11:27:15 +10:30
Damian Mooyman
b0b8a2f625
Merge remote-tracking branch 'origin/4.1' into 4
2018-03-14 11:26:26 +13:00
Damian Mooyman
caefab774e
Added 4.1.0 changelog
2018-03-14 10:16:31 +13:00
Damian Mooyman
3700c0a33d
Update translations
2018-03-14 09:45:54 +13:00
Daniel Hensby
33a17d8dd2
Merge pull request #7925 from open-sausages/pulls/4/youve-been-committed
...
Add Paul to core designers team
2018-03-13 11:36:15 +00:00
Christopher Joe
f437d52255
Add Paul to core designers team
2018-03-13 17:55:43 +13:00
Damian Mooyman
8b9c292509
Merge remote-tracking branch 'origin/4.1' into 4
2018-03-13 14:26:39 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1
2018-03-13 14:26:18 +13:00
Robbie Averill
9fb1dcc356
Merge pull request #7924 from open-sausages/pulls/4/docs-remove-hamish-core
...
Remove Hamish, Stig, Sean, Jono from core committers :(
2018-03-13 14:07:09 +13:00
Ingo Schommer
9a85e4d6e8
Remove Jono from Core Committers :(
2018-03-13 10:25:02 +13:00
Ingo Schommer
e71a70217f
Remove Stig/Sean from Core Committers :(
2018-03-13 10:23:55 +13:00
Ingo Schommer
c2ac52c271
Remove Hamish from core committers :(
2018-03-13 10:12:41 +13:00
Daniel Hensby
35f28a824a
Merge pull request #7922 from mooror/3.6
2018-03-12 13:18:23 +00:00
Benjamin Blake
6fb8d27ac5
Updated the DocBlock for ManyManyList's add() method
2018-03-11 14:49:17 -06:00
Robbie Averill
2bef86833f
Merge pull request #7921 from DorsetDigital/patch-2
...
Add missing use statement in Session documentation
2018-03-10 11:50:49 +13:00
DorsetDigital
72c5d5244f
Update 02_Sessions.md
...
Add additional 'use' statement (for Injector) in example of getting a session outside a controller.
2018-03-09 20:03:46 +00: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
Damian Mooyman
cb372f7a34
Merge pull request #7919 from christopherdarling/patch-10
...
DOCS add missing trailing ; in code block
2018-03-09 15:30:57 +13: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
Loz Calver
ef63e42e35
Merge pull request #7917 from Quadra-Digital/bug-fix-change-password
...
Bug Fix - Change Password Page
2018-03-07 15:14:49 +00:00
Joe Harvey
bf2cee3989
Bugfix - Correct duplicate nesting of 'Content' to be returned to template
...
In scenarios where:
- No member is logged in
- An 'AutoLoginHash' is provided via the 't' (token) query param
- The token isn't valid (determined by Member::validateAutoLoginToken())
The message which is intended to be returned to the end-user via $Content
in the template, is mistakenly double nested in ['Content' => ['Content' => 'Message']]
this leads to "The method forTemplate() doesn't exist on ArrayData" errors.
See - https://github.com/silverstripe/silverstripe-framework/issues/7866
2018-03-07 14:14:05 +00:00
Daniel Hensby
fc457caa6e
Merge pull request #7912 from creative-commoners/pulls/4/versioning-api-references
...
DOCS Fix API references for classes in versioning docs
2018-03-07 13:40:45 +00:00
Chris Joe
f4caa5101f
Merge pull request #7914 from open-sausages/pulls/4.0/fix-deleted-files
...
BUG Files dataobjects with missing asset shouldn't un-attach themselves on save
2018-03-07 15:10:22 +13:00
Damian Mooyman
5fee4a81aa
BUG Files dataobjects with missing asset shouldn't un-attach themselves from parent object on save
2018-03-07 11:17:17 +13:00
Ingo Schommer
13c9372a1d
Clarify docs around security releases on supported modules
2018-03-07 11:07:17 +13:00
