Damian Mooyman
46cbe809ac
Merge remote-tracking branch 'origin/3.1' into 3.2
...
# Conflicts:
# docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
# docs/en/02_Developer_Guides/14_Files/01_Image.md
# docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
# docs/en/03_Upgrading/index.md
# docs/en/05_Contributing/01_Code.md
# forms/TreeMultiselectField.php
# security/Permission.php
2016-01-19 14:00:19 +13:00
Damian Mooyman
4de81a7bc8
Merge pull request #4935 from SpiritLevel/3.1-docs
...
DOCS 3.1 : typos and broken internal links
2016-01-18 15:23:15 +13:00
David Alexander
45d2b57a65
DOCS 3.1 : typose and broken internal links
2016-01-15 16:39:23 +13:00
Damian Mooyman
bd0716d1ee
Merge pull request #4930 from SpiritLevel/3.1-docs
...
DOCS 3.1 - fixes broken internal links
2016-01-15 10:02:43 +13:00
David Alexander
5c99e33eb2
DOCS 3.1 - fixes broken internal links
2016-01-14 23:59:53 +13:00
Damian Mooyman
6e29d35c27
Merge pull request #4922 from flamerohr/vagrant-tutorial
...
DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox
2016-01-13 13:09:48 +13:00
Christopher Joe
007e0eeb2f
DOCS: Added tutorial for installing silverstripe with Vagrant and Virtualbox
2016-01-13 12:12:21 +13:00
Damian Mooyman
aac59a85ff
Merge pull request #4908 from kinglozzer/cms-1307-filelink-field
...
FIX: Update field IDs for file link (fixes silverstripe/silverstripe-cms#1307 )
2016-01-12 11:01:49 +13:00
Damian Mooyman
1d13660530
Merge pull request #4907 from d-rivera-c/pulls/group-roles-admin-check
...
Display all roles when an admin, filter by OnlyAdminCanApply when not
2016-01-12 10:50:07 +13:00
Loz Calver
85ba918a54
FIX: Update field IDs for file link ( fixes silverstripe/silverstripe-cms#1307 )
2016-01-11 16:37:27 +00:00
Daniel Hensby
65a6f3d148
Merge pull request #4894 from spekulatius/patch-1
...
DOCS moving to spaces for some examples
2016-01-11 15:54:38 +00:00
Denise Rivera
7e32268ede
display filtered roles when not an admin
2016-01-11 13:05:10 +13: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
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
