Damian Mooyman
8331171f2c
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
.scrutinizer.yml
admin/javascript/LeftAndMain.Panel.js
core/startup/ParameterConfirmationToken.php
dev/Debug.php
dev/FixtureBlueprint.php
docs/en/00_Getting_Started/05_Coding_Conventions.md
docs/en/00_Getting_Started/index.md
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
filesystem/File.php
filesystem/Folder.php
forms/FieldList.php
forms/LabelField.php
forms/MoneyField.php
forms/TextField.php
forms/TreeDropdownField.php
forms/Validator.php
forms/gridfield/GridField.php
forms/gridfield/GridFieldExportButton.php
lang/de.yml
lang/fi.yml
model/DataObject.php
model/SQLQuery.php
parsers/ShortcodeParser.php
security/ChangePasswordForm.php
security/Security.php
tests/control/DirectorTest.php
tests/core/startup/ParameterConfirmationTokenTest.php
tests/dev/FixtureBlueprintTest.php
tests/forms/FieldListTest.php
tests/forms/MoneyFieldTest.php
tests/model/SQLQueryTest.php
tests/security/SecurityTest.php
2015-06-02 19:13:38 +12:00
Ingo Schommer
711efc4542
More install options (Vagrant and Bitnami)
2015-04-09 21:52:56 +12:00
Ingo Schommer
27727df096
Updated MAMP install docs, added Homebrew install docs
...
* Removed the `php.ini` configuration bits from both MAMP and Homebrew instructions, both actually come with reasonable defaults now (high `memory_limit`, `error_reporting` on full, `date.timezone` set).
* Removed chapter about package install, we should favour composer now
* Compressed the install wizard instructions
2015-04-09 21:52:53 +12: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
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
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
