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

..

00_Model

Merge remote-tracking branch 'origin/3.1' into 3

2015-06-09 11:02:50 +12:00

01_Templates

Merge branch '3.1' into 3.2

2015-08-17 11:43:28 +01:00

02_Controllers

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-09-09 14:35:29 +12:00

03_Forms

API Support for multiple HTMLEditorConfig per page

2015-06-09 12:17:55 +12:00

04_Configuration

Update 01_SiteConfig.md

2015-03-18 11:25:26 +13:00

05_Extending

fixed typo in shortcode docs

2015-09-03 14:46:42 +02:00

06_Testing

Add warning on flush not being run automatically by unit test commands.

2015-08-28 13:00:22 +12:00

07_Debugging

DOCS: correct broken links

2015-02-27 16:09:15 -08:00

08_Performance

Correct Memcached config in example

2015-07-11 23:18:18 +12:00

09_Security

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-09-09 14:35:29 +12:00

10_Email

Review email documentation

2014-12-17 15:48:57 +13:00

11_Integration

Merge remote-tracking branch 'origin/3.1' into 3

2015-03-11 11:40:06 +13:00

12_Search

Merge remote-tracking branch 'origin/3.1' into 3.2

2015-07-31 11:38:18 +12:00

13_i18n

DOCS: correct broken links

2015-02-27 16:09:15 -08:00

14_Files

API New and renamed image functions

2015-06-12 17:02:55 -07:00

15_Customising_the_Admin_Interface

Merge branch '3.1' into 3.2

2015-07-20 10:48:01 +01:00

16_Execution_Pipeline

Update index.md

2015-06-13 11:08:25 +12:00

17_CLI

Rewrite and tidy up of performance section

2014-12-17 15:48:58 +13:00

18_Cookies_And_Sessions

Migrate 3.2 docs into new docs structure

2014-12-17 15:50:06 +13:00

index.md

Add introduction files to each of the sections

2014-12-17 15:48:54 +13:00