Commit Graph

40 Commits

Author SHA1 Message Date
Damian Mooyman
319d6d293e BUG Fix doclink (#5827)
Fixes #5721
2016-07-20 10:12:42 +01:00
Daniel Hensby
745faebd81
Merge 3.2 into 3.3
Conflicts:
	.travis.yml
2016-04-26 00:17:09 +01:00
Damian Mooyman
b8e7f9a934 Standardise spelling of "customise"
Fixes #3988
2016-03-30 13:17:28 +13:00
Damian Mooyman
24a6c53645 Merge branch '3.2' into 3.3
# Conflicts:
#	admin/code/ModelAdmin.php
#	lang/cs.yml
#	lang/lt.yml
#	lang/sk.yml
2016-02-29 17:03:22 +13:00
Damian Mooyman
2c1f837442 Merge branch '3.1' into 3.2
# Conflicts:
#	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
#	docs/en/01_Tutorials/03_Forms.md
#	docs/en/02_Developer_Guides/00_Model/08_SQL_Query.md
#	docs/en/02_Developer_Guides/00_Model/10_Versioning.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/01_Common_Subclasses.md
#	docs/en/02_Developer_Guides/03_Forms/Field_types/05_UploadField.md
#	docs/en/02_Developer_Guides/09_Security/01_Access_Control.md
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/14_Files/index.md
#	lang/cs.yml
#	lang/fi.yml
#	lang/sk.yml
2016-02-29 16:59:20 +13:00
Damian Mooyman
5f2d3f31d7 Merge remote-tracking branch 'origin/3.2' into 3.3
# Conflicts:
#	dev/DevelopmentAdmin.php
#	docs/en/02_Developer_Guides/08_Performance/02_HTTP_Cache_Headers.md
#	lang/cs.yml
#	lang/lt.yml
2016-02-24 17:29:06 +13:00
David Alexander
903379bde2 DOCS 3.2 : fixing api: links now that api: tag parser working
fixed a couple of external links

fixed a docs link
2016-02-17 18:02:38 -07:00
David Alexander
febbd35b51 DOCS 3.1 : fixing api: links
missed one
2016-02-17 03:00:22 -07:00
Damian Mooyman
5d240feaec Merge remote-tracking branch 'origin/3.2' into 3.3 2016-01-19 15:08:24 +13:00
Damian Mooyman
46cbe809ac Merge remote-tracking branch 'origin/3.1' into 3.2
# Conflicts:
#	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
#	docs/en/02_Developer_Guides/14_Files/01_Image.md
#	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Menu.md
#	docs/en/03_Upgrading/index.md
#	docs/en/05_Contributing/01_Code.md
#	forms/TreeMultiselectField.php
#	security/Permission.php
2016-01-19 14:00:19 +13:00
David Alexander
5c99e33eb2 DOCS 3.1 - fixes broken internal links 2016-01-14 23:59:53 +13:00
muskie9
fc3b06dbf9 DOCS update LinkingModes description 2015-11-23 14:10:47 -06:00
Daniel Hensby
ca8d0f2818 Merge branch '3.1' into 3.2
Conflicts:
	dev/Debug.php
	docs/en/05_Contributing/01_Code.md
	forms/FormField.php
	i18n/i18nTextCollector.php
	model/DataQuery.php
2015-07-20 10:48:01 +01:00
David Alexander
7a1d370038 DOCS : added lesson 18 to index.md 2015-07-14 19:13:57 +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
David Alexander
57071869f1 Update index.md
url syntax fix for lesson 2
added lesson 17
2015-06-15 14:46:07 +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
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
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
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
unclecheese
2af48738c9 MINOR: Remove children from Tutorials landing page. Deprecated. 2015-02-19 17:20:45 +13: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
Christopher Pitt
0a19d882d3 Update index.md
404 fix
2015-02-10 09:16:18 +13:00
unclecheese
647f921c08 MINOR: Add lesson 8 2015-02-05 16:25:07 +13:00
unclecheese
686e072301 Add two new video tutorials 2015-01-22 09:42:02 +13: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
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
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
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
deff519789 DOCS Added links to the video lessons on silverstripe.org 2014-12-17 09:41:38 +13:00
Cam Findlay
e9fd03bf8a FIX: use GFMD code blocks to fix code formatting consistency. 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
d52b475cfb Add introduction files to each of the sections 2014-12-15 09:12:45 +13:00
Will Rossiter
85f3beee2c Update documentation introduction 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