Damian Mooyman
dff65867cc
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
control/HTTP.php
control/HTTPResponse.php
docs/en/05_Contributing/01_Code.md
forms/CompositeField.php
forms/FormAction.php
forms/FormField.php
forms/InlineFormAction.php
forms/NumericField.php
forms/TreeDropdownField.php
forms/TreeMultiselectField.php
templates/forms/TreeDropdownField.ss
tests/core/CoreTest.php
tests/forms/NumericFieldTest.php
tests/model/DataDifferencerTest.php
2015-02-20 10:17:19 +13:00
Cam Findlay
666075d56c
DOCS Mention the mod_dir changes to Windows WAMP users
...
WAMP Server likely comes with Apache 2.4 so is very relevant to have this instruction available as a troubleshoot.
2015-02-18 11:34:03 +13:00
Daniel Hensby
3d9b57ca9e
Merge pull request #3905 from muskie9/patch-3
...
DOCS Update Common Problems with mod_rewrite issue
2015-02-17 22:32:39 +00:00
muskie9
4ccb0bc858
Update Common Problems with mod_rewrite issue
2015-02-17 16:28:02 -06:00
Cam Findlay
0fd6b8eaca
DOCS Mention the option of Environment files for WAMP users
...
Once you get a few sites under your belt most devs would likely turn to using environment files to names DB credentials. This introduces this a bit earlier to get them used to the simple idea of an environment file.
Eventually I'd like to rewrite the installer to generate this over storing in the _config.php.
2015-02-18 11:13:02 +13:00
Daniel Hensby
3573075de0
DOCS Removing redundant PHP syntax declaration
2015-02-16 13:59:49 +00:00
Daniel Hensby
5d35650cbb
DOCS Removing redundant PHP syntax declaration
2015-02-16 13:58:57 +00:00
Loz Calver
add010e383
Merge pull request #3776 from camfindlay/osxcomposerdocs
...
Add installation steps for Composer
2015-02-04 09:17:15 +00:00
kkirsche
7bd00916fd
DOCS Add installation steps for Composer
...
Added installation steps for Composer using the global installation of PHP and the MAMP installation of PHP.
Note that the use of HTML instead of standard Markdown was due to Markdown incorrectly handling nested ordered lists. This wasn't my preference, but I felt having consistent and clear styling of sub menus overrode ease of use as plain-text.
2015-02-04 09:35:34 +13:00
Cam Findlay
21bb16f220
DOCS Fix composer reference
2015-01-29 13:06:23 +13:00
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
Cam Findlay
e114301c7d
DOCS Updating links in getting started index
...
This index had some older links which have been updated.
2015-01-05 15:28:29 +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
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
Cam Findlay
4d0448c254
Tutorials review and update image path
2014-12-17 15:50:05 +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
084286af4c
Add introduction files to each of the sections
2014-12-17 15:48:54 +13:00
Will Rossiter
6c5ddaf054
Restructure of the docs markdown source files into more logical taxonomy
2014-12-17 15:48:35 +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
Cam Findlay
cdae3fadea
Tutorials review and update image path
2014-12-15 09:12:48 +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
d52b475cfb
Add introduction files to each of the sections
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
