tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
19,612 Commits 31 Branches 527 Tags 162 MiB
da5e73c115
Commit Graph

19612 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Christopher Joe
f2b82b1f77 Fix docs for configuring before/after a specific config file 2018-02-13 16:31:51 +13:00
Chris Joe
d13ab11940
Merge pull request #7861 from zanderwar/pulls/enhancements/composerjson-check 
ENHANCEMENT composer.json missing notice
 2018-02-13 13:48:12 +13:00
zanderwar
9ce21338a3 ENHANCEMENT composer.json missing notice 2018-02-13 09:03:01 +10:00
Damian Mooyman
6b38031a1e BUG Fix Director::test() not persisting removed session keys on teardown 2018-02-13 11:35:16 +13:00
Robbie Averill
1a91806bcc
Merge pull request #7857 from dhensby/pulls/3.5/add-license 
Create licence file so that GitHub (and humans) can more easily find it
 2018-02-13 09:32:24 +13:00
Daniel Hensby
24ea2638fe
Create licence file so that GitHub (and humans) can more easily find it 2018-02-12 11:21:03 +00:00
Robbie Averill
175b41683e
Merge pull request #7853 from DrMartinGonzo/patch-1 
Removed bad quote in i18n doc
 2018-02-11 10:30:30 +13:00
Martin Portevin
90f77a7134
Removed bad quote 2018-02-10 03:05:59 +01:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0 2018-02-09 14:32:58 +00:00
Daniel Hensby
48a8a82326
Merge branch '3.5' into 3.6 2018-02-09 13:20:38 +00:00
Chris Joe
95308e1af6
Merge pull request #7849 from open-sausages/pulls/4.0/fix-debug-string-class-cli 
BUG Fix issue with CLIDebugView failing on class name of existing class
 2018-02-09 15:41:18 +13:00
Daniel Hensby
d3278d5470 FIX Add Nested DB transaction support (#7848) 
* TEST Prove nested transactions break

* Add nested transaction support
 2018-02-09 10:28:32 +13:00
Damian Mooyman
0a486b8f57
BUG Fix issue with CLIDebugView failing on class name of existing class 
Fixes #7827
 2018-02-09 09:52:32 +13:00
Daniel Hensby
2a8d365aac
Merge pull request #6973 from steadlane/fix/csv-unescaped-values 
Fix for badly escaped values in CSV export
 2018-02-08 13:45:52 +00:00
JorisDebonnet
5df1ec7eee
Use fputcsv in GridFieldExportButton 2018-02-08 12:26:29 +00:00
Daniel Hensby
09f88c76cf
Merge pull request #7812 from oddnoc/configure-nginx-ss4 
DOCS: Update nginx configuration for SilverStripe 4
 2018-02-08 11:45:32 +00:00
Loz Calver
adc9f02390
Merge pull request #7846 from dhensby/pulls/4.0/test-cms 
Actually run CMS tests
 2018-02-08 11:14:19 +00:00
Fred Condo
6976d09bba
Correct location block for SS4 
SS4 uses /index.php so the location block and documentation need to also
use that.
 2018-02-08 10:40:25 +00:00
Daniel Hensby
03c91f232d
Actually run CMS tests 2018-02-08 10:32:56 +00:00
Damian Mooyman
0c65a878b9
Merge pull request #7836 from dhensby/pulls/4.0/default-admin-encryptor 
FIX Issue where default admin has no password encryption
 2018-02-07 10:14:35 +13:00