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

18978 Commits

Author SHA1 Message Date
Damian Mooyman f8ef97c167
BUG Fix import modal 
Fixes https://github.com/silverstripe/silverstripe-admin/issues/251
 2017-09-13 12:52:20 +12:00
Damian Mooyman 546b4dedcf Merge pull request #7370 from andrewandante/FIX/add_themes 
FIX SSViewer::add_themes() to properly prepend
 2017-09-13 09:45:33 +12:00
Daniel Hensby baa3f07712 Merge pull request #7365 from open-sausages/pulls/4.0/fine-tune-buttons 
FIX grid field button styles
 2017-09-12 14:17:54 +01:00
Andrew Aitken-Fincham 6613826ed8 FIX SSViewer::add_themes() to properly prepend 2017-09-12 13:34:56 +01:00
Saophalkun Ponlu 12480633bf
FIX grid field button styles 2017-09-12 13:23:35 +01:00
Daniel Hensby c7c0ee39f1 Merge pull request #7368 from open-sausages/pulls/4.0/fix-bad-requirement 
BUG Incorrect path for requirements file
 2017-09-12 11:10:40 +01:00
Damian Mooyman 905c4e04d5
BUG Incorrect path for requirements file 2017-09-12 10:36:48 +01:00
Damian Mooyman f46fe438e4 Merge pull request #7367 from chillu/pulls/4/travis-trusty 
Move to travis trusty dist
 2017-09-12 17:50:15 +12:00
Ingo Schommer 51153e8b52 Pin firefox version 2017-09-12 15:59:01 +12:00
Ingo Schommer 81097f34b1 Move to travis trusty dist 
See https://github.com/silverstripe/silverstripe-framework/pull/7092 for context.
 2017-09-12 15:21:10 +12:00
Damian Mooyman 69e8b45c12 Merge pull request #6826 from blueo/hackday/cleanup-bem-conventions 
BEM class names for filter-buttons
 2017-09-12 11:01:26 +12:00
Bernard Hamlin fa86f42ab9
BEM class names for filter-buttons 2017-09-12 10:16:03 +12:00
Damian Mooyman 21f2da4962 Added 4.0.0-beta3 changelog 2017-09-11 15:13:51 +12:00
Damian Mooyman 56abd3be57 Update translations 2017-09-08 16:52:22 +12:00
Damian Mooyman 22e991ef90 Merge pull request #7344 from creative-commoners/pulls/4.0/email-assertion-return 
DOCS Update doc block for TestMailer::findEmail to reflect the new key names
 2017-09-08 13:08:03 +12:00
Chris Joe a764488403 Merge pull request #7352 from open-sausages/pulls/4.0/safer-perms 
DOCS Update documentation / upgrading for file permissions
 2017-09-08 12:27:01 +12:00
Damian Mooyman c2bd9e2216
DOCS Update documentation / upgrading for file permissions 
Fixes #7350
 2017-09-08 11:54:36 +12:00
Chris Joe cb8b33b9eb Merge pull request #7349 from andrewandante/patch-2 
FIX use correct namespaces for middleware injection
 2017-09-07 20:45:13 +12:00
Chris Joe d1df61a19b Merge pull request #7332 from open-sausages/pulls/4.0/installer-env-cleanup 
Ensure installer.php works nicely with .env files
 2017-09-07 09:47:56 +12:00
Andrew Aitken-Fincham dc240ce7f3 FIX use correct namespaces for middleware injection 2017-09-06 17:04:31 +01:00
Robbie Averill a4aa59bfdc DOCS Update doc block for TestMailer::findEmail to reflect the new key names 2017-09-06 16:10:55 +12:00
Damian Mooyman 806ffb934e
BUG Ensure installer.php works nicely with .env files 
Unenjoyable cleanup of internal logic
 2017-09-06 13:52:51 +12:00
Damian Mooyman b270eee1b0 Merge pull request #7102 from Firesphere/pulls/auth-docs 
DOCS Authentication
 2017-09-06 13:08:49 +12:00
Damian Mooyman 40678d5897 Merge pull request #7342 from open-sausages/pulls/4.0/disable-me-a-plus 
Fix permission check for admin role
 2017-09-06 11:38:01 +12:00
