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
Cam Findlay
c7b2f88d4e
DOCS Suggest a tool to help people generate their change logs for modules.
2015-11-10 11:50:53 +13:00
Damian Mooyman
c4dc10b255
Merge remote-tracking branch 'origin/3.2' into 3
...
Conflicts:
forms/DropdownField.php
tests/model/ImageTest.php
2015-11-03 13:06:39 +13:00
Damian Mooyman
e07f80014c
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
lang/cs.yml
lang/sk.yml
2015-11-03 11:10:46 +13:00
Ed Linklater
cacbbd75bc
DOCS: jQuery delegation in Admin interface
2015-11-01 05:46:13 +13:00
Damian Kissick
0197b46001
Update 01_Code.md
...
Corrected 'submiting' spelling
2015-10-28 21:28:45 +13:00
Michael Parkhill
e44f22c6b2
Fix broken link to DataObject api
2015-10-28 11:52:35 +13:00
Christopher Darling
a1e343629b
DOCS: correct config setting for custom editor.css
...
see a964e7636e/admin/code/LeftAndMain.php (L287-L308)
2015-10-26 11:02:47 +00:00
Peter Thaleikis
791c52c6bd
fixing syntax error
2015-10-25 22:41:13 +13:00
David Alexander
e88032a7aa
DOCS : spelling
2015-10-23 13:49:03 +13:00
Cam Findlay
0fa8335bc0
DOCS Upgrading information about 3.2.0 and the additional modules required (reports & siteconfig)
...
Based on a community question about upgrading their site manually, they followed the instructions but were not aware of the additional modules now required.
2015-10-22 09:13:57 +13:00
Cam Findlay
a555817d6f
DOCS Module standard 1.0
...
Adding the module standard to 3.2+ docs.
2015-10-19 11:44:31 +13:00
Damian Mooyman
cc4d92e91a
Merge remote-tracking branch 'origin/3.2.0' into 3.2
2015-10-12 09:18:01 +13:00
Damian Mooyman
0092792568
Added 3.2.0 changelog
2015-10-12 08:44:34 +13:00
Damian Mooyman
a679680c0d
Update changelogs to include PDO upgrade instructions
2015-10-07 16:11:42 +13:00
Hamish Friedlander
b03ae843ca
Update core contributors docs to include Jono Menz
2015-10-07 14:35:29 +13:00
Damian Mooyman
557c4211fa
Update changelog
2015-10-07 09:51:24 +13:00
Damian Mooyman
4af684f2f3
Added 3.2.0-rc2 changelog
2015-10-06 18:49:35 +13:00
Daniel Hensby
fa878b1e1f
Merge pull request #4642 from hailwood/patch-1
...
DOCS Remove extra set of li's
2015-10-03 10:28:50 +01:00
Matthew Hailwood
5e68512e1c
Remove extra set of li's
2015-09-30 14:19:20 +13:00
