tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
14,941 Commits 31 Branches 527 Tags 162 MiB
8368ead424
Commit Graph

1522 Commits

Author SHA1 Message Date
Sam Minnée
2fa6f27073 Removed Mateusz from core committer list. 
Mateusz has decided to step down from the core committers group.
 2015-06-08 22:28:29 +12:00
Damian Mooyman
a72bd16f42 API Deprecate delete in favour of archive 
Remove "delete from live" duplicate action in favour of existing "unpublish" which is more consistent with current terminology
Add pop-up verification to destructive actions
Fix bug in reporting publishing of error pages
Restoring a page also restores parents
 2015-06-03 14:24:27 +12:00
Daniel Hensby
d3b7abb0b5 Merge pull request #4242 from jonom/docs-database-defaults 
DOCS: Added default value examples
 2015-06-02 18:01:06 +01:00
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
Damian Mooyman
0319f7855b FIX Incorrect env setting in 3.1.13 2015-06-02 12:27:08 +12:00
Ingo Schommer
f3c722d508 Merge pull request #4195 from oddnoc/phpunit-version 
DOC: Correct composer invocation to install phpunit
 2015-06-01 15:00:55 +12:00
Jonathon Menz
12e26407ef DOCS: Added default value examples 2015-05-29 14:27:22 -07:00
Fred Condo
9efc384582 Add defense against SS-2015-013 to nginx example 2015-05-28 17:00:33 -07:00
Loz Calver
8a74dc3e0f Merge pull request #4237 from silverstripe/docs-fix-caption-field-name 
updated field name for caption text field.
 2015-05-28 14:28:36 +01:00
Will Morgan
9324cc916c Merge pull request #4224 from camfindlay/patch-25 
DOCS Fix link to common subclasses of form fields
 2015-05-28 13:41:02 +01:00
Will Morgan
e930bcf7b9 Merge pull request #4225 from camfindlay/patch-26 
DOCS Fix issue with bullets and backticks thinking they are code blocks
 2015-05-28 13:39:36 +01:00
Myles Beardsmore
06730bc1b3 updated field name for caption text field. 2015-05-28 13:34:59 +01:00
Damian Mooyman
50e33b8e5e Merge remote-tracking branch 'origin/3.1.13' into 3.1 2015-05-28 19:08:12 +12:00
Damian Mooyman
04b803dfc6 Added 3.1.13 changelog 2015-05-28 18:59:11 +12:00
Marcus Nyeholt
9c8fa51321 FIX Allow users to specify allowed hosts 
Allow users to explicitly state which Hosts are allowed to be requested via
this application instance to avoid Host: header forgery attacks.
 2015-05-28 15:58:39 +10:00
Michal Kleiner
4843913f31 Update 03_Requirements.md 
Fixed code example for setting write_js_to_body value to false
 2015-05-28 14:28:05 +12:00
Damian Mooyman
75137dbab2 Ensure only trusted proxy servers have control over certain HTTP headers 2015-05-28 10:12:46 +12:00
Cam Findlay
15ea4aa54c DOCS Fix issue with bullets and backticks thinking they are code blocks 
Thanks to @stojg for reporting.
 2015-05-23 17:58:51 +12:00
Cam Findlay
058a08f84f DOCS Fix link to common subclasses of form fields 2015-05-23 17:30:09 +12:00
Steve Dixon
63eb6c2a24 Template Syntax doco grammar cleanup 
Some simple edits to improve some grammatical mistakes and consistency.
 2015-05-21 12:56:26 +10:00
Fred Condo
84b78a86bf Remove references to installing PHPUnit 
It is now provided automatically via composer. Also, replace the section
about installing PHPUnit with a slightly expanded section on
conveniently invoking phpunit.
 2015-05-19 09:24:09 -07:00
Matt Thomson
07b9cdc8bb DOCS: Add links to lessons 10-16 to the tutorials page 2015-05-19 15:48:56 +12:00
Matt Thomson
f5a72783a8 Fix 404 errors on all lesson links 2015-05-19 14:05:12 +12:00
Damian Mooyman
c1d500dedc Added 3.1.13-rc1 changelog 2015-05-14 14:34:09 +12:00
Stevie Mayhew
9e8a5c9ba5 FIX: remove validation type constraint from form fields for 3.2 release 2015-05-11 12:32:00 +12:00
Marijn Kampf
18fb548fd2 Fix link 2015-05-05 12:13:08 +01:00
Florian Thoma
045b2c569a fix typo 
customise instead of customize
 2015-05-03 13:35:05 +10:00
