Damian Mooyman
|
5d240feaec
|
Merge remote-tracking branch 'origin/3.2' into 3.3
|
2016-01-19 15:08:24 +13:00 |
|
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 |
|
David Alexander
|
45d2b57a65
|
DOCS 3.1 : typose and broken internal links
|
2016-01-15 16:39:23 +13:00 |
|
David Alexander
|
5c99e33eb2
|
DOCS 3.1 - fixes broken internal links
|
2016-01-14 23:59:53 +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
|
3c55608075
|
Merge pull request #4892 from camfindlay/patch-37
DOCS FIX typo for i18n
|
2016-01-06 15:18:51 +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 |
|
Cam Findlay
|
7b77380df5
|
DOCS FIX typo for i18n
Was causing a number of 404 crawl errors.
|
2016-01-06 09:11:23 +13:00 |
|
Ingo Schommer
|
70897834c9
|
Corrected release docs merge pipeline
|
2016-01-05 14:08:49 +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 |
|
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 |
|
Damian Mooyman
|
0dfa8ca7b2
|
Improve release process instructions
|
2015-12-23 16:45:34 +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
|
d63441623a
|
Merge pull request #4612 from johndalangin/patch-4
Added cookie_secure configuration directive
|
2015-12-22 16:36:05 +13:00 |
|
Damian Mooyman
|
48a30909f3
|
Merge remote-tracking branch 'origin/3.2' into 3
# Conflicts:
# admin/javascript/LeftAndMain.BatchActions.js
# css/UploadField.css
# forms/HtmlEditorField.php
|
2015-12-22 14:07:52 +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 |
|
Ivo Bathke
|
f77bac3ab0
|
Update 02_Composer.md
gdmedia/ss-auto-git-ignore as dev requirement
|
2015-12-17 11:57:46 +01:00 |
|
Damian Mooyman
|
22d8105a56
|
Add changelog for 3.3.0
|
2015-12-10 17:48:06 +13:00 |
|
Hamish Friedlander
|
1eda9151a4
|
Merge pull request #4831 from open-sausages/pulls/3/fix-versioned-canview
API Create default security permission model for versioned data objects
|
2015-12-09 14:17:27 +13:00 |
|
Damian Mooyman
|
6089a7c5bd
|
API Create default security permission model for versioned data objects
|
2015-12-09 11:33:53 +13: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 |
|
Marcus Nyeholt
|
f7c270a3ba
|
NEW Use Config for determining Vary header
Existing implementation hardcodes the Vary header; swap to using Config layer
instead
Added test for changing the variable from config
|
2015-12-02 10:28:24 +11:00 |
|
muskie9
|
fc3b06dbf9
|
DOCS update LinkingModes description
|
2015-11-23 14:10:47 -06:00 |
|
Daniel Hensby
|
572945a2fd
|
Merge pull request #4704 from spekulatius/patch-1
fixing syntax error
|
2015-11-23 14:18:50 +00: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 |
|
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
|
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
|
0178fa5a18
|
Added 3.2.1 changelog
|
2015-11-16 16:17:10 +13:00 |
|
Damian Mooyman
|
2e6469956f
|
Add 3.1.16-rc1 changelog
|
2015-11-16 15:20:30 +13:00 |
|
Damian Mooyman
|
615b2d5563
|
Added 3.1.16 changelog
|
2015-11-16 15:16:49 +13:00 |
|
Cam Findlay
|
e5e4a55fe0
|
DOCS Update conflict resolution help in code of conduct
Original link was 404.
|
2015-11-14 09:42:12 +13:00 |
|
Damian Mooyman
|
c19420f545
|
Add 3.2.1-rc2 changelog
|
2015-11-13 15:32:09 +13:00 |
|
Damian Mooyman
|
49acc0d468
|
Added 3.2.1-rc2 changelog
|
2015-11-13 15:27:08 +13:00 |
|
Hamish Friedlander
|
b61d6dcd57
|
[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs
|
2015-11-13 15:20:09 +13:00 |
|
Damian Mooyman
|
245e0aae2f
|
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
|
2015-11-11 17:50:02 +13:00 |
|
Damian Mooyman
|
1c1c0a23bd
|
Added 3.2.1-rc1 changelog
|
2015-11-11 17:10:41 +13:00 |
|
Damian Mooyman
|
bc1b2893ac
|
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
|
2015-11-11 16:56:19 +13:00 |
|
Daniel Hensby
|
583cbdd77f
|
Merge pull request #4756 from camfindlay/patch-34
DOCS Suggest a tool to help people generate their change logs for mod…
|
2015-11-10 07:50:11 +00:00 |
|
Cam Findlay
|
218049f5c0
|
DOCS Suggesting a convention for CMS user documentation so CMS users don't get lost in dev docs.
|
2015-11-10 11:59:38 +13:00 |
|