Commit Graph

1802 Commits

Author SHA1 Message Date
Daniel Hensby
a9df28c791
Merge branch '3.4' into 3 2016-09-14 11:40:15 +01:00
Daniel Hensby
e3ac75febd
DOCS Reference composer docs for installation instructions 2016-09-12 17:04:20 +01:00
Daniel Hensby
3fd9fe3aa0
Merge branch '3.4' into 3 2016-09-07 09:22:06 +01:00
Ingo Schommer
1a8348900d Merge pull request #5899 from christopherdarling/patch-7
DOCS add missing commit af3412a to 3.4.1 changelog
2016-09-01 08:17:16 +12:00
Rob Ingram
a0d3ad1875 Change order of fixtures in example
* Make the document explicit about the definition of objects before they are referenced.
2016-08-24 07:37:55 +12:00
Daniel Hensby
060bf6b327
Merge branch '3.3' into 3.4 2016-08-22 16:22:37 +01: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
Christopher Darling
ef1d93c994 DOCS add missing commit af3412a to 3.4.1 changelog 2016-08-18 16:27:36 +01:00
Damian Mooyman
d88516203c Merge 3.4 into 3 2016-08-15 19:05:20 +12:00
Damian Mooyman
f4ba3cd175 Merge 3.3 into 3.4
# Conflicts:
#	security/ChangePasswordForm.php
#	templates/forms/OptionsetField.ss
2016-08-15 19:03:13 +12: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
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
7de5b998e1 Merge 3.4 into 3 2016-08-05 19:12:25 +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
Daniel Hensby
d083c9622a Merge pull request #4394 from simonwinter/patch-1
Update 05_Typography.md
2016-08-02 21:27:56 +01:00
Daniel Hensby
340a48306b
Merge branch '3.4' into 3 2016-07-20 19:48:17 +01:00
Daniel Hensby
cf247534d5
Merge branch '3.3' into 3.4 2016-07-20 19:43:41 +01:00
Damian Mooyman
319d6d293e BUG Fix doclink (#5827)
Fixes #5721
2016-07-20 10:12:42 +01:00
Daniel Hensby
b7fc0a2752 Merge pull request #5790 from patricknelson/issue-5784-email-reply-to
FIX for #5784: Email API improvements, documentation cleanup.
2016-07-15 00:23:25 +01:00
Patrick Nelson
74c555e004 FIX for #5784: Added ->setReplyTo(), deprecated ->replyTo() for API consistency. Revamping, fixing, and enhancing internal Email API documentation. Simplified code and brought up-to-date with latest standards. 2016-07-14 10:25:40 -07:00
Daniel Hensby
4c40cf8dbb
Merge branch '3.4' into 3 2016-07-14 12:01:19 +01:00
Daniel Hensby
d766c8559b
Merge branch '3.3' into 3.4 2016-07-14 11:57:15 +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
Daniel Hensby
3906228fc1
Merge branch '3.4' into 3 2016-07-11 21:14:21 +01:00
Daniel Hensby
f44c47eea1
Merge branch '3.3' into 3.4 2016-07-11 21:11:05 +01: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
Damian Mooyman
4dadc276b5 Merge pull request #3916 from dhensby/nfauchelle-gd-padding-improvementt
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color
2016-07-04 17:35:47 +12:00
Ironcheese
9b1a4b328c Moving a field between tabs, wrong variable name 2016-06-15 15:36:43 +02:00
Daniel Hensby
4e392a4d43
Merge branch '3.3' into 3.4 2016-06-13 12:30:16 +01:00
Nick
dae2295e16
NEW Allow the paddedresize to take another hex value to specify a transparency on the padded color 2016-06-05 00:05:37 +01:00
Damian Mooyman
8a99b4f74e Merge 3.4.0 into 3.4 2016-06-03 11:33:44 +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
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
Daniel Hensby
016d39c81e
Merge branch '3.3' into 3.4 2016-05-20 12:34:10 +01: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
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
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
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
Igor
5b691d1835 Minor: update docs for PR branch guidelines #5345 (#5365) 2016-05-16 12:34:43 +12:00
Damian Mooyman
7041c5945c API Enable requirements to persist between flushes 2016-05-12 12:46:30 +12: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
NightJar
89351e6c31 Fix the most egregious error for an NZ based proj. (#5416)
The Bay of Plenty Rugby team is the Steamers, and play in the NPC (National Provincial Championship), hailing from the Te Ika a Maui (North Island).
The Canterbury Crusaders (note the alliteration) hail from Te Waipounamu (South Island), and are an entry in the Super Rugby championship, which is an international affair (also known as the Super12, Super15 & most recently Super18), in which the Bay of Plenty is (most unfortunately, depending on your disposition) drafted under the Waikato region's entry with The Chiefs. Being the most popular sport and widely announced news topic in the country means that even people that don't particuarly follow rugby know this, and simple trolls (whether intentional or not) cannot be allowed to slide past quality control; for those that do can get quite upset about this kind of thing. Plus international folk can't be getting the wrong idea; Everyone knows the internet is no place for misinformation!
2016-04-29 12:07:25 +12: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
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
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