Daniel Hensby
|
6552dce70e
|
Merge branch '3.2' into 3.3
|
2016-11-28 13:26:31 +00:00 |
|
Daniel Hensby
|
214c3d2582
|
Merge branch '3.1' into 3.2
|
2016-11-28 13:16:27 +00:00 |
|
Dan Hensby
|
375df539eb
|
Added 3.3.4 changelog
|
2016-11-21 12:37:09 +00:00 |
|
Dan Hensby
|
4a82041061
|
Added 3.2.6 changelog
|
2016-11-18 15:14:42 +00:00 |
|
Dan Hensby
|
586e5281e0
|
Added 3.1.21 changelog
|
2016-11-18 12:17:03 +00:00 |
|
Daniel Hensby
|
088d88e978
|
Merge branch '3.2' into 3.3
|
2016-08-22 16:22:02 +01:00 |
|
Daniel Hensby
|
f4a6e9e517
|
Merge branch '3.1' into 3.2
|
2016-08-22 15:30:03 +01:00 |
|
Daniel Hensby
|
8e4e2b4fa8
|
Merge pull request #4173 from AntonyThorpe/patch-4
DOCS Update 06_Tabbed_Forms.md
|
2016-08-19 15:49:51 +01:00 |
|
Damian Mooyman
|
ebc0bafea9
|
Merge 3.2 into 3.3
|
2016-08-15 18:51:07 +12:00 |
|
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
|
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
|
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
|
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 |
|
Daniel Hensby
|
d083c9622a
|
Merge pull request #4394 from simonwinter/patch-1
Update 05_Typography.md
|
2016-08-02 21:27:56 +01:00 |
|
Damian Mooyman
|
319d6d293e
|
BUG Fix doclink (#5827)
Fixes #5721
|
2016-07-20 10:12:42 +01:00 |
|
Damian Mooyman
|
ce11c47d00
|
Merge pull request #5700 from Ironcheese/patch-1
Moving a field between tabs, wrong variable name
|
2016-07-12 13:58:54 +12:00 |
|
Robbie Averill
|
04a4d7937e
|
DOCS Update 02_Relations (#5785)
* Code formatting on some variable names
* Add example for removing scaffolded parent relation fields
|
2016-07-07 22:32:43 +01:00 |
|
Ironcheese
|
9b1a4b328c
|
Moving a field between tabs, wrong variable name
|
2016-06-15 15:36:43 +02:00 |
|
Michael Strong
|
db4dc64fb4
|
DOCS incorrect method referenced
ModelAdmin uses 'getDefaultSearchContext': http://api.silverstripe.org/3.3/source-class-ModelAdmin.html#173
|
2016-05-24 13:25:02 +12:00 |
|
Damian Mooyman
|
5df9cb05f3
|
Merge pull request #5551 from AntonyThorpe/patch-1
Updated 01_Data_Model_and_ORM.md for byID
|
2016-05-19 14:08:45 +12:00 |
|
Michael James
|
3870c499d6
|
DOCS Adding comma to array declaration (#5558)
|
2016-05-18 15:07:45 +01:00 |
|
Antony Thorpe
|
f12258427a
|
Updated 01_Data_Model_and_ORM.md for byID
According to the framework's API documentation 'byID' is a method of DataList not 'byId'. Both are used in the documentation.
|
2016-05-18 08:30:29 +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
|
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
|
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 |
|
Daniel Hensby
|
a6bd22ab2f
|
[SS-2016-006] FIX dont disable XSS for login forms
|
2016-04-20 23:57:59 +01:00 |
|