Commit Graph

15468 Commits

Author SHA1 Message Date
Damian Mooyman
8a195020ff Merge pull request #4902 from flamerohr/3
DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox
2016-01-11 18:11:43 +13:00
Denise Rivera
7e32268ede display filtered roles when not an admin 2016-01-11 13:05:10 +13:00
Christopher Joe
0ac0e5a7d2 Added tutorial for installing silverstripe with Vagrant and Virtualbox 2016-01-08 15:54:05 +13:00
scott1702
4a0e157479 Remove focus outline when clicking tabs 2016-01-08 15:11:17 +13:00
Damian Mooyman
7e389b941b Merge pull request #4882 from sb-relaxt-at/4881-drag-and-drop-bugfix
jquery.jstree patched to improve drag-and-drop handling
2016-01-08 12:54:01 +13:00
Sam Minnee
4aa50534d5 FIX: Fixes needed to adapt to whitespace changes.
API: Whitespace trimmed from custom form field templates

The introduction of trailing newlines on all template files introduced
some changes that needed to be made.

Notably, whitespace has been trimmed from rendered form field templates.
This is the minimal impact to SilverStripe developers, as it preserves
the behaviour of the default field types, but I’ve still noted as a
change.
2016-01-07 14:17:57 +13:00
Sam Minnee
3ee8f505b7 MINORE: Remove training whitespace.
The main benefit of this is so that authors who make use of
.editorconfig don't end up with whitespace changes in their PRs.

Spaces vs. tabs has been left alone, although that could do with a
tidy-up in SS4 after the switch to PSR-1/2.

The command used was this:

for match in '*.ss' '*.css' '*.scss' '*.html' '*.yml' '*.php' '*.js' '*.csv' '*.inc' '*.php5'; do
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" -exec sed -E -i '' 's/[[:space:]]+$//' {} \+
	find . -path ./thirdparty -not -prune -o -path ./admin/thirdparty -not -prune -o -type f -name "$match" | xargs perl -pi -e 's/ +$//'
