Will Morgan
bec7799957
Merge pull request #4345 from phillprice/patch-11
...
DOCS: Link to member custom code change is broken
2015-06-26 09:11:04 +01:00
Cam Findlay
bee638eb6a
DOCS Missing closing perenthesis
2015-06-26 15:36:49 +12:00
Phill Price
1bbcde908a
Broken link in using custom code for tracking member logging
2015-06-25 14:20:42 +01:00
David Alexander
fda2ad6600
DOCS: Corrected version of master in line 22.
2015-06-24 21:07:32 +12:00
Will Morgan
21e45eed60
Merge pull request #4339 from SpiritLevel/patch-7
...
DOCS: typos, rewording, updated links.
2015-06-23 09:28:13 +01:00
David Alexander
71c2729aeb
DOCS: typos, rewording, updated links.
2015-06-23 14:30:41 +12:00
David Alexander
2125afb2f5
DOCS: fixed broken link
2015-06-23 11:57:54 +12:00
Cam Findlay
449ee6296c
DOCS Remove duplicate core committers doc after forward port of branches for 3.2 beta1 release
2015-06-22 11:35:58 +12:00
David Alexander
c4583d4fb9
Update 01_Code.md
...
Updated link.
2015-06-21 12:23:40 +12:00
Daniel Hensby
a94103245d
DOCS Bump PHP version in Server Requirements
2015-06-20 11:32:29 +01:00
David Alexander
305801d015
Update 07_Code_of_conduct.md
...
Typos, grammar, rewording.
2015-06-20 16:52:46 +12:00
Damian Mooyman
9cccfec1a0
Added 3.2.0-beta1 changelog
2015-06-19 19:22:38 +12:00
Damian Mooyman
1d122803cc
Merge remote-tracking branch 'origin/3.1' into 3.2
...
Conflicts:
dev/SapphireTest.php
docs/en/02_Developer_Guides/01_Templates/01_Syntax.md
forms/DatetimeField.php
forms/NullableField.php
forms/NumericField.php
forms/gridfield/GridField.php
tests/control/DirectorTest.php
tests/model/DataObjectSchemaGenerationTest.php
tests/model/MySQLDatabaseTest.php
2015-06-19 10:48:07 +12:00
David Alexander
f6d60ca946
Update 02_Release_Process.md
...
Updated: deprecated API's removed only in MAJOR releases.
2015-06-19 07:51:16 +12:00
Daniel Hensby
4dec821f63
Merge pull request #4297 from SpiritLevel/patch-2
...
DOCS Update 03_Documentation.md
2015-06-18 12:00:49 +01:00
Daniel Hensby
8e96ea3f0f
Merge pull request #4302 from SpiritLevel/patch-6
...
Update index.md
2015-06-18 11:41:30 +01:00
David Alexander
a4ec9b5d4f
Update 00_Issues_and_Bugs.md
...
Corrected Documentation mailing list link.
2015-06-18 20:04:07 +12:00
David Alexander
0b7f24537f
Update index.md
...
Rewording.
2015-06-18 19:40:04 +12:00
David Alexander
dfc1c8df34
Update 05_Translation_Process.md
...
Typos.
2015-06-18 17:50:29 +12:00
David Alexander
08d8865704
Update 03_Documentation.md
...
Typos.
2015-06-18 17:42:55 +12:00
David Alexander
54b0b1fd4e
Update 02_Release_Process.md
...
Typos. Spelling. 404 errors for framework and cms milestones links to github(line 13).
2015-06-18 17:26:58 +12:00
Damian Mooyman
83c4ffda52
Merge pull request #4276 from hailwood/patch-2
...
Add 0 Based Position tip.
2015-06-18 11:04:11 +12:00
Damian Mooyman
7597b888c3
Make SQLQuery strict semver for 3.2
2015-06-17 16:54:17 +12:00
Damian Mooyman
0653ba9630
Merge pull request #3979 from dhensby/pulls/test-nest
...
Nest and unnest Config and Controller for each test
2015-06-17 16:04:27 +12:00
Ingo Schommer
b95fdc7ba0
Merge pull request #4286 from tractorcow/pulls/3.2/fix-public-validate
...
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-17 15:36:03 +12:00
Damian Mooyman
0abacaead6
Merge remote-tracking branch 'origin/3.1' into 3
...
Conflicts:
admin/code/LeftAndMain.php
forms/EmailField.php
forms/Form.php
forms/HeaderField.php
forms/LiteralField.php
forms/PasswordField.php
forms/TextareaField.php
forms/TreeDropdownField.php
model/DataObject.php
tests/forms/uploadfield/UploadFieldTest.php
tests/model/DataObjectTest.php
2015-06-17 11:24:25 +12:00
Damian Mooyman
46479e969f
Document E_RECOVERABLE_ERROR
2015-06-16 12:29:29 +12:00
Damian Mooyman
58cc3da8d8
API Revert DataObject::validate to 3.1 method signature (protected)
2015-06-16 11:59:21 +12:00
Damian Mooyman
4d37e21bc6
Cleanup 3.2 changelog for release
2015-06-15 16:19:08 +12:00
David Alexander
57071869f1
Update index.md
...
url syntax fix for lesson 2
added lesson 17
2015-06-15 14:46:07 +12:00
David Alexander
e54b7fe404
Update 03_Documentation.md
...
Addressed dhensby's comments :)
2015-06-14 08:29:50 +12:00
David Alexander
ee4fe7c10c
Update 03_Documentation.md
...
Minor typos & rewording.
Clearer example needed on line 104.
2015-06-13 21:34:32 +12:00
Jonathon Menz
838926085c
API New and renamed image functions
...
Renamed image functions with more expressive names. Added CropWidth & CropHeight functions. Added no-upsampling capabilities. Cleaned up Image docs. Closes #4211
2015-06-12 17:02:55 -07:00
David Alexander
52a248534a
Update index.md
...
Minor typo.
2015-06-13 11:08:25 +12:00
Damian Mooyman
782c4cbf6f
API Enable single-column fulltext filter search as fallback
2015-06-12 15:36:03 +12:00
Matthew Hailwood
1b93db019c
Add 0 Based Position tip.
2015-06-12 13:38:09 +12:00
Daniel Hensby
f21427d7fa
DOCS Explaining test suite nesting
2015-06-11 16:56:57 +01:00
Myles Beardsmore
67e1cee64a
Completed missing comment ending
...
Completed missing comment ending
2015-06-10 16:56:31 +12:00
Loz Calver
c9d410d49e
Merge pull request #4262 from SpiritLevel/patch-1
...
Update 03_Environment_Management.md
2015-06-09 09:27:43 +01:00
Will Rossiter
29906f1599
Merge pull request #4199 from mthomsonnz/patch-2
...
DOCS: Add links to lessons 10-16 to the tutorials page
2015-06-09 17:19:41 +12:00
David Alexander
5a323f7fe3
Update 03_Environment_Management.md
2015-06-09 16:53:20 +12:00
Damian Mooyman
a8ace75341
API Support for multiple HTMLEditorConfig per page
2015-06-09 12:17:55 +12:00
Damian Mooyman
f21e59585e
Merge remote-tracking branch 'origin/3.1' into 3
2015-06-09 11:02:50 +12:00
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
Antony Thorpe
7c3ba9d4bf
Update 06_Tabbed_Forms.md
...
Typo. Adding a field to a tab, not from. Thanks.
2015-05-09 21:47:37 +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
ProzacJellybeans
d28edd09ce
Extending site - RSS correction
...
Instructions needed to be given on flushing more frequently, not just on template editing
2015-01-14 15:34:20 +13:00
Cam Findlay
3239cfd495
DOCS - fix reported broken links by zippy in IRC
2015-01-14 08:59:55 +13:00
Damian Mooyman
db314b2a76
Added 3.1.9-rc1 changelog
2015-01-13 09:04:39 +13:00
Michael Strong
a02adf6854
FIX Uneccessary class replacement
...
Overly complex code example.
2015-01-08 20:53:45 +13:00
scott1702
971334b408
DOCS Fixed dead link to image in tutorial 1
...
Found a dead link to the Silverstripe Logo, have changed this to an updated working link of the same image.
2015-01-08 16:31:28 +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
bfd05d7343
DOCS Core committers should have 2 t's
2015-01-05 10:57:15 +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
Damian Mooyman
5a48501def
Merge pull request #3740 from camfindlay/fiximagelinks
...
DOCS Make links relative so they work nicely on github and docs site.
2014-12-18 12:12:48 +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
Ingo Schommer
e48e4cac06
Semver documented in release process
...
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg .
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
10ce9b9db4
Typo fixes for committers
2014-12-17 15:50:06 +13:00
Cam Findlay
9f12a08f47
Rebased on 3.1 - moved new change logs into place.
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
Cam Findlay
aba966729a
FIX: use GFMD code blocks to fix code formatting consistency.
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
Cam Findlay
fc110e34fb
Added documentation writing style guide points
2014-12-17 15:50:05 +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
f633236e78
Review and tidy up contributing 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
7e83d70e69
Move todo list to trello.
2014-12-17 15:48:41 +13:00
Will Rossiter
1ceb10be4a
Update documentation introduction
2014-12-17 15:48:41 +13:00
Will Rossiter
015afe83e8
Add readme to include status of docs rewrite and high level todos
...
Conflicts:
docs/en/03_Upgrading.md
docs/en/03_Upgrading/00_Upgrading.md
docs/en/03_Upgrading/index.md
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
deff519789
DOCS Added links to the video lessons on silverstripe.org
2014-12-17 09:41:38 +13:00
Ingo Schommer
f2237aff8d
Semver documented in release process
...
See https://groups.google.com/forum/#!topic/silverstripe-dev/J4U4Nl2qTSg .
2014-12-15 17:56:32 +13:00
Cam Findlay
658216237e
FIX How to folder on forms
2014-12-15 14:49:46 +13:00
Cam Findlay
f387ffebe6
Typo fixes for committers
2014-12-15 09:12:49 +13:00
Cam Findlay
9e7fc7618c
Rebased on 3.1 - moved new change logs into place.
2014-12-15 09:12:49 +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
Cam Findlay
e9fd03bf8a
FIX: use GFMD code blocks to fix code formatting consistency.
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
Cam Findlay
36f62b6d4f
Added documentation writing style guide points
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
80d4127f43
Review and tidy up contributing 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
1b8f2478e6
Move todo list to trello.
2014-12-15 09:12:45 +13:00
Will Rossiter
85f3beee2c
Update documentation introduction
2014-12-15 09:12:45 +13:00
Will Rossiter
79e9254f05
Add readme to include status of docs rewrite and high level todos
...
Conflicts:
docs/en/03_Upgrading.md
docs/en/03_Upgrading/00_Upgrading.md
docs/en/03_Upgrading/index.md
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
Will Morgan
80092e5daa
Merge pull request #3662 from camfindlay/corecommiters
...
DOCS Repositioned house rules and added core commiter list.
2014-12-09 00:21:13 +00:00
Corey Sewell
fbebf96d66
Add detection for PHP running in CGI mode and add HTTP_AUTHORIZATION rewrite rule
...
Detect and parse HTTP_AUTHORIZATION for basic authentication running PHP in CGI mode
Add comments about using CGI mode with Apache and Basic Auth in /docs/en/topics/environment-management.md
Added notes to docs/en/changelogs/3.1.9.md
2014-12-05 11:35:52 +13:00
Cam Findlay
22ecab555c
DOCS Repositioned house rules and added core commiter list.
2014-12-04 15:39:19 +13:00
Damian Mooyman
19549d620f
Moved deprecation of SQLQuery to 4.0
2014-12-04 09:30:50 +13:00
Antony Thorpe
6c6d217273
Update error-handling.md
...
Add how to log notices (deprecation notifications can help with discovering problems caused by old code).
2014-12-03 16:56:53 +13:00
Daniel Hensby
ca7030d70d
Merge pull request #3683 from bendubuisson/patch-2
...
Update 5-dataobject-relationship-management.md
2014-11-26 20:42:17 +00:00
Ben Dubuisson
e30a354076
Update access-control.md
...
small typo
2014-11-27 09:25:43 +13:00
Antony Thorpe
9a7686c8b9
Update docs/en/reference/index.md
...
GridField line included twice
2014-11-27 08:06:00 +13:00
Ben Dubuisson
514098c01a
Update member.md
...
small typo
2014-11-26 16:32:57 +13:00
Ben Dubuisson
efd978074c
Update 5-dataobject-relationship-management.md
...
Some more typos, sorry didn't pick them all up at the same time!
2014-11-26 14:37:33 +13:00
Ben Dubuisson
a622fce073
Update 5-dataobject-relationship-management.md
...
typos
2014-11-26 11:43:49 +13:00
Gabriele Brosulo
90a7761394
Update datamodel.md
...
Syntax error
2014-11-24 10:50:38 +01:00
Phill Price
ff65f5e00f
Update csv-import.md
...
Translated the German to English to match up other areas in document
2014-11-19 21:29:54 +00:00
Damian Mooyman
fe0d330c59
Merge pull request #3656 from halkyon/nginx_buffers
...
Adding appropriate nginx fastcgi buffer config required for admin
2014-11-19 15:50:55 +13:00
Damian Mooyman
6baf63e18c
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
dev/install/install.php5
docs/en/changelogs/index.md
security/Security.php
2014-11-19 11:16:46 +13:00
Josh Kosmala
2e416b60f3
Update javascript.md fixes #3652
...
I needed to know how to do this to do some jQuery manipulation in the CMS.
2014-11-18 21:56:51 +00:00
Daniel Hensby
e5bed94d07
Merge pull request #3626 from 3Dgoo/feature/site-reports-doc-fix
...
Updating Site Reports documentation
2014-11-18 20:59:57 +00:00
Sean Harvey
8d2727eab6
Adding appropriate nginx fastcgi buffer config required for admin
2014-11-19 09:56:40 +13:00
Damian Mooyman
72484cd0bf
Update index.md
2014-11-18 18:41:23 +13:00
Damian Mooyman
c279ff7f0c
Merge remote-tracking branch 'origin/3.1.8' into 3.1
2014-11-18 18:40:15 +13:00
Damian Mooyman
8b3695bd41
Added 3.1.8 changelog
2014-11-18 18:30:19 +13:00
Damian Mooyman
0b1f297873
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
README.md
admin/code/LeftAndMain.php
admin/css/screen.css
admin/scss/screen.scss
api/RestfulService.php
conf/ConfigureFromEnv.php
control/injector/ServiceConfigurationLocator.php
control/injector/SilverStripeServiceConfigurationLocator.php
core/ClassInfo.php
core/Object.php
css/AssetUploadField.css
css/ComplexTableField_popup.css
dev/CSSContentParser.php
dev/DevelopmentAdmin.php
docs/en/changelogs/index.md
docs/en/misc/contributing/code.md
docs/en/reference/execution-pipeline.md
filesystem/GD.php
filesystem/ImagickBackend.php
filesystem/Upload.php
forms/Form.php
forms/FormField.php
forms/HtmlEditorConfig.php
forms/gridfield/GridFieldDetailForm.php
forms/gridfield/GridFieldSortableHeader.php
lang/en.yml
model/Aggregate.php
model/DataList.php
model/DataObject.php
model/DataQuery.php
model/Image.php
model/MySQLDatabase.php
model/SQLQuery.php
model/fieldtypes/HTMLText.php
model/fieldtypes/Text.php
scss/AssetUploadField.scss
search/filters/SearchFilter.php
security/Authenticator.php
security/LoginForm.php
security/Member.php
security/MemberAuthenticator.php
security/MemberLoginForm.php
security/Security.php
tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
tests/control/HTTPTest.php
tests/control/RequestHandlingTest.php
tests/filesystem/UploadTest.php
tests/forms/FormTest.php
tests/forms/NumericFieldTest.php
tests/model/DataListTest.php
tests/model/DataObjectTest.php
tests/model/TextTest.php
tests/security/MemberAuthenticatorTest.php
tests/security/SecurityDefaultAdminTest.php
tests/view/SSViewerCacheBlockTest.php
tests/view/SSViewerTest.php
2014-11-18 12:45:54 +13:00
Stevie Mayhew
41ea83b337
FEATURE: add validation to form field subclasses
2014-11-17 08:17:38 +13:00
Damian Mooyman
7b89c17349
Merge remote-tracking branch 'origin/3.1.7' into 3.1
2014-11-14 16:30:14 +13:00
Damian Mooyman
4ece737220
Update changelogs
2014-11-14 15:38:19 +13:00
Sam Minnée
421152f722
Merge pull request #3627 from nhorstmeier/patch-1
...
Should use <% with %> rather than <% loop %>
2014-11-12 13:38:10 +13:00
muskie9
a526c45d64
Should use <% with %> rather than <% loop %>
2014-11-11 08:44:37 -06:00
3Dgoo
89ff059334
Site Reports documentation fix
...
Fixing typo in Site Reports documentation. Adding more detail to Custom Report example.
2014-11-11 15:52:45 +10:30
bob (Plastyk)
45924f1402
Updating Site Reports documentation to show the Silverstripe 3.1 method of adding custom reports.
2014-11-11 15:45:34 +10:30
Antony Thorpe
98937f2467
Update forms.md
...
Should be "set" not "get" in FormField->setSmallFieldHolderTemplate().
2014-11-11 18:04:40 +13:00
Phill Price
a184d228e3
Filter heading being processed as part of code
...
Whitespace issue causing the filter header to become part of the sorting example above - fixed whitespace.
2014-11-10 11:08:12 +00:00
Damian Mooyman
0a5c380c92
Added 3.1.7-rc1 changelog
2014-11-08 18:50:54 +13:00
Damian Mooyman
8468546876
Add changelogs for 3.1.7-rc1
2014-11-08 18:36:03 +13:00
Gabriele Brosulo
f2a059b148
Update versioning.md
2014-11-06 11:31:55 +01:00
Gabriele Brosulo
b64cfaf649
Update versioning.md
...
Added information about $SilverStripeNavigator
2014-11-06 10:55:32 +01:00
Sean Harvey
ce797773da
Improvements to nginx and HHVM installation docs
...
* Fix a few missing packages in `apt-get install` command
* Add command to start HHVM automatically on boot
* Remove unnecessary `sendfile on` (already in /etc/nginx/nginx.conf)
2014-10-27 14:26:42 +13:00
Gabriele Brosulo
6683f3d283
Update cache-control.md
...
Added useful information after half an hour trying to have cache working :)
2014-10-23 14:00:32 +01:00
Sean Harvey
95963b19b8
Merge pull request #3559 from g4b0/patch-2
...
Update versioning.md
2014-10-16 11:54:46 +13:00
Gabriele Brosulo
1770161550
Update fixtures.md
...
syntax error
2014-10-15 15:31:32 +02:00
Gabriele Brosulo
8a7a25edf5
Update versioning.md
...
Removed parent::onAfterPublish(); because Page parents does not implement it. The old code generate this error:
Error at framework/core/Object.php line 761: Uncaught Exception: Object->__call(): the method 'onafterpublish' does not exist on 'MyPage' (http://ssdev-master.zk/admin/pages/edit/EditForm )
2014-10-15 15:25:13 +02:00
Sam Minnée
73c52a6eeb
Merge pull request #3539 from halkyon/hhvm_nginx_docs2
...
Adding documentation for installing HHVM with nginx on Linux
2014-10-15 18:14:00 +13:00
Michael Strong
a401db2d34
Duplicated content
...
For some reason the quick fire dos and donts were duplicated.
2014-10-15 12:47:55 +13:00
Damian Mooyman
53c40a94fa
API Enable re-authentication within the CMS if a user session is lost
...
BUG Resolve issue with error redirection being ignored within CMS
BUG Fix issue with invalid securityID being re-emitted on failure
2014-10-14 15:19:48 +13:00
spekulatius
450ccb9781
Update permission.md
...
Throws warning without call of parent::init()
2014-10-13 15:00:50 +13:00
Sean Harvey
6cda801ec3
Adding documentation for installing HHVM with nginx on Linux
2014-10-10 15:00:21 +13:00
Damian Mooyman
1e612607aa
Suggested improvements / test case fixes
2014-10-10 09:28:11 +13:00
muskie9
5f0dba5398
Update remove extra );
2014-10-08 15:32:05 -05:00
Daniel Hensby
3b9056fc01
NEW Cookie_Backend for managing cookie state
...
I've decoupled `Cookie` from the actual act of setting and getting
cookies. Currently there are a few limitations to how Cookie works that
this change mitigates:
0. `Cookie` currently changes the super global `$_COOKIE` when setting
to make the state of an application a bit more managable, but this is
bad because we shouldn't be modifying super globals
0. One can't actually change the `$cookie_class` once the
`Cookie::$inst` has been instantiated
0. One can't test cookies as there is no class that holds the state of
the cookies (it's just held in the super global which is reset as part
of `Director::test()`
0. One can't tell the origin of a cookie (eg: did the application set it
and it needs to be sent, or did we receive it from the browser?)
0. `time()` was used, so testing was made difficult
0. There was no way to get all the cookies at once (without accessing
the super global)
Todos are on the phpdoc and I'd like to write some tests for the backend
as well as update the docs (if there are any) around cookies.
DOCS Adding `Cookie` docs
Explains basic usage of `Cookie` as well as how the `Cookie_Backend`
controls the setting and getting of cookies and manages state of sent vs
received cookies
Fixing `Cookie` usage
`Cookie` is being used inconsistently with the API throughout framework.
Either by not using `force_expiry` to expire cookies or setting them to
null and then expiring them (which is redundant).
NEW `Director::test()` takes `Cookie_Backend` rather than `array` for `$cookies` param
2014-10-06 17:44:51 +13:00
Michal Kleiner
1c09d31719
fixed anonymous function declaration
...
uses changed to use
2014-10-02 11:51:23 +13:00
Damian Mooyman
db0cad4616
BUG ErrorControlChain now supports exception handling
2014-09-26 16:54:34 +12:00
Sean Harvey
c55e4fe7e2
Merge pull request #3475 from AntonyThorpe/PHPUnitDocs
...
Update testing/index.md for clearer PHPUnit installation instructions
2014-09-26 11:11:19 +12:00
Nicolaas
ea62bf9eed
Adding link to UserVoice
2014-09-26 11:07:38 +12:00
Will Rossiter
61ec808604
Set $lock_out_after_incorrect_logins out of the box
2014-09-26 10:49:53 +12:00
Sean Harvey
99f8fb29b5
Merge pull request #3507 from tractorcow/pulls/fix-mailer
...
API / FIX / Cleanup - Mailer and Convert::html2raw
2014-09-26 10:15:18 +12:00
Damian Mooyman
bf4e9eb044
API Singleton method allowing type inference
...
This pattern improves over the current usage of singleton by allowing type inference.
This also better supports refactor, code usage detection, and auto-completion of classes.
2014-09-26 09:10:25 +12:00
Damian Mooyman
e47800917a
API Mailer can be configured to use different encoding mechanisms, and added support for unicode quoted-string encoding
...
API Mailer bounce email can now be configured
API Mailer no longer calls Convert::xml2raw on all email subjects
API Deprecate dead Mailer code and refactored duplicate or mis-documented code.
2014-09-25 16:04:56 +12:00
Damian Mooyman
29e3347562
API Convert::html2raw no longer wraps text automatically
...
BUG Convert::html2raw now correctly decodes single quotes
2014-09-25 16:04:48 +12:00
Christopher Darling
39e9513c32
removed reference to deprecated :Negation filter
2014-09-24 12:49:12 +01:00
Sean Harvey
563155391f
API Cookies set via Cookie::set() are now HTTP only by default
2014-09-24 17:48:13 +12:00
Ed Linklater
c2d02a6daf
MINOR: Docs: Invalid link to WAMP page
2014-09-21 13:54:34 +12:00
AntonyThorpe
11187c56c0
Updated for PHPUnit version clarification
...
Updated Composer command to reference latest stable version as advised
Removed testing installation via Browser step
Added a note about the PHPUnit 3.7 requirement for running tests via the Browser
2014-09-17 16:49:52 +12:00
Damian Mooyman
062ad8e685
API Allow parameterised joins / subselects
2014-09-16 17:54:30 +12:00
muskie9
f7deaa8042
Update searchcontext.md with … showing ???
2014-09-15 14:44:03 -05:00
AntonyThorpe
da8cebaa62
Describe adding PHPUnit as a simple one line command
...
- Removed the composer.json example
- Removed comment about PHPUnit versions
Signed-off-by: AntonyThorpe <antony.thorpe@budget12.com>
2014-09-12 17:02:04 +12:00
Darío
8d328944fa
Update 5-dataobject-relationship-management.md
...
Fixed two small mistakes:
"select one the the mentors" -> "select one of the mentors"
WYSIWIG -> WYSIWYG
2014-09-11 13:15:38 +02:00
AntonyThorpe
f5ccdda22f
Updated en/topics/testing/index.md for clearer PHPUnit installation instructions
...
Step by step Composer installation instructions, including a composer.json example.
In addition:
- Removed self-page reference to an introduction
- Removed reference to PEAR installation instructions due to end of life
- Removed reference to Ruby as doesn't add value
- Shortened testing via Web Browser section (as covered in Composer installation instructions)
2014-09-10 17:20:29 +12:00
Sean Harvey
6267d2e51e
Fixing broken docs on setting allowed extensions on a FileField
...
Refers to an invalid variable, and is overriding the entire Upload,
which isn't necessary.
2014-09-09 11:14:38 +12:00
spekulatius
400bea1ee1
Update templates.md
...
Remove link to page which wasn't continued since 2.4.
2014-09-04 10:51:02 +12:00
Sean Harvey
70dfc55d34
Minor correction to documentation
2014-08-26 14:55:45 +12:00
Sean Harvey
07eef2ece2
Removing deprecated class/functions marked for deprecation in 3.0/3.1
2014-08-25 12:06:05 +12:00
Damian Mooyman
9ec4669a59
Merge remote-tracking branch 'origin/3.1.6' into 3.1
2014-08-25 11:38:13 +12:00
Damian Mooyman
9da3357e3a
add 3.1.6 docs
2014-08-25 11:25:01 +12:00
Ingo Schommer
5c9e88b9a0
Updated contrib docs, mention "DO NOT MERGE" pull requests
...
These should be avoided because they undermine the process of
peer review and merging in github, we should strive to have
zero open pull requests, as opposed to treating it as a stage
for work in progress. Intermediary code review can happen in github forks instead.
Also remove some checklist items which were based on the Trac bugtracker,
e.g. its not longer possible to assign yourself to issues because
of github's limited permission abilities.
2014-08-25 08:29:25 +12:00
Sean Harvey
6e0d9df331
Merge pull request #3406 from ss23/patch-2
...
Update urlvariabletools.md
2014-08-22 17:24:36 +12:00
Damian Mooyman
aec8430395
Merge pull request #3393 from halkyon/flushable
...
NEW Provide a consistent way of triggering flush
2014-08-22 10:28:26 +12:00
Sean Harvey
2b316e79e5
NEW Provide a consistent way of triggering flush
...
Provides an interface for classes to implement their own flush()
functionality. This function gets called early in a request on
all implementations of Flushable when flush=1|all is requested in the
URL.
This fix came out of an issue where Requirements combined files were not
being cleaned up after dev/build?flush=1, due to the fact that flush
would only occur when you called it while on a page that used those
combined files, but not in any other contexts. This will now call flush
on any implementors of Flushable regardless of the context of where
flush was called.
2014-08-22 09:24:27 +12:00
Christopher Darling
d89ed7c4a7
DOCS: correct notes on TEMP_FOLDER
...
getTempParentFolder() in framewor/core/TempPath.php checks for silverstripe-cache directory in webroot first, failing that it falls back on the sys_get_temp_dir() folder.
also, getTempFolder() is no longer in framework/core/Core.php since #b075fa29c59f970bea31bbe8be1bd6560a8778b6, it is now located in framework/core/TempPath.php
2014-08-21 14:31:55 +01:00
☃ Stephen Shkardoon ☃
8c12af6acb
Update urlvariabletools.md
...
Remove strange reference to flush values in showtemplate line.
2014-08-20 21:52:14 +12:00
Damian Mooyman
a838e9bae6
Merge remote-tracking branch 'origin/3.1.6' into 3.1
2014-08-19 09:38:17 +12:00
Damian Mooyman
f49416858c
Added 3.1.6-rc3 changelog
2014-08-18 17:42:31 +12:00
Sean Harvey
404478b07f
Removing @deprecated 3.1 functionality and classes.
...
Changelog has been updated to include what was removed in terms of
major functionality, and what to use as a replacement.
2014-08-18 16:00:13 +12:00
Sean Harvey
8cf99b9bec
Fixing inconsistent use of RewriteRule in docs and install.php5
...
It currently doesn't match the .htaccess that comes with a checkout of
silverstripe-installer.
2014-08-18 10:55:47 +12:00
Mateusz Uzdowski
8bf3853887
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
docs/en/misc/contributing/issues.md
docs/en/reference/uploadfield.md
forms/HtmlEditorField.php
i18n/i18n.php
javascript/HtmlEditorField.js
model/DB.php
model/Image.php
model/SQLQuery.php
2014-08-14 09:08:26 +12:00
Damian Mooyman
0b6c68f903
Merge remote-tracking branch 'origin/3.1.6' into 3.1
2014-08-12 16:28:39 +12:00
Damian Mooyman
a8685d0aa6
Fix link
2014-08-12 15:12:44 +12:00
Damian Mooyman
2b25ab37f6
3.1.6-rc2 docs
2014-08-12 15:09:13 +12:00
Michael
8ab12567a8
Update shortcodes.md
...
Replaced $args with $arguments as $args wasn't correct
2014-08-12 13:02:24 +12:00
Elliot Sawyer
ee489582e9
Fix typo in sitetree.md
...
Found a typo in the PHP class: StaggPage should be StaffPage
2014-08-12 13:02:13 +12:00
colymba
e535c35542
API New JS sprintf and inject replacement functions
...
Fix sprintf issues when replacement was at start of string + introduce
new inject function using injection map similar to the PHP version of
_t()
2014-08-12 13:01:29 +12:00
JorisDebonnet
3b6fc08f0f
Update customize-cms-menu.md
...
Corrected a few typos.
2014-08-12 13:00:09 +12:00
JorisDebonnet
af333bd40d
Update dataobject.md
...
There's no way to make things like [api:DataObject->beforeUpdateCMSFields()] work, is there?
I removed those kind of api tags (the links yielded a 404 page), and corrected a few other link-rendering issues.
2014-08-12 12:59:44 +12:00
Shaun de Greeff
953992e896
Update composer.md
...
Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily
2014-08-12 12:57:51 +12:00
Stefan Neuser
f0ed9e78a9
Update customize-cms-tree.md
2014-08-12 12:57:16 +12:00
Michael
52624e7505
Update shortcodes.md
...
Replaced $args with $arguments as $args wasn't correct
2014-08-08 16:02:10 +01:00
Elliot Sawyer
c09638f057
Fix typo in sitetree.md
...
Found a typo in the PHP class: StaggPage should be StaffPage
2014-08-08 15:53:03 +12:00
Simon Welsh
9b8d07ca5b
Merge pull request #3180 from colymba/i18n-js-injection-fix
...
API New i18n JS sprintf and inject replacement functions
2014-08-07 21:24:52 +10:00
Simon Welsh
5283700ae0
Merge branch 'JorisDebonnet-3.1' into 3.1
...
Closes #3170
2014-08-07 21:07:48 +10:00
JorisDebonnet
bde5301e41
Update customize-cms-menu.md
...
Corrected a few typos.
2014-08-07 21:05:08 +10:00
Simon Welsh
b3994cd456
Merge pull request #3168 from JorisDebonnet/patch-2
...
Update dataobject.md
2014-08-07 21:04:05 +10:00
Shaun de Greeff
079e86163b
Update composer.md
...
Add a link to the Windows wamp page so that people will find info on how to install composer on windows more readily
2014-08-07 20:19:14 +10:00
Stefan Neuser
4be04921de
Update customize-cms-tree.md
2014-08-07 20:16:11 +10:00
Marcus Nyeholt
2ca94e9869
DOC Added aspect oriented proxy documentation
2014-08-06 13:48:26 +10:00
Damian Mooyman
9912410e7b
Update documentation links
2014-08-05 16:14:39 +12:00
Damian Mooyman
259850477c
Update release docs
2014-08-05 15:50:03 +12:00
Damian Mooyman
d42edae617
Added 3.1.6-rc1 changelog
2014-08-05 15:38:41 +12:00
Sean Harvey
1759d5d017
API Use "number" HTML5 type for NumericField by default
2014-08-04 14:27:35 +12:00
Damian Mooyman
26a0e91553
API SS_Filterable, SS_Limitable and SS_Sortable now explicitly extend SS_List
2014-07-30 11:07:01 +12:00
Ingo Schommer
48dd233050
Removed link to outdated docs mailinglist
2014-07-28 08:56:21 +12:00
Damian Mooyman
0433ba1642
BUG Revert some changes to ManyManyList
...
BUG Fix incompatibility in Member_GroupList
Fix regressions in merges from 3.1
BUG Fix Security failing on test classes
BUG Fix postgresql compatibility
Clarify sql encoding of table names
2014-07-23 12:38:41 +12:00
Damian Mooyman
350ee4d421
Merge pull request #3277 from kopymark/patch-3
...
Fix for joins code block
2014-07-23 08:54:18 +12:00
Cam Findlay
6f08484a90
DOCS Setting allowed_extensions in YAML
...
3.1 compatible docs in place of #3267
2014-07-20 14:25:21 +12:00
Sean Harvey
cfe8e15da9
Merge pull request #3268 from camfindlay/wamp-docs
...
Updating the WAMP docs to latest version and include composer installation notes
2014-07-17 10:29:39 +12:00
Cam Findlay
081087c977
Updating the WAMP docs to include composer installation and apache 2.4 fix - delete index.php
...
Now uses GFM for code blocks.
2014-07-17 09:58:14 +12:00
Simon Welsh
c14d58f585
Merge branch '3.1'
...
Conflicts:
.travis.yml
model/ManyManyList.php
model/fieldtypes/DBField.php
2014-07-16 21:24:02 +10:00
Simon Welsh
8a3eebf289
Merge remote-tracking branch 'origin/3.0' into 3.1
...
Conflicts:
i18n/i18n.php
2014-07-16 21:18:07 +10:00
Marijn Kampf
3fc371b24a
Removed trailing : from yml example causing error
...
[Warning] Illegal offset type
Line 597 in \framework\view\Requirements.php
2014-07-15 09:59:43 +01:00
Adam Judd
171eb42c9e
Fix for joins code block
2014-07-09 22:31:41 +09:30
Damian Mooyman
d8e9af8af8
API New Database abstraction layer. Ticket #7429
...
Database abstraction broken up into controller, connector, query builder, and schema manager, each independently configurable via YAML / Injector
Creation of new DBQueryGenerator for database specific generation of SQL
Support for parameterised queries, move of code base to use these over escaped conditions
Refactor of SQLQuery into separate query classes for each of INSERT UPDATE DELETE and SELECT
Support for PDO
Installation process upgraded to use new ORM
SS_DatabaseException created to handle database errors, maintaining details of raw sql and parameter details for user code designed interested in that data.
Renamed DB static methods to conform correctly to naming conventions (e.g. DB::getConn -> DB::get_conn)
3.2 upgrade docs
Performance Optimisation and simplification of code to use more concise API
API Ability for database adapters to register extensions to ConfigureFromEnv.php
2014-07-09 18:04:05 +12:00
Sam Minnée
14faf95f35
Fixed wrong variable name in modeladmin docs
2014-07-05 14:34:42 +12:00
Sam Minnée
ac9a6cbc62
Merge pull request #3169 from JorisDebonnet/patch-3
...
Update modeladmin.md
2014-07-05 14:33:49 +12:00
Sam Minnée
2a3eebf6df
Merge pull request #3261 from oceanmountain/patch-1
...
Update templates.md
2014-07-05 14:23:20 +12:00