tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
19,632 Commits 29 Branches 513 Tags 147 MiB
Commit Graph

19632 Commits

Author SHA1 Message Date
Dylan Wagstaff c5fcab81df
Reorder HTML to be semantically correct on render 
Don't close the unordered list every iteration :)
 2018-03-29 12:01:27 +13:00
Daniel Hensby 54b6c6f6e8
Merge pull request #7965 from andreaslindahl/DBMultiEnum 
Fix for "too few parameters" error when using DBMultiEnum
 2018-03-28 17:31:12 +01:00
Andreas Lindahl dd44deacb4 Fix for "too few parameters" error when using DBMultiEnum 2018-03-28 16:42:12 +02:00
Daniel Hensby 0adbc6b21f
Merge branch '3.6' into 4.0 2018-03-28 11:14:21 +01:00
Daniel Hensby b36ba81a40
Merge branch '3.5' into 3.6 2018-03-28 11:06:32 +01:00
Damian Mooyman 45a7b44a15
Merge pull request #7858 from dhensby/pulls/3.5/add-support-file 
Add support.md file
 2018-03-28 16:56:11 +13:00
Daniel Hensby 61463424ff
Support file grammer improvements 2018-03-27 11:49:04 +01:00
Daniel Hensby e3cdefaa3c
Add support.md file 2018-03-27 11:43:13 +01:00
Robbie Averill 0d8915a898
Merge pull request #7947 from lerni/lerni-patch-1 
Update link forum
 2018-03-27 14:22:02 +13:00
Lukas 78896a73e2
Update link forum 2018-03-20 22:14:23 +01:00
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
Loz Calver cd6923965c DOCS: fix memcached example (closes #7934) 2018-03-16 16:30:48 +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 d28a1b5cfc
Merge branch '3.6' into 4.0 2018-03-14 14:08:41 +00:00
Daniel Hensby a7931e7a11
Merge branch '3.5' into 3.6 2018-03-14 13:49:29 +00: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
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
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
Chris Joe 6ae07d100c
Merge pull request #7603 from open-sausages/pulls/4.0/error-trace-included 
ENHANCEMENT Don't infer trace if explicitly provided
 2018-03-07 10:10:40 +13:00
Damian Mooyman 32637413de ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites (#7903) 
* ENHANCEMENT Improve upgrade rules to support advanced upgrader rewrites

* Minor: Grammar fixes.
 2018-03-05 15:47:06 +13:00
Daniel Hensby 3cd8c2a985
Merge pull request #7905 from bummzack/pulls/fix-empty-delimiter 
Fix regression in ContextSummary
 2018-03-01 13:02:30 +00:00
Roman Schmid 40c2e299a0 Fix "mb_stripos(): Empty delimiter" warning when no search-keywords are given for `DBText::ContextSummary`. 
Add unit-test to cover that case.
 2018-03-01 11:39:30 +01:00
Damian Mooyman 68f5d8b37e
Merge pull request #7896 from JorisDebonnet/patch-1 
Delete orphaned Group_Members records after deleting a Member
 2018-03-01 12:37:16 +13:00
Loz Calver 535d02ffeb
Merge pull request #7874 from flamerohr/pulls/3.6/to-match-thy-father 
FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated
 2018-02-28 10:06:36 +00:00
JorisDebonnet 3e0984db49
Delete orphaned Group_Members records after deleting a Member 2018-02-27 19:47:26 +01:00
Chris Joe 1973f87c4b
Merge pull request #7892 from open-sausages/pulls/4.0/dont-log-me-out-bro 
BUG Fix environment variable assignment
 2018-02-27 13:38:26 +13:00
Christopher Joe 1cdbab45c9 Added comment about array_merge() not working 2018-02-27 09:52:42 +13:00
Aaron Carlino 0863bac29a Update getVariables to return a copy of globals rather than including the reference in an array merge 2018-02-27 09:52:36 +13:00
Loz Calver e23353fe99
Merge pull request #7885 from dhensby/pulls/4.0/email-docs-config 
DOCS update email docs to use correct config syntax
 2018-02-26 12:32:13 +00:00
Chris Joe deebc78caf
Merge pull request #7890 from open-sausages/pulls/4.0/fix-tests-bootstrapping 
BUG Fix incorrect assets created when ASSETS_PATH !== BASE_PATH . '/assets'
 2018-02-26 16:16:03 +13:00
Damian Mooyman b27102f810
BUG Fix incorrect assets created when ASSETS_PATH !== BASE_PATH . '/assets' 2018-02-26 13:12:08 +13:00
Daniel Hensby ade88ef0ea
DOCS update email docs to use correct config syntax 2018-02-23 11:49:13 +00:00
Robbie Averill 7fe8da3222
Merge pull request #7881 from oddnoc/shortcode-docs 
DOCS: remove backticks from Markdown link
 2018-02-21 15:30:56 +13: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
Daniel Hensby 2074f8fc69
Merge pull request #7878 from open-sausages/pulls/4.0/fix-unstaged-versioned 
BUG Fix behaviour towards versioned but unstagable records
 2018-02-20 11:44:05 +00:00
Damian Mooyman 0e26c06644
BUG Fix behaviour towards versioned but unstagable records 2018-02-20 12:20:18 +13:00
Christopher Joe 86addea1d2 FIX Split HTML manipulation to onadd, so elements are not accidentally duplicated 2018-02-16 23:34:05 +13:00
Damian Mooyman 4e5a664183
Merge pull request #7865 from open-sausages/pulls/4.0/i-configured-this-out 
Fix docs for configuring before/after a specific config file
 2018-02-14 16:35:00 +13:00
Daniel Hensby e357d1e903
Merge branch '3.6' into 4.0 2018-02-13 16:32:32 +00:00
Daniel Hensby 9c50b03b86
Merge branch '3.5' into 3.6 2018-02-13 14:30:29 +00:00
Daniel Hensby 1bec8a5d0c
Merge pull request #7850 from jonom/singleton-fix-3x 
FIX Singleton creation
 2018-02-13 08:29:47 +00:00
Jonathon Menz c767e472dc FIX DataObject singleton creation 
Ensure DataObject instances are aware they are singletons so functions like populateDefaults() can be skipped. (fixes #4878)
 2018-02-12 20:30:35 -08:00