done
2016-01-07 10:15:54 +13:00
Sam Minnee
b080a83b98 MINOR: Supress whitespace cleanup in thirdparty folders.
The whitespace cleanup specified by editorconfig shouldn't happen on thirdparty
files, as these should be left alone.
2016-01-07 10:09:10 +13:00
Damian Mooyman
c32017e3f3 Merge pull request #4870 from kinglozzer/4821-viewabledata-failover
NEW: Add ViewableData::setFailover() to refresh detected methods when changing failover
2016-01-07 10:01:38 +13:00
Loz Calver
c9ba0e48fc NEW: Add ViewableData::setFailover() to refresh detected methods when changing failover 2016-01-06 15:19:33 +00:00
Damian Mooyman
3c55608075 Merge pull request #4892 from camfindlay/patch-37
DOCS FIX typo for i18n
2016-01-06 15:18:51 +13:00
Damian Mooyman
21e1e938eb Merge pull request #4893 from dhensby/pulls/member-regenerate-session-id
FIX session_regenerate_id uses config system
2016-01-06 15:16:31 +13:00
Damian Mooyman
63a1739493 Merge pull request #4618 from dhensby/pulls/permission-check-empty-admin
Members with no ID have no permissions
2016-01-06 13:50:08 +13:00
Damian Mooyman
e59595bb23 Merge pull request #4879 from gordonbanderson/patch-1
Documentation : Using SQLite for Testing
2016-01-06 13:49:03 +13:00
Peter Thaleikis
4366000a9f fixing examples
PSR-2 style for examples
2016-01-06 12:28:26 +13:00
Daniel Hensby
00544ff100 FIX session_regenerate_id uses config system 2016-01-05 22:31:58 +00:00
Cam Findlay
7b77380df5 DOCS FIX typo for i18n
Was causing a number of 404 crawl errors.
2016-01-06 09:11:23 +13:00
Daniel Hensby
4335d8ed22 FIX Members with no ID inherit logged in user permission 2016-01-05 08:16:18 +00:00
Ingo Schommer
70897834c9 Corrected release docs merge pipeline 2016-01-05 14:08:49 +13:00
Damian Mooyman
4d3f709bff Merge pull request #4885 from scott1702/fix-contrast
color updates to meet contrast requirements
2016-01-05 13:34:29 +13:00
Sam Minnée
9644c01178 Merge pull request #4886 from chillu/pulls/release-process-docs-changes
Release process docs changes
2016-01-05 11:36:42 +13:00
Ingo Schommer
90837d4aa2 Release docs: Mention IRC, Behat and milestones 2016-01-05 11:27:46 +13:00
Ingo Schommer
ce1a069885 Clarify RC wording in release docs
An RC is technically only one of a few "pre-release" labels (alpha, beta, rc)
2016-01-05 11:27:45 +13:00
Ingo Schommer
7c3fd7de13 Note required commands in release docs 2016-01-05 11:27:45 +13:00
scott1702
b64d73dcbf color updates to meet contrast requirements 2016-01-05 11:20:30 +13:00
Damian Mooyman
bb09340605 Merge pull request #4876 from SilbinaryWolf/remove-validation-from-lookupfield
Added unit test to ensure LookupField can't save into a DataObject
2016-01-05 10:18:36 +13:00
Damian Mooyman
df297b28b4 Merge pull request #4874 from christopherdarling/patch-7
DOCS: fixed 3.2.0 changelog DataList code sample
2016-01-05 10:10:53 +13:00
Damian Mooyman
ad9d293122 Merge pull request #4872 from powtac/3
Typo
2016-01-05 09:54:37 +13:00
Daniel Hensby
5470f23e2f Merge pull request #4873 from xini/fix-compositefield-extraclass
FIX extraClass() method to match parent method
2016-01-04 20:32:53 +00:00
Stephan Bauer
95e96fa2b2 BUG jquery.jstree patched to improve drag-and-drop handling (fixes #4881) 2016-01-03 23:20:22 +01:00
Gordon Anderson
f61cedc03c Update to 00_Unit_Testing
Additional section with instructions on running tests using in memory SQLite,
2015-12-30 13:29:32 +07:00
Jake Ben
c07dcaa3af Added unit test to ensure LookupField can't save into a DataObject 2015-12-24 14:30:50 +11:00
Christopher Darling
ef4a75ad43 DOCS: fixed 3.2.0 changelog DataList code sample 2015-12-23 13:13:32 +00:00
Florian Thoma
e94c0fa221 FIX extraClass() method to match parent method 2015-12-23 21:06:00 +11:00
Simon Brüchner
7ec09b5fde Typo 2015-12-23 09:32:26 +01:00
Sam Minnée
751264fd6a Merge pull request #4871 from tractorcow/pulls/3.2/better-release-instructions
Improve release process instructions
2015-12-23 16:50:46 +13:00
Damian Mooyman
0dfa8ca7b2 Improve release process instructions 2015-12-23 16:45:34 +13:00
Damian Mooyman
b987b5d5da Merge remote-tracking branch 'origin/3.3' into 3 2015-12-23 14:33:16 +13:00
Damian Mooyman
1466a9cd84 Alias 3 branch as 3.4 2015-12-23 14:22:41 +13:00
Damian Mooyman
5507ce89c6 Copy upgrade notes from 3.3.0.md 2015-12-23 14:12:02 +13:00
Damian Mooyman
70bb3d92c7 Added 3.3.0-beta1 changelog 2015-12-23 13:38:55 +13:00
Damian Mooyman
952896e638 Update translations 2015-12-23 13:22:38 +13:00
Damian Mooyman
4d2340a392 Merge pull request #4868 from kinglozzer/4854-i18n-meta
FIX: Get locale from <html> element for i18n.js (fixes #4854)
2015-12-23 10:27:32 +13:00
Loz Calver
706877d72e FIX: Get locale from <html> element for i18n.js (fixes #4854) 2015-12-22 14:14:17 +00:00
Sam Minnée
ea5f72c176 Merge pull request #4867 from tractorcow/pulls/3/merge-bugs
BUG Workaround for issues in testing versioned
2015-12-22 18:40:16 +13:00
Damian Mooyman
fce82519bd BUG Workaround for issues in testing version 2015-12-22 17:47:53 +13:00
Damian Mooyman
19b10044ec Merge remote-tracking branch 'origin/3.2' into 3 2015-12-22 17:05:07 +13:00
Damian Mooyman
6ac83f02c9 Merge pull request #4819 from SilverStripers/3
parse the string to be converted to group codes.
2015-12-22 16:53:31 +13:00
Damian Mooyman
5dbb9c1da0 Merge branch 'pr/4499' into 3 2015-12-22 16:50:22 +13:00
jpvdpoel
0d9080097e Adding nl_BE and fr_BE as common_locales 2015-12-22 16:49:43 +13:00