Commit Graph

15282 Commits

Author SHA1 Message Date
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
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
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
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
Christopher Darling
ef4a75ad43 DOCS: fixed 3.2.0 changelog DataList code sample 2015-12-23 13:13:32 +00: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
d63441623a Merge pull request #4612 from johndalangin/patch-4
Added cookie_secure configuration directive
2015-12-22 16:36:05 +13:00
Damian Mooyman
66b3a6a2c5 Merge pull request #4840 from mateusz/guard
BUG Guard against users being added to all groups on unsaved Group.
2015-12-22 16:29:09 +13:00
Damian Mooyman
55e1b66285 Merge pull request #4859 from chillu/pulls/noteworthy-contrib-docs
Note about changelog additions in contrib guide
2015-12-21 14:33:57 +13:00
Ingo Schommer
b97b604a05 Merge pull request #4837 from tractorcow/pulls/3.2/release-docs
Documentation on the release process
2015-12-21 11:55:19 +13:00
Ingo Schommer
e114548a48 Note about changelog additions in contrib guide 2015-12-21 11:52:08 +13:00
Damian Mooyman
c5e1922c65 Merge pull request #4857 from ivoba/patch-1
DOCS : Update 02_Composer.md gdmedia/ss-auto-git-ignore as dev requirement
2015-12-18 10:18:29 +13:00
Ivo Bathke
f77bac3ab0 Update 02_Composer.md
gdmedia/ss-auto-git-ignore as dev requirement
2015-12-17 11:57:46 +01:00
UndefinedOffset
afbb5cfed4 BUGFIX: Vimeo oEmbed endpoint redirecting to no www 2015-12-16 12:19:37 +13:00
Damian Mooyman
3dd2d29f20 Merge pull request #4852 from dhensby/pulls/fix-deselect-multitreedropdown
Fixing deselect failing to change field title
2015-12-16 09:38:52 +13:00
Daniel Hensby
e443a10a5e Fixing deselect failing to change field title 2015-12-15 11:31:55 +00:00
Damian Mooyman
37874936b5 Merge pull request #4848 from kinglozzer/optionsetfield-no-value
FIX: Allow omitting a value for OptionsetField submissions (fixes #4284)
2015-12-15 15:12:07 +13:00
Loz Calver
d6d3aa3554 Remove duplicate code 2015-12-14 16:50:34 +00:00
Loz Calver
d265c9b733 FIX: Allow omitting a value for OptionsetField submissions (fixes #4824) 2015-12-14 16:50:22 +00:00
Mateusz Uzdowski
5a21b2fb15 BUG Guard against users being added to all groups on unsaved Group.
If ->Members()->add() is called on an unsaved group (with ID 0), the
collateFamilyIDs() will errorneously return all root Groups thinking
it's looking for Groups with ParentID=0. As a result, the Member will be
added to all root groups, instead of just the selected group and all its
children.
2015-12-11 14:51:51 +13:00
Daniel Hensby
9dabf15faa Merge pull request #4826 from spekulatius/patch-1
DOCS fixing UploadField example
2015-12-10 15:07:11 +00:00
Damian Mooyman
903d4838bb Documentation on the release process 2015-12-04 15:09:58 +13:00
Peter Thaleikis
7db7140a70 fixing example 2015-12-04 11:14:02 +13:00
Loz Calver
c3544fdbea Merge pull request #4799 from tractorcow/pulls/3.2/member-validate-visibility
BUG Revert method visibility regression
2015-11-27 09:29:14 +00:00
Damian Mooyman
94742fa3e2 BUG Revert method visibility regression 2015-11-27 13:10:52 +13:00
Daniel Hensby
572945a2fd Merge pull request #4704 from spekulatius/patch-1
fixing syntax error
2015-11-23 14:18:50 +00:00
Daniel Hensby
e0d7400aea Merge pull request #4788 from christopherdarling/patch-5
FIX: for ConfirmedPasswordField validation
2015-11-23 07:58:24 +00:00
Christopher Darling
e9b833f5f0 FIX: ConfirmedPassword field correctly reports mismatching passwords
added testFormValidation to prove #4780
2015-11-20 15:56:27 +00:00
Daniel Hensby
e3d421ae41 Merge pull request #4786 from nickspiel/3.2
Adding a background to the UploadField preview
2015-11-20 14:51:55 +00:00
Nick Spiel
7a7f592d0f Adding a transparent background to upload preview
Adding a background to upload preview

I could not see a preview of a white image with background transparency in the preview area. Adding a backgorund to this area helps make it more visible.

Applying background image to img

Applying background image to img to avoid layout change

Applying background image to img

Applying background image to img to avoid layout change
2015-11-20 21:14:53 +11:00
Damian Mooyman
624e3fde6a Merge pull request #4708 from muskie9/patch-7
DOCS update framework and cms milestone links
2015-11-20 12:43:11 +13:00
Damian Mooyman
84667e5aa6 Merge pull request #4693 from camfindlay/patch-33
DOCS Upgrading information about 3.2.0 and the additional modules req…
2015-11-20 11:13:36 +13:00
Nic
2e5c56f1d0 DOCS update framework and cms milestone links 2015-11-19 11:34:01 -06:00
Hamish Friedlander
f8236087c7 Merge branch 'camfindlay-rfc' into 3.2 2015-11-19 16:06:28 +13:00
Cam Findlay
9672cd3994 DOCS SilverStripe core RFC process, template and archive links to past RFCs. 2015-11-19 16:05:49 +13:00
Damian Mooyman
83ede291bd Merge pull request #4779 from kinglozzer/pulls/fieldgroup-composite-validation
FIX: Hidden errors for composite fields nested inside FieldGroups (fixes #4773)
2015-11-19 14:04:41 +13:00
Loz Calver
071314fbf2 Merge pull request #4781 from dhensby/pulls/anchor-fix
Fixing regression from #4733
2015-11-18 14:41:28 +00:00
Daniel Hensby
f8cd876217 Fixing regression from #4733 2015-11-18 14:16:25 +00:00
Loz Calver
68d99be24b FIX: Hidden errors for composite fields nested inside FieldGroups (fixes #4773) 2015-11-17 16:34:17 +00:00
Damian Mooyman
43e4eb129a Merge pull request #4771 from camfindlay/patch-36
DOCS Update conflict resolution help in code of conduct
2015-11-17 10:04:40 +13:00
Damian Mooyman
302c741b07 Merge remote-tracking branch 'origin/3.1' into 3.2
Conflicts:
	control/HTTP.php
	forms/Form.php
	tests/view/SSViewerTest.php
2015-11-16 16:50:40 +13:00
Damian Mooyman
fd6ae72e1d Merge remote-tracking branch 'origin/3.2.1' into 3.2 2015-11-16 16:39:15 +13:00
Damian Mooyman
b943a0c6dd Merge remote-tracking branch 'origin/3.1.16' into 3.1 2015-11-16 16:30:24 +13:00
Damian Mooyman
0178fa5a18 Added 3.2.1 changelog 2015-11-16 16:17:10 +13:00
Damian Mooyman
3fe8b7479c Update translations 2015-11-16 16:01:52 +13:00