tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
20,073 Commits 31 Branches 527 Tags 162 MiB
cb7f15a681
Commit Graph

597 Commits

Author SHA1 Message Date
Robbie Averill
cb7f15a681 Merge branch '4.0' into 4.1 2019-02-19 08:36:41 +07:00
Aaron Carlino
a481d004ec Added 3.7.3 changelog 2019-02-19 08:36:17 +07:00
Aaron Carlino
4eeec52b09 Added 3.6.7 changelog 2019-02-19 08:35:57 +07:00
Aaron Carlino
3f3a1884d7 Added 4.0.7 changelog 2019-02-12 21:10:53 +13:00
Aaron Carlino
1362b20ee4 Added 4.1.5 changelog 2019-02-12 20:51:18 +13:00
Robbie Averill
802261aa4b Merge branch '4.0' into 4.1 
# Conflicts:
 #	docs/en/05_Contributing/05_Making_A_SilverStripe_Core_Release.md
 2019-01-08 12:21:27 +01:00
Aaron Carlino
2f9dae2c71 Add changelog 2018-12-12 14:11:21 +13:00
Aaron Carlino
00e996f164 Add changelog 2018-12-12 13:47:17 +13:00
Robbie Averill
df4d2bd838 Merge branch '4.0' into 4.1 
# Conflicts:
 #	lang/da.yml
 #	lang/eo.yml
 #	lang/fi.yml
 #	lang/it.yml
 #	lang/nl.yml
 #	lang/sv.yml
 2018-11-09 11:36:34 +02:00
Aaron Carlino
a843e136e8 Added 4.0.5 changelog 2018-11-09 11:09:07 +13:00
Vagrant Default User
55674959f8 Added 4.1.3 changelog 2018-11-07 22:38:52 +13:00
Daniel Hensby
ec9281ee02
Merge branch '4.0' into 4.1 2018-07-13 16:42:00 +01:00
Daniel Hensby
d80ef3d9e6
DOCS Update docs to reflect true config merge priorities 2018-07-13 15:43:56 +01:00
Damian Mooyman
9f764f4ec3 Added 4.1.2 changelog 2018-06-19 17:06:01 +12:00
Robbie Averill
c8b0bc0ad7 Merge branch '4.0' into 4.1 
# Conflicts:
  #	src/ORM/DataObject.php
  #	tests/php/ORM/DataObjectDuplicationTest.php
  #	tests/php/ORM/DataObjectDuplicationTest/Class1.php
 2018-05-30 14:52:07 +12:00
Robbie Averill
6d98a912c9 Merge branch 'heads/4.1.1' into 4.1 2018-05-28 18:26:20 +12: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
01ed8a316b
Added 4.1.1 changelog 2018-05-24 16:52:15 +12:00
Robbie Averill
722202fef4 Merge remote-tracking branch 'origin/4.0.4' into 4.1.1 
# Conflicts:
  #	src/Control/Director.php
 2018-05-24 15:41:11 +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
Bernard Hamlin
3d2a3198d7
Add .htaccess to base with public rewrite 
Upgrading from 4.0 to 4.1 we needed this extra file. It is created by default with the cms recipe eg: https://raw.githubusercontent.com/silverstripe/recipe-cms/1/.htaccess
 2018-04-16 14:51:12 +12:00
Nicola Fontana
9c7306e575 DOCS rerun composer on undefined MODULE_FILTER (#7948) 2018-03-22 22:18:49 +01:00
Damian Mooyman
caefab774e Added 4.1.0 changelog 2018-03-14 10:16:31 +13:00
Damian Mooyman
b0c742b0a9 Added 4.1.0-rc2 changelog 2018-02-15 11:29:30 +13:00
Reece Alexander
833b600018 Update 4.1.0-rc1.md (#7859) 2018-02-13 10:07:23 +13:00
Daniel Hensby
7ec5fa2c8d
Merge branch '4.0' into 4.1 2018-02-09 15:19:15 +00:00
Daniel Hensby
e298fcc345
Merge branch '3.6' into 4.0 2018-02-09 14:32:58 +00:00
Damian Mooyman
7d1e3e1c72 Added 4.1.0-rc1 changelog 2018-02-07 16:07:32 +13:00
Damian Mooyman
e359948eb3
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Core/CoreKernel.php
 2018-02-05 17:52:38 +13: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
68952e2677
Remove security releases from 4.0.1 2018-01-25 14:40:07 +13:00
Damian Mooyman
bca47029c4
Merge remote-tracking branch 'origin/4.0' into 4 
# Conflicts:
#	src/Control/SimpleResourceURLGenerator.php
#	tests/php/Control/SimpleResourceURLGeneratorTest.php
 2018-01-25 12:53:15 +13:00
Damian Mooyman
c7e341c67d Added 4.0.2 changelog 2018-01-25 12:26:49 +13:00
Daniel Hensby
7f6af0f0ed
Merge branch '4.0' into 4 2018-01-16 10:28:24 +00:00
Daniel Hensby
9b30024d86
Merge branch '3.6' into 4.0 2018-01-16 10:26:21 +00:00
Damian Mooyman
bb37bc5491 Added 3.6.4 changelog 2018-01-16 16:40:43 +13:00