Stevie Mayhew
0d94cf15a5 UPDATE: change all instances of $this->request to use appropriate getter/setter 2015-04-30 11:04:08 +12:00
Antony Thorpe
b90432cb26 Update 03_Authentication.md 
Create a list to improve presentation on the silverstripe.org website.  Hopefully this works.  The API descriptions/links are currently missing.
 2015-04-26 18:16:13 +12:00
Will Morgan
959b326147 Merge pull request #4098 from phillprice/patch-10 
DOCS: formatting fix
 2015-04-25 11:46:47 +01:00
Antony Thorpe
c010cb4cec Update 04_GridField.md docs for typo 
Variable name should be $grid, as defined when creating the GridField just above.  Thanks.
 2015-04-25 18:04:40 +12:00
David Craig
3122226273 Add toggleable description to CMS fields 2015-04-24 11:40:29 +12:00
Phill Price
996ddea4a9 DOCS: formatting fix 
the end # removed from titles as they were showing on the page.
 2015-04-23 17:12:49 +01:00
Antony Thorpe
27d3a27a97 Update 03_Testing_Email.md 
Fix typo and link.  It is assertEmailSent not assertEmailSend and a method of SapphireTest.  Thanks.
 2015-04-21 18:17:56 +12:00
Sean Harvey
78e01c07ac Merge pull request #4064 from chillu/pulls/osx-install-docs 
Improved install docs (Vagrant, Homebrew, MAMP)
 2015-04-20 10:14:16 +12:00
spekulatius
9567d9c3f2 Update 01_Validation.md 
missing semicolon
 2015-04-19 20:21:49 +12:00
Steve D
0d7d6b4bd3 Improve SQL Format information paragraph 
Improve SQL Format information paragraph in the SilverStripe Coding Conventions
 2015-04-15 13:08:39 +10:00
Will Rossiter
da6dbeca5f Merge pull request #4014 from jedateach/patch-5 
DOC broken link in docs to how_tos/extend_cms_interface
 2015-04-15 12:27:56 +12:00
Ingo Schommer
9ab61e9e95 Merge pull request #4069 from camfindlay/patch-24 
DOCS Make a note to ensure people install Git and Composer
 2015-04-14 08:10:46 +12:00
Cam Findlay
0d44ea1af1 DOCS Make a note to ensure people install Git and Composer 
Since Composer uses git and this isn't explicitly documented anywhere at our end I have added a note and link for newcomers to follow and get Git before getting Composer.
 2015-04-13 13:28:13 +12:00
Sean Harvey
2a16b5e2a3 Fixing spelling mistake 2015-04-13 11:35:24 +12:00
Ingo Schommer
602fdd57fd Removed outdated IIS6 instructions 
Not linked from anywhere (other than the menu).
IIS 6.0 is part of Windows 2003, which has been EOLed as far as I can tell:
https://support.microsoft.com/en-us/lifecycle?p1=3198
 2015-04-09 21:52:56 +12:00
Ingo Schommer
711efc4542 More install options (Vagrant and Bitnami) 2015-04-09 21:52:56 +12:00
Ingo Schommer
b633b584f6 Simplified base installation step docs 
Mention composer there rather than just the package download.
 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
Damian Mooyman
e91606e494 API Introduce $FromEnd variable for iterators 2015-04-09 17:02:30 +12:00
Elliot Sawyer
83a3c4b166 Update 01_Extensions.md 
Fix a typo
 2015-04-02 15:51:51 +13:00
Turnerj
ae8dbe309b FEATURE - Added maximum upload file size by type 
This support is on both an instance level and a global default level.
 2015-03-31 21:57:32 +10:30
Damian Mooyman
43f49e8434 Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	admin/code/ModelAdmin.php
	control/Director.php
	model/SQLQuery.php
	security/Member.php
	tests/control/HTTPTest.php
	tests/model/SQLQueryTest.php
	tests/security/SecurityTest.php
	tests/view/SSViewerTest.php
 2015-03-31 19:54:15 +13:00
ehyland
77a51c79ab Updated example code 
Made class extend FunctionalTest.
 2015-03-30 16:59:31 +11:00
