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,478 Commits 31 Branches 527 Tags 162 MiB
838926085c
Commit Graph

1424 Commits

Author SHA1 Message Date
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