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
15,575 Commits 31 Branches 527 Tags 162 MiB
b9e5a198e8
Commit Graph

1669 Commits

Author SHA1 Message Date
Daniel Hensby
679185514d
Merge 3.3 into 3 
Conflicts:
	admin/css/screen.css.map
 2016-04-26 00:24:59 +01:00
Daniel Hensby
745faebd81
Merge 3.2 into 3.3 
Conflicts:
	.travis.yml
 2016-04-26 00:17:09 +01:00
Daniel Hensby
a0812f987a
Merge 3.1 into 3.2 
Conflicts:
	admin/javascript/LeftAndMain.js
	control/HTTPRequest.php
	docs/en/00_Getting_Started/00_Server_Requirements.md
 2016-04-26 00:09:33 +01:00
Sam Minnee
82a89a94f4 Add 2 new committers, remove 1 who has left. 2016-04-19 23:05:59 +12:00
Michael Strong
1f820b0b1c DOCS allowed_actions access control (#5333) 2016-04-18 17:49:30 +12:00
Patrick Nelson
49e6d701e5 Removal of FlushGeneratedImagesTask was not documented. 
This task appears to have been superseded by a new task called `RegenerateCachedImagesTask` but it was not documented, so `FlushGeneratedImagesTask` simply appeared to have vanished. This will update the documentation to reflect this change for both v3.2 and v3.3 (separate PR).
 2016-04-05 15:09:46 -07:00
Damian Mooyman
b8e7f9a934 Standardise spelling of "customise" 
Fixes #3988
 2016-03-30 13:17:28 +13:00
Garion
c59cd1e598 Update Extend_CMS_Interface.md 
Add missing `private` declaration.
 2016-03-20 13:08:23 +13:00
Garion
47179fc808 Update Extend_CMS_Interface.md 
Resurfaces details on actually creating the required handlers for custom buttons in the CMS, which were detailed in a [past version of the docs](https://github.com/silverstripe-droptables/sapphire/blob/side-by-side/docs/en/howto/extend-cms-interface.md#extending-the-cms-actions).
 2016-03-10 01:02:28 +13:00
Cam Findlay
14044fff35 DOCS Added a useful code example around positioning of tabs in CMS. 
This useful example wasn't in the docs when I needed it. I ended up tracking this information down at http://stackoverflow.com/questions/5033028/silverstripe-how-do-i-insert-a-tab-before-another-tab

It should really be in the docs.
 2016-03-08 16:18:49 +13:00
Ingo Schommer
466ed29f0e Merge remote-tracking branch 'origin/3.3' into 3 2016-03-04 14:55:08 +13:00
Ingo Schommer
3c53da0890 Merge remote-tracking branch 'origin/3.2' into 3.3 2016-03-04 14:05:06 +13:00
Daniel Hensby
b8c8875303 DOCS Explicitly noting lack of PHP 7 support 2016-03-01 10:14:14 +00:00
Damian Mooyman
22c0025d47 Improve documentation on documentation 2016-03-01 12:18:11 +13:00
Damian Mooyman
7312692a09 Merge branch '3.3' into 3 2016-02-29 17:30:20 +13:00
Damian Mooyman
393a4788bf Merge branch '3.2' into 3.3 2016-02-29 17:29:41 +13:00
Damian Mooyman
f7d49df258 Merge tag '3.2.3' into 3.2 
Release 3.2.3

# Conflicts:
#	lang/cs.yml
 2016-02-29 17:27:00 +13:00
Damian Mooyman
ee6c08a0e4 Merge remote-tracking branch 'origin/3.3' into 3 2016-02-29 17:16:13 +13:00
Damian Mooyman
24a6c53645 Merge branch '3.2' into 3.3 
# Conflicts:
#	admin/code/ModelAdmin.php
#	lang/cs.yml
#	lang/lt.yml
#	lang/sk.yml
 2016-02-29 17:03:22 +13:00
Damian Mooyman
4fbf0b0863 Merge remote-tracking branch 'origin/3.3.1' into 3.3 2016-02-29 17:01:26 +13:00
Damian Mooyman
2c1f837442 Merge branch '3.1' into 3.2 
# Conflicts:
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
#	docs/en/02_Developer_Guides/00_Model/10_Versioning.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
#	docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/14_Files/index.md
#	lang/cs.yml
#	lang/fi.yml
#	lang/sk.yml
 2016-02-29 16:59:20 +13:00
Damian Mooyman
71bf14d590 Merge remote-tracking branch 'origin/3.1.18' into 3.1 2016-02-29 16:49:25 +13:00
Damian Mooyman
fb58233201 Added 3.3.1 changelog 2016-02-29 15:23:25 +13:00
Damian Mooyman
9050761f17 Added 3.2.3 changelog 2016-02-29 15:22:39 +13:00
Damian Mooyman
2147205dc1 Added 3.1.18 changelog 2016-02-29 15:10:05 +13:00
Damian Mooyman
2b26511faa Merge branch '3.3' into 3 2016-02-27 21:20:15 +13:00
Damian Mooyman
8a8d82cc57 Merge branch '3.3.1' into 3.3 
# Conflicts:
#	lang/cs.yml
 2016-02-27 21:19:29 +13:00
Damian Mooyman
14aa497b80 Merge branch '3.2.3' into 3.2 2016-02-27 21:11:57 +13:00
Damian Mooyman
807377ad2d Added 3.3.1-rc2 changelog 2016-02-27 21:02:09 +13:00
Damian Mooyman
3d2c87029c Added 3.3.1-rc2 changelog 2016-02-27 21:01:57 +13:00
Damian Mooyman
3c053bb85d Added 3.2.3-rc2 changelog 2016-02-27 21:00:59 +13:00
Damian Mooyman
3f5c635353 Added 3.2.3-rc2 changelog 2016-02-27 21:00:46 +13:00
Damian Mooyman
cd05068814 Merge branch '3.1.18' into 3.1 2016-02-27 20:59:51 +13:00
Damian Mooyman
b77acaeeb7 Added 3.1.18-rc2 changelog 2016-02-27 20:53:23 +13:00
Damian Mooyman
9d9a6fc0e8 Added 3.1.18-rc2 changelog 2016-02-27 20:53:15 +13:00
Damian Mooyman
d27be2b325 Merge branch '3.3' into 3 
# Conflicts:
#	javascript/GridField.js
 2016-02-26 17:45:06 +13:00
Damian Mooyman
a2c7524b85 Merge branch '3.1.18' into 3.1 2016-02-26 17:39:06 +13:00
Damian Mooyman
73780ce94e Merge branch '3.2.3' into 3.2 2016-02-26 17:36:45 +13:00
Damian Mooyman
ae29576763 Merge branch '3.3.1' into 3.3 2016-02-26 17:35:42 +13:00
Damian Mooyman
a80c6e1e8c Added 3.3.1-rc1 changelog 2016-02-26 17:30:07 +13:00
Damian Mooyman
8c12b6f992 Added 3.2.3-rc1 changelog 2016-02-26 17:25:00 +13:00
Damian Mooyman
9e0037d43e Added 3.1.18-rc1 changelog 2016-02-26 17:13:49 +13:00
Damian Mooyman
9fed5561f4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	core/Constants.php
#	dev/DevelopmentAdmin.php
 2016-02-24 17:39:04 +13:00
Damian Mooyman
5f2d3f31d7 Merge remote-tracking branch 'origin/3.2' into 3.3 
# Conflicts:
#	dev/DevelopmentAdmin.php
#	docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
#	lang/cs.yml
#	lang/lt.yml
 2016-02-24 17:29:06 +13:00
Damian Mooyman
ff5ed6efeb Merge remote-tracking branch 'origin/3.2.2' into 3.2 2016-02-24 17:03:43 +13:00
Damian Mooyman
06d5050321 Merge remote-tracking branch 'origin/3.1.17' into 3.1 2016-02-24 16:54:18 +13:00
Damian Mooyman
0ec021dac8 Added 3.3.0 changelog 2016-02-24 16:30:34 +13:00
Damian Mooyman
531b8b167b Added 3.2.2 changelog 2016-02-24 15:33:02 +13:00
Damian Mooyman
1fe7d029db Added 3.1.17 changelog 2016-02-24 15:31:12 +13:00
Damian Mooyman
9a4f0b48df Added 3.1.17-rc2 changelog 2016-02-24 12:38:54 +13:00