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
16,397 Commits 31 Branches 527 Tags 162 MiB
24ea2638fe
Commit Graph

225 Commits

Author SHA1 Message Date
Damian Mooyman
f3afd14e4f Merge 3.2 into 3.3 2016-08-15 18:47:43 +12:00
Damian Mooyman
8ec89be9d4 Merge 3.1 into 3.2 
# Conflicts:
#	forms/CheckboxSetField.php
#	forms/OptionsetField.php
#	security/Member.php
#	tests/forms/CheckboxSetFieldTest.php
 2016-08-15 18:46:26 +12:00
Damian Mooyman
1f06e6dd18 Added 3.4.1 changelog 2016-08-15 18:29:38 +12:00
Damian Mooyman
68986558c9 Added 3.3.3 changelog 2016-08-15 18:05:32 +12:00
Damian Mooyman
351bf6cfe4 Added 3.2.5 changelog 2016-08-15 17:22:23 +12:00
Damian Mooyman
6f60d2518b Added 3.1.20 changelog 2016-08-15 16:44:36 +12:00
Damian Mooyman
02000e5446 Added 3.4.1-rc2 changelog 2016-08-15 15:55:19 +12:00
Damian Mooyman
7c0669486a Added 3.3.3-rc2 changelog 2016-08-15 15:34:41 +12:00
Damian Mooyman
d83c678b6a Added 3.3.3-rc2 changelog 2016-08-15 15:07:26 +12:00
Damian Mooyman
1a03bdba7a Added 3.2.5-rc2 changelog 2016-08-15 14:17:41 +12:00
Damian Mooyman
b2a7170c64 Added 3.1.20-rc2 changelog 2016-08-15 13:41:31 +12:00
Damian Mooyman
2299b8e67a Added 3.4.1-rc1 changelog 2016-08-05 18:52:14 +12:00
Damian Mooyman
ca754eb887 Merge 3.3 into 3.4 
# Conflicts:
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/it.js
#	lang/cs.yml
#	lang/eo.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/it.yml
#	lang/sk.yml
 2016-08-05 16:48:26 +12:00
Damian Mooyman
958344eb5d Added 3.3.3-rc1 changelog 2016-08-05 16:33:22 +12:00
Damian Mooyman
0d5ae23f2b Merge 3.2 into 3.3 2016-08-05 14:36:35 +12:00
Damian Mooyman
6e6451fa71 Added 3.2.5-rc1 changelog 2016-08-05 13:24:35 +12:00
Damian Mooyman
cb39f2ef27 Merge 3.1 into 3.2 
# Conflicts:
#	admin/javascript/lang/cs.js
#	admin/javascript/lang/de.js
#	admin/javascript/lang/eo.js
#	admin/javascript/lang/es.js
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/fi.js
#	admin/javascript/lang/fr.js
#	admin/javascript/lang/id.js
#	admin/javascript/lang/id_ID.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/ja.js
#	admin/javascript/lang/lt.js
#	admin/javascript/lang/mi.js
#	admin/javascript/lang/nb.js
#	admin/javascript/lang/nl.js
#	admin/javascript/lang/pl.js
#	admin/javascript/lang/ro.js
#	admin/javascript/lang/ru.js
#	admin/javascript/lang/sk.js
#	admin/javascript/lang/sl.js
#	admin/javascript/lang/sr.js
#	admin/javascript/lang/sr@latin.js
#	admin/javascript/lang/sr_RS.js
#	admin/javascript/lang/sr_RS@latin.js
#	admin/javascript/lang/src/cs.js
#	admin/javascript/lang/src/de.js
#	admin/javascript/lang/src/eo.js
#	admin/javascript/lang/src/es.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/fi.js
#	admin/javascript/lang/src/fr.js
#	admin/javascript/lang/src/id.js
#	admin/javascript/lang/src/id_ID.js
#	admin/javascript/lang/src/it.js
#	admin/javascript/lang/src/ja.js
#	admin/javascript/lang/src/lt.js
#	admin/javascript/lang/src/mi.js
#	admin/javascript/lang/src/nb.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/src/pl.js
#	admin/javascript/lang/src/ro.js
#	admin/javascript/lang/src/ru.js
#	admin/javascript/lang/src/sk.js
#	admin/javascript/lang/src/sl.js
#	admin/javascript/lang/src/sr.js
#	admin/javascript/lang/src/sr@latin.js
#	admin/javascript/lang/src/sr_RS.js
#	admin/javascript/lang/src/sr_RS@latin.js
#	admin/javascript/lang/src/sv.js
#	admin/javascript/lang/src/zh.js
#	admin/javascript/lang/sv.js
#	admin/javascript/lang/zh.js
#	javascript/lang/fa_IR.js
#	javascript/lang/src/fa_IR.js
 2016-08-05 11:41:04 +12:00