Christopher Joe 25380eb454 Fix permission check for admin role 2017-09-06 10:21:01 +12:00
Chris Joe 1f5644d143 Merge pull request #7340 from open-sausages/pulls/4.0/toolbar-button-margin 
Fix toolbar button margin and spacing
 2017-09-05 16:07:32 +12:00
Saophalkun Ponlu 2f7f4e73d9 Fix toolbar button margin and spacing 2017-09-05 15:08:05 +12:00
Damian Mooyman 8425533487 Merge pull request #7336 from open-sausages/pulls/4.0/the-uncontained-popover-was-powerful 
Fix add schema to the "auto" parts request
 2017-09-05 14:01:12 +12:00
Damian Mooyman 4c84f22b2e Merge pull request #7325 from xini/patch-3 
use html5 mark tag to highlight search parameter
 2017-09-05 13:38:42 +12:00
Chris Joe 539fb5f1ee Merge pull request #7321 from open-sausages/pulls/4.0/bump-deprecation 
Bump deprecation to 4.0 in preparation for rc and stable tags
 2017-09-05 13:26:13 +12:00
Christopher Joe afda58c515 Fix add schema to the "auto" parts request 2017-09-05 13:12:51 +12:00
Florian Thoma d1f7e6959f update tests and doc 2017-09-05 09:42:08 +10:00
Damian Mooyman 6f7b0d9ae0 Merge pull request #7323 from martinduparc/patch-5 
Missing namespace
 2017-09-05 11:04:16 +12:00
Damian Mooyman 3088a76816 Merge pull request #7338 from creative-commoners/pulls/4.0/default-array-data-value 
MINOR Add default value to ArrayData constructor
 2017-09-05 10:58:42 +12:00
Robbie Averill f8372ef6dc MINOR Add default value to ArrayData constructor 2017-09-05 09:42:52 +12:00
Daniel Hensby 16416fe15b Merge pull request #7334 from open-sausages/pulls/4.0/destroyed-cleanup 
Remove redundant gc_collect_cycles()
 2017-09-04 15:03:09 +01:00
Damian Mooyman cbac6a7db2 Merge pull request #7328 from open-sausages/pulls/4.0/entwined-in-a-tree-of-mess 
Add TreeDropdownField from React to Entwine
 2017-09-04 13:51:56 +12:00
Christopher Joe 120c772966 Add TreeDropdownField from React to Entwine 2017-09-04 12:15:41 +12:00
Damian Mooyman 458e919a69 Merge pull request #7331 from open-sausages/pulls/4.0/enable-mce-lists 
Enable TinyMCE list buttons
 2017-09-04 09:59:18 +12:00
Saophalkun Ponlu 08fa3d6e3d
Enable TinyMCE list buttons 2017-09-04 09:30:07 +12:00
Damian Mooyman 45998444d7
Remove redundant gc_collect_cycles() 
Cleanup dead references to DataObject::$destroyed
Fixes #7326
 2017-09-04 09:23:07 +12:00
Chris Joe 9fb5a2a693 Merge pull request #7329 from open-sausages/pulls/4.0/file-upgrade-docs 
DOCS Upgrading file docs
 2017-09-01 13:39:18 +12:00
Damian Mooyman fdc5ad7337
DOCS Upgrading file docs 2017-09-01 13:14:43 +12:00
Loz Calver 526cff4e55 Merge pull request #7330 from silverstripe/pulls/fix-hasone-docs 
Fix incorrect $has_one documentation
 2017-08-31 14:00:59 +01:00
Matt Peel acc58c2b68 Fix incorrect $has_one documentation 
The first mention of `$has_one` and `$db` in this file is incorrect, which is misleading. It's explained properly later on in the document, but it's easy to get it wrong based on this first code snippet.
 2017-09-01 00:48:07 +12:00
Florian Thoma 0d15cb02cd use html5 mark tag to highlight search parameter 2017-08-30 12:05:11 +10:00
Chris Joe 76f2358f3b Merge pull request #7324 from open-sausages/pulls/4/env-type-docs 
DOCS Corrected env type docs (fixes #7290)
 2017-08-30 11:44:55 +12:00
Christopher Joe 02c1a5199b Docs tweaked sentence wording to be more descriptive 2017-08-30 10:41:01 +12:00
Ingo Schommer 64af679c35 DOCS Corrected env type docs (fixes #7290) 2017-08-30 08:35:41 +12:00
Martin D 05f34f31e5 Update 01_SiteConfig.md 2017-08-29 14:55:47 -04:00