282 Commits

Author	SHA1	Message	Date
Daniel Hensby	efd8114fd5	Merge branch '3.4' into 3.5	2016-12-16 15:52:53 +00:00
Myles Derham	18ff6bec6d	Updated location of custom field templates	2016-12-16 10:40:01 +13:00
Daniel Hensby	0a835c6fe7	Merge branch '3.4' into 3	2016-11-03 13:27:31 +00:00
Jono Menz	fdfd0c4fc3	DOCS Remove duped content (#6214) ... D.R.Y.	2016-11-01 17:56:32 +13:00
Daniel Hensby	3859a1d7e7	Merge branch '3.4' into 3	2016-10-27 16:16:04 +01:00
Matthew Hailwood	7778357b03	Switch Mandrill recommendation to sparkpost. (#6196) ... Now that Mandrill has become a paid part of Campaign Monitor it makes sense for us to recommend the free alternative SparkPost. The package I've linked to is by the same author as the original Mandrill package.	2016-10-25 13:26:56 +13:00
Nicola Fontana	4d327f81fd	DOCS Specify that the selectors change the scope (#6213) ... Follow up of issue #4015.	2016-10-21 09:15:27 -07:00
Jonathon Menz	d2c0b98bc5	DOCS Clarify nested cache block restrictions ... Fixes #6078	2016-10-13 14:52:41 -07:00
Jonathon Menz	646d34ec48	DOCS Non-extendable classes ... Closes #6129	2016-10-13 09:39:46 -07:00
Jonathon Menz	bfdac2b7b6	DOCS Template debugging	2016-10-13 09:39:10 -07:00
Jonathon Menz	e9a75a54d9	DOCS Partial caching of relationships ... Fixes #6177	2016-10-13 09:38:49 -07:00
Jonathon Menz	a893e2aa0f	DOCS How to increase partial cache expiry ... Closes #3649	2016-10-13 09:37:52 -07:00
Jonathon Menz	24f8f2715c	DOCS Introduce TemplateGlobalProvider	2016-10-03 09:36:47 -07:00
jeffreyguo	801574b9b0	Update index.md (#4020) ... MINOR: wording correction	2016-09-29 13:21:17 +13:00
Daniel Hensby	6022012481	Merge branch '3.4' into 3	2016-09-23 16:33:45 +01:00
Jason Irish	dcc51ec479	Docs - sort by random instructions ... Added instructions for sorting per database type. `RAND()` throws errors in PostgreSQL and SQLite	2016-09-20 14:16:22 -05:00
Daniel Hensby	f25b88b146	showqueries debugging tool now inserts parameters in place (#5885)	2016-09-15 09:15:19 +12:00
Daniel Hensby	3fd9fe3aa0	Merge branch '3.4' into 3	2016-09-07 09:22:06 +01: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
Damian Mooyman	7de5b998e1	Merge 3.4 into 3	2016-08-05 19:12:25 +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	0d5ae23f2b	Merge 3.2 into 3.3	2016-08-05 14:36: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
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	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
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	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	7041c5945c	API Enable requirements to persist between flushes	2016-05-12 12:46:30 +12: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	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
Michael Strong	1f820b0b1c	DOCS allowed_actions access control (#5333)	2016-04-18 17:49:30 +12:00