jeffreyguo
92a73b83cf DOCS Update 12_Indexes.md 
Fixing grammar mistakes
 2015-03-23 10:15:33 +00:00
Marijn Kampf
91bdb5b530 Missing ; in example 2015-03-23 09:31:51 +00:00
Damian Mooyman
ffcbeb5812 Added 3.1.12 changelog 2015-03-20 19:29:20 +13:00
jeffreyguo
e0627c7148 Update 01_Data_Model_and_ORM.md 2015-03-19 21:19:11 +00:00
Damian Mooyman
0754f2eed2 Merge remote-tracking branch 'origin/3.1.11' into 3.1 2015-03-19 17:55:53 +13:00
Damian Mooyman
b3364150f9 Added 3.1.11 changelog 2015-03-19 17:46:36 +13:00
jeffreyguo
bdba2c2e41 Update 01_SiteConfig.md 
MINOR: wording errors
 2015-03-18 11:25:26 +13:00
Jeremy Shipman
f2b1fa9aed FIX: broken link in docs to how_tos/extend_cms_interface 
I'm not certain this fixes the issue, as I haven't tested it. It at least points it out.
 2015-03-16 09:55:33 +13:00
Loz Calver
203f77116b Fixes, tests and documentation for multiple many_manys between the same class 2015-03-13 09:27:23 +00:00
jeffreyguo
8a82f05014 Update 01_Introduction.md 
MINOR: wording and format correction
 2015-03-12 14:40:18 +13:00
jeffreyguo
09026d92bc Update Dynamic_Default_Fields.md 
MINOR: fixing grammar mistakes.
 2015-03-11 16:27:56 +13:00
jeffreyguo
c6a499a1c1 Update 01_Data_Model_and_ORM.md 
Line#15: removed "is" in "Database Columns are is defined"
Line#404: changed "17 or 74" to "17 or 43" according to line #409
 2015-03-11 14:48:21 +13:00
Damian Mooyman
319b96b48b Merge remote-tracking branch 'origin/3.1' into 3 
Conflicts:
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/05_Contributing/01_Code.md
	forms/TreeDropdownField.php
	model/DataObject.php
	security/Member.php
	tests/model/DataObjectTest.php
 2015-03-11 11:40:06 +13:00
Daniel Hensby
791a846fbf Merge pull request #3989 from wernerkrauss/patch-1 
Update 00_Partial_Caching.md
 2015-03-10 11:06:40 +00:00
Daniel Hensby
fcf0e8980a Merge pull request #3919 from unclecheese/patch-8 
MINOR: Remove children from Tutorials landing page. Deprecated.
 2015-03-09 12:02:19 +00:00
wernerkrauss
fbe0592ef9 Update 00_Partial_Caching.md 
Adding $ for variable names and quoted parameters as discussed with @kinglozzer on IRC
 2015-03-09 12:50:05 +01:00
Loz Calver
81c1e36305 Merge pull request #3972 from dhensby/pulls/3690-reapply 
DOCS SS_ERROR_LOG reuqires relative location to BASE_PATH
 2015-03-09 11:36:29 +00:00
Daniel Hensby
ef818b3b7b Merge pull request #3970 from tractorcow/pulls/3.2/api-zero-pagination 
API enable PaginatedList to be disabled by setting page length to 0
 2015-03-09 11:28:36 +00:00
Damian Mooyman
7bf4d2e95e Added 3.1.11-rc1 changelog 2015-03-09 18:55:23 +13:00
Damian Mooyman
872d05fd1b Added 3.1.11-rc1 changelog 2015-03-09 18:28:50 +13:00
Ingo Schommer
45fcdc672a Merge pull request #3983 from dhensby/pulls/gender-neutral-docs 
Making docs gender agnostic
 2015-03-08 22:57:40 +13:00
Fred Condo
bd5f5232fa DOCS: Correct & expand routing docs 
- Correct syntax error in TeamController sample code
- Explain mandatory use case of $url_handlers
- Provide sample code for mandatory use case of $url_handlers
 2015-03-07 13:25:44 -08:00