Damian Mooyman
ec969c21e6 Added 3.1.20-rc1 changelog 2016-08-05 11:17:57 +12:00
Damian Mooyman
8008fcbe97 Update changelog 2016-06-03 10:59:29 +12:00
Damian Mooyman
3fbeab94c8 Added 3.4.0 changelog 2016-06-02 17:27:21 +12:00
Damian Mooyman
0d356d078d Add release notes to changelog 2016-05-19 15:27:07 +12:00
Damian Mooyman
b4e8c595f5 Added 3.4.0-rc1 changelog 2016-05-19 15:08:09 +12:00
Damian Mooyman
757cfae90c API Enable Debug.friendly_error_httpcode to correctly set HTTP status code for errors 2016-05-18 14:27:45 +12:00
Damian Mooyman
8ed25ae482 BUG Fix DataObject::isChanged() detecting non saveable changes (#5545) 2016-05-18 09:00:04 +10:00
Damian Mooyman
06f0f558d4 Merge remote-tracking branch 'origin/3.3' into 3 2016-05-11 15:38:40 +12:00
Damian Mooyman
5f82e40fd4 Remove stale commits from release notes 2016-05-11 15:37:31 +12:00
Damian Mooyman
d3f5c85403 Merge remote-tracking branch 'origin/3.2' into 3.3 2016-05-11 15:36:40 +12:00
Damian Mooyman
79602dc44d Remove stale commits from release notes 2016-05-11 15:34:32 +12:00
Damian Mooyman
4f06a43986 Merge 3.3 into 3 
# Conflicts:
#	admin/javascript/lang/src/cs.js
#	admin/javascript/lang/src/de.js
#	admin/javascript/lang/src/en.js
#	admin/javascript/lang/src/eo.js
#	admin/javascript/lang/src/es.js
#	admin/javascript/lang/src/fi.js
#	admin/javascript/lang/src/fr.js
#	admin/javascript/lang/src/id.js
#	admin/javascript/lang/src/id_ID.js
#	admin/javascript/lang/src/it.js
#	admin/javascript/lang/src/ja.js
#	admin/javascript/lang/src/lt.js
#	admin/javascript/lang/src/mi.js
#	admin/javascript/lang/src/nb.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/src/pl.js
#	admin/javascript/lang/src/ro.js
#	admin/javascript/lang/src/ru.js
#	admin/javascript/lang/src/sk.js
#	admin/javascript/lang/src/sl.js
#	admin/javascript/lang/src/sr.js
#	admin/javascript/lang/src/sr@latin.js
#	admin/javascript/lang/src/sr_RS.js
#	admin/javascript/lang/src/sr_RS@latin.js
#	admin/javascript/lang/src/sv.js
#	admin/javascript/lang/src/zh.js
#	javascript/lang/fr.js
#	javascript/lang/src/ar.js
#	javascript/lang/src/cs.js
#	javascript/lang/src/de.js
#	javascript/lang/src/en.js
#	javascript/lang/src/eo.js
#	javascript/lang/src/es.js
#	javascript/lang/src/fi.js
#	javascript/lang/src/fr.js
#	javascript/lang/src/id.js
#	javascript/lang/src/id_ID.js
#	javascript/lang/src/it.js
#	javascript/lang/src/ja.js
#	javascript/lang/src/lt.js
#	javascript/lang/src/mi.js
#	javascript/lang/src/nb.js
#	javascript/lang/src/nl.js
#	javascript/lang/src/pl.js
#	javascript/lang/src/ru.js
#	javascript/lang/src/sk.js
#	javascript/lang/src/sl.js
#	javascript/lang/src/sr.js
#	javascript/lang/src/sr@latin.js
#	javascript/lang/src/sr_RS.js
#	javascript/lang/src/sr_RS@latin.js
#	javascript/lang/src/sv.js
#	javascript/lang/src/zh.js
#	lang/it.yml
 2016-05-11 14:06:23 +12:00
Damian Mooyman
b165d52f30 Merge 3.2 into 3.3 2016-05-11 14:00:10 +12:00
Damian Mooyman
9da594b326 Merge 3.1 into 3.2 
# Conflicts:
#	admin/javascript/lang/cs.js
#	admin/javascript/lang/de.js
#	admin/javascript/lang/eo.js
#	admin/javascript/lang/es.js
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/fi.js
#	admin/javascript/lang/fr.js
#	admin/javascript/lang/id.js
#	admin/javascript/lang/id_ID.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/ja.js
#	admin/javascript/lang/lt.js
#	admin/javascript/lang/mi.js
#	admin/javascript/lang/nb.js
#	admin/javascript/lang/nl.js
#	admin/javascript/lang/pl.js
#	admin/javascript/lang/ro.js
#	admin/javascript/lang/ru.js
#	admin/javascript/lang/sk.js
#	admin/javascript/lang/sl.js
#	admin/javascript/lang/sr.js
#	admin/javascript/lang/sr@latin.js
#	admin/javascript/lang/sr_RS.js
#	admin/javascript/lang/sr_RS@latin.js
#	admin/javascript/lang/src/nl.js
#	admin/javascript/lang/sv.js
#	admin/javascript/lang/zh.js
#	javascript/lang/ar.js
#	javascript/lang/bg.js
#	javascript/lang/cs.js
#	javascript/lang/de.js
#	javascript/lang/eo.js
#	javascript/lang/es.js
#	javascript/lang/fa_IR.js
#	javascript/lang/fi.js
#	javascript/lang/fr.js
#	javascript/lang/id.js
#	javascript/lang/id_ID.js
#	javascript/lang/it.js
#	javascript/lang/ja.js
#	javascript/lang/lt.js
#	javascript/lang/mi.js
#	javascript/lang/nb.js
#	javascript/lang/nl.js
#	javascript/lang/pl.js
#	javascript/lang/ru.js
#	javascript/lang/sk.js
#	javascript/lang/sl.js
#	javascript/lang/sr.js
#	javascript/lang/sr@latin.js
#	javascript/lang/sr_RS.js
#	javascript/lang/sr_RS@latin.js
#	javascript/lang/sv.js
#	javascript/lang/zh.js
#	lang/nl.yml
#	lang/sk.yml
 2016-05-11 13:48:22 +12:00
Damian Mooyman
7693fc9504 Merge upgrading notes from 3.1.19 2016-05-11 13:42:41 +12:00
Damian Mooyman
18fcd68acf Merge up changes from 3.1.19 changelog 2016-05-11 13:41:02 +12:00
Damian Mooyman
de5949b3dd Added 3.3.2 changelog 2016-05-11 11:25:17 +12:00
Damian Mooyman
cfb3d96a03 Added 3.2.4 changelog 2016-05-11 11:24:49 +12:00
Damian Mooyman
68dca6f6c0 Added 3.1.19 changelog 2016-05-11 11:09:20 +12:00
Daniel Hensby
5eafdce963
Added 3.3.2-rc1 changelog 2016-05-05 13:38:46 +01:00
Daniel Hensby
d1751e3310
Merge remote-tracking branch '3.2.4' into 3.3.2 2016-05-05 12:33:21 +01:00
Daniel Hensby
73b922d43b
Added 3.2.4-rc1 changelog 2016-05-05 11:48:07 +01:00
Daniel Hensby
cf29b2c146
Merge remote-tracking branch '3.1.19' into 3.2.4 2016-05-05 11:17:45 +01:00
Daniel Hensby
ee5133f355
Added 3.1.19-rc1 changelog 2016-05-05 09:33:57 +01:00
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
a6bd22ab2f
[SS-2016-006] FIX dont disable XSS for login forms 2016-04-20 23:57:59 +01:00
Damian Mooyman
b8e7f9a934 Standardise spelling of "customise" 
Fixes #3988
 2016-03-30 13:17:28 +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
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
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
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
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
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
Damian Mooyman
6cd66a6b13 Added 3.2.2-rc2 changelog 2016-02-24 12:01:41 +13:00
Damian Mooyman
af28b0a414 Added 3.2.2-rc1 changelog 2016-02-19 11:22:10 +13:00
Damian Mooyman
f32302522c Added 3.1.17-rc1 changelog 2016-02-19 10:30:25 +13:00
Damian Mooyman
97089db8a6 Added 3.3.0-rc3 changelog 2016-02-18 17:29:18 +13:00
Damian Mooyman
d5b4c90cb4 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/css/screen.css
#	admin/css/screen.css.map
#	admin/scss/_fonts.scss
#	admin/scss/_retina.scss
 2016-02-09 18:25:47 +13:00
Damian Mooyman
96a905aa09 Update changelog 2016-02-09 18:07:11 +13:00
Damian Mooyman
f66e21c10d Added 3.3.0-rc2 changelog 2016-02-09 18:02:22 +13:00
Damian Mooyman
e091bb8474 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	tests/model/VersionedTest.yml
 2016-01-25 15:57:37 +13:00
Damian Mooyman
b4e76df531 Add upgrading notes to rc1 2016-01-25 15:35:42 +13:00
Damian Mooyman
5f511e5048 Added 3.3.0-rc1 changelog 2016-01-25 15:22:58 +13:00
Damian Mooyman
8c1cafd1a0 Merge remote-tracking branch 'origin/3.3' into 3 
# Conflicts:
#	admin/scss/_forms.scss
#	admin/scss/_style.scss
#	admin/scss/_tree.scss
#	javascript/TreeDropdownField.js
 2016-01-19 17:08:26 +13:00
Damian Mooyman
5d240feaec Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:24 +13:00
Damian Mooyman
46cbe809ac Merge remote-tracking branch 'origin/3.1' into 3.2 
# Conflicts:
#	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/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
#	docs/en/03_Upgrading/index.md
#	docs/en/05_Contributing/01_Code.md
#	forms/TreeMultiselectField.php
#	security/Permission.php
 2016-01-19 14:00:19 +13:00
David Alexander
45d2b57a65 DOCS 3.1 : typose and broken internal links 2016-01-15 16:39:23 +13:00
David Alexander
5c99e33eb2 DOCS 3.1 - fixes broken internal links 2016-01-14 23:59:53 +13:00
Sam Minnee
4aa50534d5 FIX: Fixes needed to adapt to whitespace changes. 
API: Whitespace trimmed from custom form field templates

The introduction of trailing newlines on all template files introduced
some changes that needed to be made.

Notably, whitespace has been trimmed from rendered form field templates.
This is the minimal impact to SilverStripe developers, as it preserves
the behaviour of the default field types, but I’ve still noted as a
change.
 2016-01-07 14:17:57 +13:00
Christopher Darling
ef4a75ad43 DOCS: fixed 3.2.0 changelog DataList code sample 2015-12-23 13:13:32 +00:00
Damian Mooyman
5507ce89c6 Copy upgrade notes from 3.3.0.md 2015-12-23 14:12:02 +13:00
Damian Mooyman
70bb3d92c7 Added 3.3.0-beta1 changelog 2015-12-23 13:38:55 +13:00
Damian Mooyman
48a30909f3 Merge remote-tracking branch 'origin/3.2' into 3 
# Conflicts:
#	admin/javascript/LeftAndMain.BatchActions.js
#	css/UploadField.css
#	forms/HtmlEditorField.php
 2015-12-22 14:07:52 +13:00
Damian Mooyman
22d8105a56 Add changelog for 3.3.0 2015-12-10 17:48:06 +13:00
Damian Mooyman
302c741b07 Merge remote-tracking branch 'origin/3.1' into 3.2 
Conflicts:
	control/HTTP.php
	forms/Form.php
	tests/view/SSViewerTest.php
 2015-11-16 16:50:40 +13:00
Damian Mooyman
0178fa5a18 Added 3.2.1 changelog 2015-11-16 16:17:10 +13:00
Damian Mooyman
2e6469956f Add 3.1.16-rc1 changelog 2015-11-16 15:20:30 +13:00
Damian Mooyman
615b2d5563 Added 3.1.16 changelog 2015-11-16 15:16:49 +13:00
Damian Mooyman
c19420f545 Add 3.2.1-rc2 changelog 2015-11-13 15:32:09 +13:00