Commit Graph

567 Commits

Author SHA1 Message Date
Daniel Hensby
d80ef3d9e6
DOCS Update docs to reflect true config merge priorities 2018-07-13 15:43:56 +01:00
Robbie Averill
3244603458 Merge remote-tracking branch 'origin/3.6' into 4.0 2018-05-28 17:50:54 +12:00
Robbie Averill
3a537bc745 Merge branch 'heads/4.0.4' into 4.0 2018-05-28 17:50:07 +12:00
Robbie Averill
d21660971f Merge branch 'heads/3.6.6' into 3.6 2018-05-28 17:44:28 +12:00
Robbie Averill
dae8fefb1e Merge remote-tracking branch 'origin/3.5' into 3.6 2018-05-28 17:43:55 +12:00
Robbie Averill
912dc60cf3
Added 3.5.8 changelog 2018-05-28 15:50:54 +12:00
Robbie Averill
fe4f6f42d3
Updated 4.0.4 changelog 2018-05-24 13:51:21 +12:00
Robbie Averill
bb1f0cce58
Added 4.0.4 changelog 2018-05-24 11:15:14 +12:00
Robbie Averill
91327ab63e
Added 3.6.6 changelog 2018-05-14 10:59:58 +12:00
Robbie Averill
097f16282d
Added 3.6.6-rc1 changelog 2018-05-10 16:03:20 +12:00
Robbie Averill
8b750b3d80 Merge remote-tracking branch 'origin/3.5.8' into 3.6.6 2018-05-10 15:52:23 +12:00
Robbie Averill
89dcc93a4f
Added 3.5.8 changelog 2018-05-10 12:00:45 +12:00
Robbie Averill
9d055dd946
Added 3.5.8-rc1 changelog 2018-05-10 09:38:54 +12:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0 2018-02-09 14:32:58 +00:00
Damian Mooyman
e967ab09a2 Added 4.0.3 changelog 2018-02-05 17:10:00 +13:00
Damian Mooyman
a805aabecd Added 3.6.5 changelog 2018-02-05 15:19:24 +13:00
Damian Mooyman
96ec6e9181
Merge remote-tracking branch 'origin/3.5' into 3.6 2018-02-05 15:07:21 +13:00
Damian Mooyman
abbc4b72be Added 3.5.7 changelog 2018-02-05 14:30:53 +13:00
Christopher Joe
78a6b4b4c3 Cleanup upgrade docs and 4.0 change logs 2018-02-01 15:27:02 +13:00
Damian Mooyman
c7e341c67d Added 4.0.2 changelog 2018-01-25 12:26:49 +13:00
Damian Mooyman
bb37bc5491 Added 3.6.4 changelog 2018-01-16 16:40:43 +13:00
Daniel Hensby
1c72d6946d
Merge branch '3.6' into 4.0 2017-12-14 21:01:35 +00:00
Damian Mooyman
c22726bfd7
Merge remote-tracking branch 'origin/3.5' into 3 2017-12-07 14:09:02 +13:00
Damian Mooyman
e3c382a4de Added 4.0.1 changelog 2017-12-07 13:46:52 +13:00
Damian Mooyman
bf74e8347a Added 3.6.3 changelog 2017-12-07 13:35:49 +13:00
Damian Mooyman
b6a7e47441 Added 3.5.6 changelog 2017-12-07 13:27:17 +13:00
Damian Mooyman
4ff1fb32dd Added 4.0.1-rc1 changelog 2017-12-07 12:16:58 +13:00
Damian Mooyman
16be39aa06 Added 4.0.1-rc1 changelog 2017-12-07 11:21:44 +13:00
Damian Mooyman
8537dd56dd Added 3.6.3-rc2 changelog 2017-12-06 18:11:03 +13:00
Damian Mooyman
d6a93f5215
Merge remote-tracking branch 'silverstripe-security/3.5' into 3.6
# Conflicts:
#	security/Member.php
2017-12-06 17:26:45 +13:00
Damian Mooyman
d09c2d7b03 Added 3.5.6-rc1 changelog 2017-12-06 16:27:12 +13:00
Damian Mooyman
5f7f1ea150 Added 3.5.6-rc1 changelog 2017-12-06 16:27:08 +13:00
Robbie Averill
2e139dc5fd DOCS Update getRelativeResourcePath (deprecated) to getResource()->getRelativePath() in upgrade examples 2017-11-27 10:53:21 +13:00
Damian Mooyman
4439d051cf DOCS Add note on removed deprecated setApplicationLink / setApplicationName
Fixes #7631
2017-11-23 15:20:00 +13:00
Daniel Hensby
4d1e659fed
Merge branch pull request #7604 from open-sausages/pulls/4.0/owns-example-upgrading
DOCS Adjust owns upgrading example
Fixes #7598
2017-11-16 10:53:38 +00:00
Damian Mooyman
58b43f29a9
DOCS Adjust owns upgrading example
Fixes #7598
2017-11-16 11:38:26 +13:00
Daniel Hensby
3cd0b23172
DOCS add import to upgrade example 2017-11-08 14:56:13 +00:00
Daniel Hensby
079fffb0f0
DOCS Update 4.0.0 changelog to indicate stable release 2017-11-08 12:58:30 +00:00
Damian Mooyman
6d8df46b8a Added 4.0.0 changelog 2017-11-08 15:14:54 +13:00
Damian Mooyman
c942ca5be6 Added 4.0.0-rc3 changelog 2017-11-03 16:57:41 +13:00
Daniel Hensby
102de3d34c
DOCS Add required import for docs example 2017-11-02 11:50:47 +00:00
Damian Mooyman
f2c938a023 Added 4.0.0-rc2 changelog 2017-11-02 16:41:52 +13:00
Chris Joe
326f74ebe6
Merge pull request #7535 from open-sausages/pulls/4.0/fix-object-replace-link
DOCS Fix broken docs hashlink
2017-10-31 23:34:08 +13:00
Chris Joe
db3c074643
Merge pull request #7533 from open-sausages/pulls/4.0/document-compositefield-setid
DOCS Upgrade path for CompositeField::setID()
2017-10-31 22:22:20 +13:00
Damian Mooyman
d48e8960b4
DOCS Fix broken docs hashlink
Fixes #7534
2017-10-31 11:56:29 +13:00
Damian Mooyman
a145e24fd2
DOCS Upgrade path for CompositeField::setID()
Fixes #7264
2017-10-31 11:18:50 +13:00
Damian Mooyman
ab581646e1
DOCS Remove AssetField reference
Fixes #7529
2017-10-31 09:08:10 +13:00
Christopher Darling
7b1c89fdea
DOCS: fix links to getting_started/environment_management 2017-10-30 12:56:54 +00:00
Aaron Carlino
5b48a9a07b Remove reference to database_fields 2017-10-30 16:13:41 +13:00
Aaron Carlino
46ce733b9a Update changelogs to include notes about database_fields 2017-10-30 12:36:01 +13:00