Damian Mooyman
88fdc75456
Merge remote-tracking branch 'composer/3.1' into 3
...
Conflicts:
.editorconfig
docs/en/00_Getting_Started/00_Server_Requirements.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
docs/en/00_Getting_Started/04_Directory_Structure.md
docs/en/00_Getting_Started/index.md
docs/en/01_Tutorials/01_Building_A_Basic_Site.md
docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
docs/en/01_Tutorials/03_Forms.md
docs/en/01_Tutorials/04_Site_Search.md
docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
docs/en/01_Tutorials/index.md
docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
docs/en/02_Developer_Guides/01_Templates/06_Themes.md
docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
docs/en/02_Developer_Guides/05_Extending/05_Injector.md
docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
docs/en/02_Developer_Guides/10_Email/index.md
docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
docs/en/02_Developer_Guides/14_Files/index.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
docs/en/04_Changelogs/3.1.9.md
docs/en/05_Contributing/00_Issues_and_Bugs.md
docs/en/05_Contributing/02_Release_Process.md
docs/en/05_Contributing/03_Documentation.md
filesystem/File.php
filesystem/GD.php
model/DataDifferencer.php
model/Versioned.php
security/BasicAuth.php
security/Member.php
tests/filesystem/FileTest.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/VersionedTest.php
tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
Cam Findlay
3239cfd495
DOCS - fix reported broken links by zippy in IRC
2015-01-14 08:59:55 +13:00
Michael Strong
a02adf6854
FIX Uneccessary class replacement
...
Overly complex code example.
2015-01-08 20:53:45 +13:00
OliBridgman
95be3593ea
Update 01_Data_Model_and_ORM.md
...
Couple of grammatical errors.
2015-01-04 23:32:19 +13:00
Zomxilla
8e9f1d48c6
Remove trailing "###"
...
Incorrect markdown
2014-12-22 13:00:51 +13:00
Cam Findlay
606d5667cf
DOCS Make links relative so they work nicely on github and docs site.
2014-12-18 12:11:57 +13:00
Cam Findlay
66d0fcc11c
Migrate 3.2 docs into new docs structure
2014-12-17 15:50:06 +13:00
Cam Findlay
c358ac6496
FIX How to folder on forms
2014-12-17 15:50:06 +13:00
Cam Findlay
bdb3b7f085
FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about.
2014-12-17 15:50:06 +13:00
Stevie Mayhew
6d0cd49d6d
MINOR: spelling mistake
2014-12-17 15:50:06 +13:00
Cam Findlay
afc8db7e33
Rebased on 3.1 and added missing site reports doc
2014-12-17 15:50:06 +13:00
Ingo Schommer
11c1563778
Docs for exec pipeline and manifests
...
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it less obvious
2014-12-17 15:50:05 +13:00
Will Rossiter
e743fedc65
Importing cookie content
2014-12-17 15:50:05 +13:00
Cam Findlay
4d0448c254
Tutorials review and update image path
2014-12-17 15:50:05 +13:00
Will Rossiter
e729131a63
Move CMS Howtos
2014-12-17 15:50:05 +13:00
Uncle Cheese
fe62a2fa79
developer guides, templates review
2014-12-17 15:50:05 +13:00
Will Rossiter
ff91f99522
Add brief highlevel docs on cookie / session
2014-12-17 15:50:05 +13:00
Will Rossiter
fe96fc581d
Clean up search documentation
2014-12-17 15:50:01 +13:00
Uncle Cheese
f83c8f0821
developer guides / models
2014-12-17 15:49:27 +13:00
Will Rossiter
e448fb9434
Model guide documentation
2014-12-17 15:49:24 +13:00
Will Rossiter
e65b3ad3fb
Review and clean up of extending section
2014-12-17 15:49:08 +13:00
Cam Findlay
1df3d7cee1
Rebased additional documentation since May 2014.
...
New pages filed and metadata added.
2014-12-17 15:48:58 +13:00
Will Rossiter
48f53b98a1
Rewrite, tidy and format of Forms documentation
2014-12-17 15:48:58 +13:00
Will Rossiter
b4d8dfc9ee
Controller documentation
2014-12-17 15:48:58 +13:00
Will Rossiter
bbfc03ad51
Review and tidy up of configuration guide
2014-12-17 15:48:58 +13:00
Will Rossiter
627cc520d9
Rewrite and tidy up of performance section
2014-12-17 15:48:58 +13:00
Will Rossiter
576f34a539
Review and rewrites for Testing Developer Guide
2014-12-17 15:48:58 +13:00
Will Rossiter
4fcbc9a402
Clean up debugging documentation
2014-12-17 15:48:57 +13:00
Will Rossiter
7fc6110a6f
Tidy up templates guide
2014-12-17 15:48:57 +13:00
Will Rossiter
c54dee5452
Review email documentation
2014-12-17 15:48:57 +13:00
Will Rossiter
3d8c9232e0
Review, cleanup and refresh of integration section
2014-12-17 15:48:57 +13:00
Will Rossiter
0c73768e8c
Review, clean up of CLI documentation
2014-12-17 15:48:57 +13:00
Will Rossiter
084286af4c
Add introduction files to each of the sections
2014-12-17 15:48:54 +13:00
Will Rossiter
1ceb10be4a
Update documentation introduction
2014-12-17 15:48:41 +13:00
Will Rossiter
6c5ddaf054
Restructure of the docs markdown source files into more logical taxonomy
2014-12-17 15:48:35 +13:00
Cam Findlay
e11876c183
Migrate 3.2 docs into new docs structure
2014-12-16 11:01:17 +13:00
Cam Findlay
1f7e627a50
FIX How to folder on forms
2014-12-16 11:01:17 +13:00
Cam Findlay
ddd83304ce
FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about.
2014-12-16 11:01:16 +13:00
Stevie Mayhew
df68e5e287
MINOR: spelling mistake
2014-12-16 11:01:16 +13:00
Cam Findlay
fa9728a0c3
Rebased on 3.1 and added missing site reports doc
2014-12-16 11:01:16 +13:00
Ingo Schommer
f499bf7bf4
Docs for exec pipeline and manifests
...
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it less obvious
2014-12-16 11:01:16 +13:00
Will Rossiter
7dbb2ecaea
Importing cookie content
2014-12-16 11:01:16 +13:00
Cam Findlay
7261687c4c
Tutorials review and update image path
2014-12-16 11:01:16 +13:00
Will Rossiter
c0b09a5c36
Move CMS Howtos
2014-12-16 11:01:15 +13:00
Uncle Cheese
59dcd4d181
developer guides, templates review
2014-12-16 11:01:15 +13:00
Will Rossiter
71cbcd4920
Add brief highlevel docs on cookie / session
2014-12-16 11:01:15 +13:00
Will Rossiter
548cbfad8b
Clean up search documentation
2014-12-16 11:01:15 +13:00
Uncle Cheese
09be3352a0
developer guides / models
2014-12-16 11:01:15 +13:00
Will Rossiter
30a85be38e
Model guide documentation
2014-12-16 11:01:15 +13:00
Will Rossiter
19259e0497
Review and clean up of extending section
2014-12-16 11:01:15 +13:00
Cam Findlay
ce02d01274
Rebased additional documentation since May 2014.
...
New pages filed and metadata added.
2014-12-16 11:01:15 +13:00
Will Rossiter
9fbbf6d88a
Rewrite, tidy and format of Forms documentation
2014-12-16 11:01:14 +13:00
Will Rossiter
82b1b3d566
Controller documentation
2014-12-16 11:01:14 +13:00
Will Rossiter
5eca844c8d
Review and tidy up of configuration guide
2014-12-16 11:01:14 +13:00
Will Rossiter
cd1769c393
Rewrite and tidy up of performance section
2014-12-16 11:01:14 +13:00
Will Rossiter
e1ba55ac05
Review and rewrites for Testing Developer Guide
2014-12-16 11:01:14 +13:00
Will Rossiter
b57b3ff454
Clean up debugging documentation
2014-12-16 11:01:14 +13:00
Will Rossiter
2f25f33249
Tidy up templates guide
2014-12-16 11:01:14 +13:00
Will Rossiter
31a1e2f639
Review email documentation
2014-12-16 11:01:14 +13:00
Will Rossiter
a08bd9c12f
Review, cleanup and refresh of integration section
2014-12-16 11:01:14 +13:00
Will Rossiter
397843a49f
Review, clean up of CLI documentation
2014-12-16 11:01:13 +13:00
Will Rossiter
a506dfd42a
Add introduction files to each of the sections
2014-12-16 11:01:13 +13:00
Will Rossiter
45a0ab3cd0
Update documentation introduction
2014-12-16 11:01:13 +13:00
Will Rossiter
8e8c5d716d
Restructure of the docs markdown source files into more logical taxonomy
2014-12-16 11:01:12 +13:00
Cam Findlay
658216237e
FIX How to folder on forms
2014-12-15 14:49:46 +13:00
Cam Findlay
3ac705f4b3
FIX: Feedback to name the fields section to "field types" to make it clearer what the section is about.
2014-12-15 09:12:48 +13:00
Stevie Mayhew
34c812131d
MINOR: spelling mistake
2014-12-15 09:12:48 +13:00
Cam Findlay
987fde2bed
Rebased on 3.1 and added missing site reports doc
2014-12-15 09:12:48 +13:00
Ingo Schommer
7e0276b8ad
Docs for exec pipeline and manifests
...
- Added manifest logic docs
- More obvious pointers to flushing
- Removed Director page since it duplicated a lot of information already presenting in routing,
which in itself is already duplicated between routing.md and controllers.md.
- Merged Director execution rundown into main exec pipeline docs
- Moved YAML security note from main installation docs to "secure coding", making it sless obvious
2014-12-15 09:12:48 +13:00
Will Rossiter
304f89bd12
Importing cookie content
2014-12-15 09:12:48 +13:00
Cam Findlay
cdae3fadea
Tutorials review and update image path
2014-12-15 09:12:48 +13:00
Will Rossiter
d01c8d7990
Move CMS Howtos
2014-12-15 09:12:47 +13:00
Uncle Cheese
b7daa8d1ee
developer guides, templates review
2014-12-15 09:12:47 +13:00
Will Rossiter
ae4d61eefb
Add brief highlevel docs on cookie / session
2014-12-15 09:12:47 +13:00
Will Rossiter
a7971d0540
Clean up search documentation
2014-12-15 09:12:47 +13:00
Uncle Cheese
c1c0ad3dac
developer guides / models
2014-12-15 09:12:47 +13:00
Will Rossiter
699b999f1e
Model guide documentation
2014-12-15 09:12:47 +13:00
Will Rossiter
918baf1ca3
Review and clean up of extending section
2014-12-15 09:12:47 +13:00
Cam Findlay
b7272e09c6
Rebased additional documentation since May 2014.
...
New pages filed and metadata added.
2014-12-15 09:12:47 +13:00
Will Rossiter
86812c0937
Rewrite, tidy and format of Forms documentation
2014-12-15 09:12:47 +13:00
Will Rossiter
30cf733948
Controller documentation
2014-12-15 09:12:46 +13:00
Will Rossiter
1d31611e7e
Review and tidy up of configuration guide
2014-12-15 09:12:46 +13:00
Will Rossiter
f4dad25af0
Rewrite and tidy up of performance section
2014-12-15 09:12:46 +13:00
Will Rossiter
549531798f
Review and rewrites for Testing Developer Guide
2014-12-15 09:12:46 +13:00
Will Rossiter
ebf28bc66b
Clean up debugging documentation
2014-12-15 09:12:46 +13:00
Will Rossiter
fc952ef1e8
Tidy up templates guide
2014-12-15 09:12:46 +13:00
Will Rossiter
720ff48d28
Review email documentation
2014-12-15 09:12:45 +13:00
Will Rossiter
7458b10b6d
Review, cleanup and refresh of integration section
2014-12-15 09:12:45 +13:00
Will Rossiter
65309fa5d4
Review, clean up of CLI documentation
2014-12-15 09:12:45 +13:00
Will Rossiter
d52b475cfb
Add introduction files to each of the sections
2014-12-15 09:12:45 +13:00
Will Rossiter
85f3beee2c
Update documentation introduction
2014-12-15 09:12:45 +13:00
Will Rossiter
e9d88dd8ee
Restructure of the docs markdown source files into more logical taxonomy.
...
Rebased on 3.1
2014-12-15 09:12:44 +13:00
