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,017 Commits 31 Branches 527 Tags 162 MiB
6d2665d687
Commit Graph

2576 Commits

Author SHA1 Message Date
Stephan
710bc683fd
Removed SS_CONFIGSTATICMANIFEST 2018-09-10 16:10:35 +02:00
Robbie Averill
1ad2d6535e Merge branch '4.0' into 4.1 2018-08-15 13:22:46 +12:00
Scott Hutchinson
3bd2cbf199 DOCS indentation on pagination guide [ci skip] 
For all those copy + paste fiends
 2018-08-14 15:36:52 +12: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
Robbie Averill
87159ea820
Merge pull request #7949 from martinduparc/patch-7 
Use LimitWordCount instead of LimitWordCountXML
 2018-06-19 21:36:36 +12:00
Damian Mooyman
9f764f4ec3 Added 4.1.2 changelog 2018-06-19 17:06:01 +12:00
Fred Condo
6d12deb4b9 Update nginx sample configuration for 4.1 
- Remove unneeded denials (due to public folder)
- Add caveats about public folder, error pages, and HTTPS
 2018-06-11 09:32:40 -04: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
Damian Mooyman
299131ed22 [ss-2018-012] File security documentation 2018-05-14 17:16:36 +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
DorsetDigital
67fbaf3423
Update 06_Themes.md 
Remove reference to theme picker in settings page which was removed in SS4
 2018-04-13 12:12:55 +01:00
Daniel Hensby
773511a6c3
Merge branch '4.0' into 4.1 2018-03-28 11:18:08 +01:00
Nicola Fontana
9c7306e575 DOCS rerun composer on undefined MODULE_FILTER (#7948) 2018-03-22 22:18:49 +01:00
Martin D
2653bb0388
DOCS Use LimitWordCount instead of LimitWordCountXML 2018-03-22 18:15:11 +00:00
Loz Calver
cd6923965c DOCS: fix memcached example (closes #7934) 2018-03-16 16:30:48 +00:00
Damian Mooyman
caefab774e Added 4.1.0 changelog 2018-03-14 10:16:31 +13:00
Damian Mooyman
625f7b4eee
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-03-13 14:26:18 +13:00
Daniel Hensby
da5e73c115
Merge pull request #7918 from silverstripe-terraformers/pulls/updated-docs 
Updated docs for Rate Limiting.
 2018-03-09 10:52:12 +00:00
Christopher Darling
278f19068e
DOCS add missing trailing ; in code block 2018-03-08 20:41:11 +00:00
cpenny
fdbf4c2134 Updated docs for Rate Limiting. 2018-03-09 08:15:11 +13:00
Daniel Hensby
ade88ef0ea
DOCS update email docs to use correct config syntax 2018-02-23 11:49:13 +00:00
Daniel Hensby
c04ff8c55a
Merge branch '4.0' into 4.1 2018-02-21 13:40:30 +00:00
Fred Condo
2f2390be59 DOCS: remove backticks from Markdown link 
Markdown does not render links within backticks.
 2018-02-20 16:54:18 -08:00
Damian Mooyman
b0c742b0a9 Added 4.1.0-rc2 changelog 2018-02-15 11:29:30 +13:00
Damian Mooyman
e809c0fd62
Merge remote-tracking branch 'origin/4.0' into 4.1 2018-02-15 09:27:51 +13:00
Christopher Joe
f2b82b1f77 Fix docs for configuring before/after a specific config file 2018-02-13 16:31:51 +13:00
Reece Alexander
833b600018 Update 4.1.0-rc1.md (#7859) 2018-02-13 10:07:23 +13:00
Daniel Hensby
2fb2caba06
Merge branch '4.0' into 4.1 2018-02-12 10:24:30 +00:00
Martin Portevin
90f77a7134
Removed bad quote 2018-02-10 03:05:59 +01: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
Daniel Hensby
09f88c76cf
Merge pull request #7812 from oddnoc/configure-nginx-ss4 
DOCS: Update nginx configuration for SilverStripe 4
 2018-02-08 11:45:32 +00:00
Fred Condo
6976d09bba
Correct location block for SS4 
SS4 uses /index.php so the location block and documentation need to also
use that.
 2018-02-08 10:40:25 +00:00
Damian Mooyman
7d1e3e1c72 Added 4.1.0-rc1 changelog 2018-02-07 16:07:32 +13:00