Ingo Schommer 72a284c9b8 Merge remote-tracking branch 'origin/3' ...

Conflicts:
	core/Constants.php
	docs/en/05_Contributing/01_Code.md
	tests/model/SQLQueryTest.php

2015-04-09 16:26:16 +12:00

..

00_Model

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

2015-03-31 19:54:15 +13:00

01_Templates

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

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

02_Controllers

Update 01_Introduction.md

2015-03-12 14:40:18 +13:00

03_Forms

FEATURE - Added maximum upload file size by type

2015-03-31 21:57:32 +10:30

04_Configuration

Update 01_SiteConfig.md

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

05_Extending

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

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

06_Testing

Updated example code

2015-03-30 16:59:31 +11:00

07_Debugging

DOCS: correct broken links

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

08_Performance

Update 00_Partial_Caching.md

2015-03-09 12:50:05 +01:00

09_Security

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

2015-03-11 11:40:06 +13: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

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

13_i18n

DOCS: correct broken links

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

14_Files

DOCS: correct broken links

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

15_Customising_the_Admin_Interface

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

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

16_Execution_Pipeline

DOCS: correct broken links

2015-02-27 16:09:15 -08: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