Daniel Hensby
d2a3da2203 Making docs gender agnostic 2015-03-07 12:32:04 +00:00
Corey Sewell
2742f46b79 Added "Composer managed modules, Git and .gitignore" section to Getting Started/02 Composer 2015-03-06 10:28:07 +13:00
Corey Sewell
f924354e12 Remove incorrect L flag for Basic Auth RewriteRule 
As per the installer [.htaccess](https://github.com/silverstripe/silverstripe-installer/blob/3.1/.htaccess#L37) the RewriteRule to enable Basic Auth when using CGI/FastCGI with Apache does not have the L flag.
 2015-03-06 07:36:43 +13:00
Daniel Hensby
96b1583aae DOCS SS_ERROR_LOG reuqires relative location to BASE_PATH 2015-03-05 12:07:56 +00:00
Damian Mooyman
9367fd2456 API enable PaginatedList to be disabled by setting page length to 0 2015-03-05 12:07:14 +13:00
Daniel Hensby
028a80b153 DOCS Adding GitHub labels 2015-03-03 17:24:02 +00:00
Fred Condo
82ed86f6cd DOCS: correct broken links 
- Correct internal links between documentation pages
- Delete defunct links to documentation removed during documentation reorganization
- Restore testing glossary
- Verify by crawling site locally
 2015-02-27 16:09:15 -08:00
Michael Strong
4c5a07ecec FIX Updated docs 
The docs as they were would break websites and no warning was given regarding the security around doing this.
 2015-02-27 17:00:46 +13:00
Damian Mooyman
773624a40b Merge pull request #3947 from camfindlay/docs/uploadfield 
DOCS Reinstate a missing upload field doc and give a review.
 2015-02-26 17:51:01 +13:00
Cam Findlay
8146943a00 DOCS Reinstate a missing upload field doc and give a review. 2015-02-26 15:17:05 +13:00
Jeremy Shipman
39fac21fb9 Explain the module specific themes separation capability of Silverstripe 
Relates to #3944
 2015-02-26 12:56:33 +13:00
johndalangin
5eb5cc7cca YML Config Not Compatible with Requirements Class 
After hours of trying to debug why `write_js_to_bottom` wasn't working, I realized that the Requirements class variables were set to `protected` and not `private static` which I believe is necessary for the Config YML variables to be passed correctly to the class.

The documentation was edited to reflect the working, albeit traditional non-YML method of setting class variables.

Best regards,

John
 2015-02-24 00:58:31 +08:00
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
unclecheese
2af48738c9 MINOR: Remove children from Tutorials landing page. Deprecated. 2015-02-19 17:20:45 +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
Will Rossiter
a1ffaac9e3 Merge pull request #3809 from camfindlay/docchangelogfix 
DOCS Fix missing changelogs
 2015-01-22 15:32:37 +13:00
unclecheese
686e072301 Add two new video tutorials 2015-01-22 09:42:02 +13:00
Cam Findlay
037c3a1847 DOCS Fix missing changelogs 2015-01-22 08:40:33 +13:00
Will Rossiter
315d6b6e2c Merge pull request #3806 from MichaelCSLWeb/patch-3 
Update 01_Image.md
 2015-01-21 16:52:22 +13:00
Cam Findlay
3de82ce8dc DOCS Fixed link to yaml config docs. 2015-01-21 15:27:22 +13:00
Michael
e571b52a27 Update 01_Image.md 
Ive added this to show you can change the color of the padding area
 2015-01-20 14:23:53 +00:00
Hamish Friedlander
9e4c0c6663 Merge pull request #3790 from ProzacJellybeans/patch-1 
Extending site - RSS correction
 2015-01-16 12:53:53 +13:00
ProzacJellybeans
8b1aa5f1d7 Extending site - RSS correction 
Rewrote the reason as to why the website needs to be flushed more frequently
 2015-01-16 11:45:44 +13:00
Damian Mooyman
33b18ce998 Fix merge error 2015-01-15 18:56:09 +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
Damian Mooyman
50d80e5854 Merge remote-tracking branch 'origin/3.1.9' into 3.1 2015-01-15 13:24:34 +13:00
Damian Mooyman
87d6250ea7 Reword upgrading notes 2015-01-15 11:56:46 +13:00
Damian Mooyman
7b20f775f2 Updated changelog 2015-01-15 11:45:41 +13:00
Loz Calver
c18bf6222b Merge pull request #3788 from camfindlay/zippylinkfix 
DOCS - fix reported broken links
 2015-01-14 09:33:26 +00:00
scott1702
bca4024ee8 DOCS Minor spelling error 
Fixed a minor spelling error in tutorial 2.
 2015-01-14 16:57:54 +13:00