204 Commits

Author	SHA1	Message	Date
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	5c99e33eb2	DOCS 3.1 - fixes broken internal links	2016-01-14 23:59:53 +13:00
Damian Mooyman	3c55608075	Merge pull request #4892 from camfindlay/patch-37 ... DOCS FIX typo for i18n	2016-01-06 15:18:51 +13:00
Peter Thaleikis	4366000a9f	fixing examples ... PSR-2 style for examples	2016-01-06 12:28:26 +13:00
Cam Findlay	7b77380df5	DOCS FIX typo for i18n ... Was causing a number of 404 crawl errors.	2016-01-06 09:11:23 +13:00
Gordon Anderson	f61cedc03c	Update to 00_Unit_Testing ... Additional section with instructions on running tests using in memory SQLite,	2015-12-30 13:29:32 +07:00
Damian Mooyman	d63441623a	Merge pull request #4612 from johndalangin/patch-4 ... Added cookie_secure configuration directive	2015-12-22 16:36:05 +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
Hamish Friedlander	1eda9151a4	Merge pull request #4831 from open-sausages/pulls/3/fix-versioned-canview ... API Create default security permission model for versioned data objects	2015-12-09 14:17:27 +13:00
Damian Mooyman	6089a7c5bd	API Create default security permission model for versioned data objects	2015-12-09 11:33:53 +13:00
Peter Thaleikis	7db7140a70	fixing example	2015-12-04 11:14:02 +13:00
Marcus Nyeholt	f7c270a3ba	NEW Use Config for determining Vary header ... Existing implementation hardcodes the Vary header; swap to using Config layer instead Added test for changing the variable from config	2015-12-02 10:28:24 +11:00
muskie9	fc3b06dbf9	DOCS update LinkingModes description	2015-11-23 14:10:47 -06:00
Daniel Hensby	572945a2fd	Merge pull request #4704 from spekulatius/patch-1 ... fixing syntax error	2015-11-23 14:18:50 +00:00
Hamish Friedlander	b61d6dcd57	[ss-2015-027]: FIX HtmlEditorField_Toolbar#viewfile not whitelisting URLs	2015-11-13 15:20:09 +13:00
Daniel Hensby	583cbdd77f	Merge pull request #4756 from camfindlay/patch-34 ... DOCS Suggest a tool to help people generate their change logs for mod…	2015-11-10 07:50:11 +00:00
Cam Findlay	218049f5c0	DOCS Suggesting a convention for CMS user documentation so CMS users don't get lost in dev docs.	2015-11-10 11:59:38 +13:00
Cam Findlay	c7b2f88d4e	DOCS Suggest a tool to help people generate their change logs for modules.	2015-11-10 11:50:53 +13:00
Damian Mooyman	c4dc10b255	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: forms/DropdownField.php tests/model/ImageTest.php	2015-11-03 13:06:39 +13:00
Damian Mooyman	e07f80014c	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: lang/cs.yml lang/sk.yml	2015-11-03 11:10:46 +13:00
Ed Linklater	cacbbd75bc	DOCS: jQuery delegation in Admin interface	2015-11-01 05:46:13 +13:00
Michael Parkhill	e44f22c6b2	Fix broken link to DataObject api	2015-10-28 11:52:35 +13:00
Christopher Darling	a1e343629b	DOCS: correct config setting for custom editor.css ... see a964e7636e/admin/code/LeftAndMain.php (L287-L308)	2015-10-26 11:02:47 +00:00
Peter Thaleikis	791c52c6bd	fixing syntax error	2015-10-25 22:41:13 +13:00
David Alexander	e88032a7aa	DOCS : spelling	2015-10-23 13:49:03 +13:00
Cam Findlay	a555817d6f	DOCS Module standard 1.0 ... Adding the module standard to 3.2+ docs.	2015-10-19 11:44:31 +13:00
Daniel Hensby	fa878b1e1f	Merge pull request #4642 from hailwood/patch-1 ... DOCS Remove extra set of li's	2015-10-03 10:28:50 +01:00
Matthew Hailwood	5e68512e1c	Remove extra set of li's	2015-09-30 14:19:20 +13:00
Liam Whittle	71a2ef1350	fixed minor GridField initialization syntax.	2015-09-29 18:51:08 -04:00
Peter Thaleikis	7ca97cd86d	Update 01_Extensions.md ... adding missing space	2015-09-20 15:15:54 +12:00
johndalangin	23d0f51592	Added cookie_secure configuration directive ... Seeing that cookie_secure is not yet added to the documentation, I took the liberty to add it myself. Thanks and hope this helps!	2015-09-17 15:53:58 +08:00
Damian Mooyman	f10785350e	Merge remote-tracking branch 'origin/3.2' into 3 ... Conflicts: docs/en/02_Developer_Guides/02_Controllers/01_Introduction.md	2015-09-09 14:50:47 +12:00
Damian Mooyman	309ac0d196	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: .travis.yml admin/code/CMSProfileController.php admin/tests/LeftAndMainTest.php control/HTTP.php security/Permission.php tests/forms/FormTest.php tests/model/ArrayListTest.php tests/security/PermissionTest.php	2015-09-09 14:35:29 +12:00
johndalangin	1b661c9f17	Typo Correction	2015-09-07 17:08:49 +08:00
Matthias Schelling	f43c528a0d	fixed typo in shortcode docs	2015-09-03 14:46:42 +02:00
Sam Minnée	f4b7cd3f68	Merge pull request #4500 from stevie-mayhew/pulls/get-response ... FEATURE: implement getter and setter usage for response	2015-08-29 15:35:55 +12:00
Stevie Mayhew	1b57e0ca5b	FEATURE: implement getter and setter usage for response	2015-08-29 10:24:06 +12:00
Sean Harvey	03d2fc73c5	Add warning on flush not being run automatically by unit test commands.	2015-08-28 13:00:22 +12:00
Daniel Hensby	209bb94319	DOCS Adding docs for special Permission cases	2015-08-26 23:32:07 +01:00
Damian Mooyman	1686c83826	Revert #3425 #3396 to restore deprecated functionality ... Fixes #4514	2015-08-24 11:26:25 +12:00
Daniel Hensby	a8ab5a468d	Merge branch '3.1' into 3.2 ... Conflicts: admin/code/LeftAndMain.php composer.json	2015-08-17 11:43:28 +01:00
David Alexander	44680d175c	Spelling	2015-08-05 21:34:35 +12:00
Cam Findlay	ea16aca74b	DOCS create() makes objects not classes. ... Thanks to Matthew at Cabbage Tree Creative for reporting.	2015-08-03 12:50:24 +12:00
Damian Mooyman	7ee444e08a	Merge remote-tracking branch 'origin/3.1' into 3.2 ... Conflicts: admin/code/LeftAndMain.php control/injector/SilverStripeServiceConfigurationLocator.php core/ClassInfo.php filesystem/File.php model/DataObject.php model/DataQuery.php search/filters/FulltextFilter.php search/filters/SearchFilter.php tests/core/ClassInfoTest.php tests/filesystem/FileTest.php tests/model/DataListTest.php	2015-07-31 11:38:18 +12:00
Sam Minnée	532bf6ccb9	Merge pull request #3554 from tractorcow/pr/3179 ... FIX: FulltextFilter did not work and was not usable	2015-07-22 11:29:57 +12:00
Daniel Hensby	ca8d0f2818	Merge branch '3.1' into 3.2 ... Conflicts: dev/Debug.php docs/en/05_Contributing/01_Code.md forms/FormField.php i18n/i18nTextCollector.php model/DataQuery.php	2015-07-20 10:48:01 +01:00
Daniel Hensby	55a60e86f0	Merge pull request #4401 from marijnkampf/patch-3 ... DOCS Fixed type in code example	2015-07-15 17:27:27 +01:00
Marijn Kampf	bc66bca187	Fixed type	2015-07-15 15:36:33 +01:00
Marijn Kampf	218d3f1486	Fixed type in code example	2015-07-15 15:36:19 +01:00