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
Nic
5cda017424
Update index.md to link to how-to's for 3 tutorials/recipies
2015-02-18 20:47:57 -06:00
Ingo Schommer
3b66b75f2f
Merge pull request #3889 from unclecheese/tutorial-deprecation
...
Several changes that deprecate the old written tutorials in favour of Lessons section
2015-02-19 14:49:30 +13:00
Damian Mooyman
1e5519cf1a
Reformat changelog
2015-02-19 13:16:40 +13:00
Damian Mooyman
f95c181c97
Merge remote-tracking branch 'origin/3.1.10' into 3.1
2015-02-19 12:57:12 +13:00
Damian Mooyman
c302edc4e7
Added 3.1.10 changelog
2015-02-19 12:37:16 +13:00
Daniel Hensby
8a405b50b0
Merge branch 'patch-3' of https://github.com/AntonyThorpe/silverstripe-framework into AntonyThorpe-patch-3
...
DOCS Error handling examples of different files closes #3701
Conflicts:
docs/en/topics/error-handling.md
2015-02-18 00:10:49 +00: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
Damian Mooyman
fab44dce75
Added 3.1.10-rc2 changelog
2015-02-17 18:05:16 +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
Damian Mooyman
9a97cbc255
Added 3.1.10-rc1 changelog
2015-02-16 16:39:01 +13:00
Cam Findlay
aa5c9ca246
DOCS Reference to ensure contributors read over the Code of conduct
2015-02-16 10:28:52 +13:00
Sean Harvey
cebc0d08c5
Merge pull request #3894 from tractorcow/pulls/3.1/encoding-fixes
...
BUG Lots of encoding fixes
2015-02-16 09:18:41 +13:00
Damian Mooyman
1db08bac88
BUG Fix FormAction title encoding
...
BUG Fix TreeMultiSelectField using the wrong label
BUG Fix encoding of selected title on TreeDropdownField
BUG Fix DataDifferencer trying to compare non-comparable fields (non-dbfield objects)
BUG: Fix issue with TreeMultiSelectField not saving
BUG: Fix issue with GridFieldPrintButton
ENHANCEMENT Instead of using multiple api calls to encode dbfield values, delegate this operation to the individual fields via forTemplate
Instead of using a new API to communicate html encoding to treeselect, just ensure all content is HTML encoded, and enable html_titles in jstree.
2015-02-13 15:50:45 +13:00
LiamW
36dbd4f8a1
Update 11_Scaffolding.md
...
Noticed the call to the tab is wrong.
2015-02-12 14:16:05 -05:00
Uncle Cheese
c88ddef477
add new lessons 9, 10
...
remove tutorials from home page
2015-02-13 00:48:05 +13:00
Uncle Cheese
9218919437
Several changes to deprecate old tutorials
2015-02-12 17:15:53 +13:00
gavin bruce
e96d40d391
Update 00_Partial_Caching.md
...
Spelling mistake fix.
2015-02-10 14:30:29 +10:00
Christopher Pitt
0a19d882d3
Update index.md
...
404 fix
2015-02-10 09:16:18 +13:00
Nick
a7be8003e0
Fix some broken links for flushable and errors in the caching code examples
2015-02-09 22:55:59 +13:00
Daniel Hensby
e906f48d8d
DOCS Updating contributing version
2015-02-07 14:36:21 +00:00
Daniel Hensby
74ec7e413f
DOCS Updating contributing version
2015-02-07 14:33:12 +00:00
Cam Findlay
9720b4939d
DOCS Fixed link on issues and bugs
2015-02-06 20:37:50 +13:00
unclecheese
647f921c08
MINOR: Add lesson 8
2015-02-05 16:25:07 +13:00
Mateusz U
60f4720415
Merge pull request #3852 from camfindlay/patch-19
...
DOCS Permanent link to speakup.io added in Code of Conduct
2015-02-05 09:46:58 +13:00
Cam Findlay
09da54a4bd
DOCS Permanent link to speakup.io added in Code of Conduct
...
As this is hosted on github pages and the custom domain setup was depricated (We may reinstate the original link later).
2015-02-05 09:43:42 +13:00
Sean Harvey
a4be52613a
Small fixes to code of conduct document.
2015-02-05 09:43:15 +13:00
Mateusz U
88eb303cd5
Merge pull request #3775 from camfindlay/codeofconduct
...
DOCS Code of conduct
2015-02-05 09:29:32 +13:00
Cam Findlay
972e20b0de
DOCS Code of conduct added
2015-02-05 09:24:10 +13:00
Daniel Hensby
1de32f93d8
Merge pull request #3848 from nfauchelle/patch-2
...
Update 04_Preview.md
2015-02-04 17:15:22 +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
Nick
9303912b7f
Update 04_Preview.md
...
Fix the yaml example
2015-02-04 22:15:49 +13: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
Christopher Bischoff
6c24d7dcef
Fix syntax error in code example
2015-02-03 11:11:51 +01:00
Christopher Bischoff
6bb6c8cde5
DOCS Fix formatting
2015-02-03 10:55:59 +01:00
Will Rossiter
5219cb0f6b
Merge pull request #3844 from marsvogel/patch-2
...
DOCS Fix formatting in Link-Section
2015-02-03 09:17:02 +13:00
Christopher Bischoff
104f6693d7
DOCS Fix formatting in Link-Section
2015-02-02 17:31:15 +01:00
Christopher Bischoff
56620ba0e3
DOCS Fix formatting
2015-02-02 17:20:05 +01:00
Marijn Kampf
eeef72e653
Fixed example to work when copied and pasted.
...
Original example gives: Fatal error: Using $this when not in object context in E:\localhost\abscreensavers.com\mysite\code\Page.php on line 19
2015-01-30 10:07:27 +00:00
Cam Findlay
21bb16f220
DOCS Fix composer reference
2015-01-29 13:06:23 +13:00
BeQ
92c6aa93fd
Update 10_Versioning.md
2015-01-24 18:24:02 -05:00
Cam Findlay
f346e0ae8c
DOCS Update introduction doc
...
Some broken links corrected
2015-01-24 22:49:34 +13:00
Nic
43d0ae6263
Update 11_Scaffolding.md to use dataFieldByName
2015-01-23 10:04:19 -06:00
Cam Findlay
0f617e1f5f
DOCS bulleted API calls show up as a broken code block
...
This simplifies the formatting to ensure it's actually readable on docs.
2015-01-23 19:58:54 +13:00
Anjana Wijesundara
376ce73390
mysite/code/Page.php to mysite/code/Product.php
...
"mysite/code/Page.php" line in Displaying Results Section should be "mysite/code/Product.php"
2015-01-22 22:28:13 +05:30
Will Rossiter
f733ca2759
Delete README.md
2015-01-22 15:39:26 +13:00