Commit Graph

86 Commits

Author SHA1 Message Date
Cam Findlay
1df3d7cee1 Rebased additional documentation since May 2014.
New pages filed and metadata added.
2014-12-17 15:48:58 +13:00
Will Rossiter
6c5ddaf054 Restructure of the docs markdown source files into more logical taxonomy 2014-12-17 15:48:35 +13:00
Damian Mooyman
0b1f297873 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Damian Mooyman
4ece737220 Update changelogs 2014-11-14 15:38:19 +13:00
Damian Mooyman
0a5c380c92 Added 3.1.7-rc1 changelog 2014-11-08 18:50:54 +13:00
Damian Mooyman
8468546876 Add changelogs for 3.1.7-rc1 2014-11-08 18:36:03 +13:00
Damian Mooyman
f49416858c Added 3.1.6-rc3 changelog 2014-08-18 17:42:31 +12:00
Mateusz Uzdowski
8bf3853887 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/issues.md
	docs/en/reference/uploadfield.md
	forms/HtmlEditorField.php
	i18n/i18n.php
	javascript/HtmlEditorField.js
	model/DB.php
	model/Image.php
	model/SQLQuery.php
2014-08-14 09:08:26 +12:00
Damian Mooyman
2b25ab37f6 3.1.6-rc2 docs 2014-08-12 15:09:13 +12:00
Damian Mooyman
9912410e7b Update documentation links 2014-08-05 16:14:39 +12:00
Damian Mooyman
259850477c Update release docs 2014-08-05 15:50:03 +12:00
Damian Mooyman
d42edae617 Added 3.1.6-rc1 changelog 2014-08-05 15:38:41 +12:00
Ingo Schommer
bb03f6ba2f Merge remote-tracking branch 'origin/3.1'
Conflicts:
	forms/HtmlEditorField.php
2014-06-15 22:50:20 +12:00
Damian Mooyman
830c10704c Fix changelog 2014-05-13 15:06:43 +12:00
Damian Mooyman
c492c5efda Merge remote-tracking branch 'origin/3.0' into 3.1.5
Conflicts:
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	tests/filesystem/FolderTest.php
2014-05-13 14:32:27 +12:00
Damian Mooyman
ec578e5c8a Merge remote-tracking branch 'origin/3.1' 2014-05-12 11:32:22 +12:00
Damian Mooyman
98e5c1556f Release docs update 2014-05-07 15:54:55 +12:00
Damian Mooyman
0ae96ab030 Changelog tags 2014-05-07 14:11:10 +12:00
Damian Mooyman
953e4b4c49 Added change log for 3.0.11-rc1 2014-05-07 14:03:13 +12:00
Damian Mooyman
58d2535082 Added 3.1.5-rc1 change log 2014-05-07 10:54:33 +12:00
Damian Mooyman
4c69d42bd2 Merge remote-tracking branch 'origin/3.1' 2014-04-02 17:23:39 +13:00
Damian Mooyman
93ca3f7f23 Documentation link fixes 2014-04-01 17:46:08 +13:00
Damian Mooyman
2f91826b28 Merge remote-tracking branch 'origin/3.0' into 3.1 2014-04-01 17:43:38 +13:00
Damian Mooyman
9230d41186 Include announcement links for security fixes 2014-04-01 17:40:39 +13:00
Damian Mooyman
f2725523ae 3.1.4-rc1 release docs 2014-04-01 11:28:44 +13:00
Damian Mooyman
6ae7d43a5d Merge remote-tracking branch 'origin/3.0' into 3.1 2014-04-01 07:56:01 +13:00
Damian Mooyman
cf2a314a50 Added change log to upgrade docs 2014-03-31 16:31:25 +13:00
Damian Mooyman
21f50f44e5 3.0.10-rc1 upgrading docs 2014-03-31 16:07:53 +13:00
Simon Welsh
d431e98ecf Merge branch '3.1'
Conflicts:
	forms/Form.php
	forms/FormField.php
	security/Member.php
	security/MemberLoginForm.php
2014-03-10 22:58:49 +13:00
Simon Welsh
0e0597f8cd Merge branch '3.0' into 3.1
Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php
2014-03-10 22:56:27 +13:00
Ingo Schommer
d6b75acbc4 Added 3.1.3-rc2 changelog 2014-02-24 10:08:09 +13:00
Ingo Schommer
6ba7b2e3d8 Added changelog links 2014-02-19 15:40:16 +13:00
Ingo Schommer
2bc62f2e71 Added changelog links 2014-02-19 15:39:54 +13:00
Ingo Schommer
4af711613f 3.1.3-rc1 changelog 2014-02-19 15:24:04 +13:00
Ingo Schommer
ec02df2160 Removed SS-2014-002 from changelog, not backported to 3.0 2014-02-19 15:22:12 +13:00
Ingo Schommer
a6f794c3b9 Added 3.0.9-rc1 changelog 2014-02-19 15:20:24 +13:00
Ingo Schommer
d8361f9d3f Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:06:59 +13:00
Hamish Friedlander
d6630d240a NEW Allow specifying element whitelist in HTMLText fields 2014-02-18 14:02:04 +13:00
Andrew Short
bedf292612 Merge branch '3.1'
Conflicts:
	docs/en/reference/execution-pipeline.md
	lang/nl.yml
2013-11-11 18:18:25 +11:00
Ingo Schommer
008bd97828 Added 3.1.2-rc1 changelog 2013-11-08 01:11:57 +01:00
Ingo Schommer
b367dd6237 API Removed Member.LastVisited and Member.NumVisits 2013-10-10 12:35:07 +02:00
Ingo Schommer
60fc7e5346 Merge remote-tracking branch 'origin/3.1' 2013-10-06 19:07:39 +02:00
Ingo Schommer
2c8d8767b0 Merge branch '3.1.0' into 3.1 2013-09-30 23:43:21 +02:00
Ingo Schommer
298de5a67d FIX Escape breadcrumbs in SecurityAdmin (SS-2013-007) 2013-09-30 22:53:43 +02:00
Ingo Schommer
455e550d9a Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/topics/testing/create-silverstripe-test.md
	forms/Form.php
	i18n/i18n.php
	model/Image.php
2013-09-27 19:22:14 +02:00
Ingo Schommer
e53f03cd94 Merge remote-tracking branch 'origin/3.1.0' into 3.1
Conflicts:
	docs/en/changelogs/rc/3.1.0-rc3.md
2013-09-27 18:52:37 +02:00
Ingo Schommer
2e3511bc5f Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	docs/en/changelogs/3.0.6.md
	forms/Form.php
	forms/FormField.php
	forms/TreeDropdownField.php
2013-09-27 18:50:47 +02:00
Ingo Schommer
b3c91ecac9 Added 3.1.0-rc3 changelog 2013-09-26 01:42:27 +02:00
Ingo Schommer
ffb316dbc9 Added 3.0.7-rc1 changelog 2013-09-26 01:32:41 +02:00
Ingo Schommer
debd81d380 Merge pull request #2453 from chillu/pulls/escape-3.1.0
Escaping 3.1
2013-09-25 16:02:45 -07:00