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
|
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
|
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
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|
Damian Mooyman
|
49acc0d468
|
Added 3.2.1-rc2 changelog
|
2015-11-13 15:27:08 +13:00 |
|
Damian Mooyman
|
245e0aae2f
|
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
|
2015-11-11 17:50:02 +13:00 |
|
Damian Mooyman
|
1c1c0a23bd
|
Added 3.2.1-rc1 changelog
|
2015-11-11 17:10:41 +13:00 |
|
Damian Mooyman
|
bc1b2893ac
|
[ss-2015-026]: BUG Fix FormField error messages not being encoded safely
|
2015-11-11 16:56:19 +13:00 |
|