Commit Graph

107 Commits

Author SHA1 Message Date
Ingo Schommer
ef3d974821 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/issues.md
2013-04-02 02:05:58 +02:00
Ingo Schommer
f5754c11aa Contribution guidelines, new bugtracker links 2013-04-02 01:51:40 +02:00
Dan
9b056456a1 Minor: Update "Editing Online"
Adding emphasis to the "Edit this page" feature, and ensuring it comes before the more difficult option of locating the .md file manually.
2013-03-30 03:03:50 -03:00
Ingo Schommer
b0d3f7f3a2 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	api/RSSFeed.php
	dev/SapphireTest.php
	tests/control/RequestHandlingTest.php
2013-03-26 10:46:41 +01:00
Ingo Schommer
74df4a5627 Merge pull request #1312 from chillu/pulls/deprecation-docs
Deprecation docs
2013-03-21 16:35:48 -07:00
Ingo Schommer
c3854e9e4c Merge pull request #1274 from simonwelsh/update-conventions
Update conventions
2013-03-20 03:56:45 -07:00
Ingo Schommer
72d5f3cf17 Composer contribution fork/upstream docs (fixes #8332) 2013-03-20 11:37:41 +01:00
Ingo Schommer
05689a9421 Deprecation docs 2013-03-20 10:20:27 +01:00
Simon Welsh
97df009a41 Correct spelling 2013-03-16 00:06:10 +13:00
Simon Welsh
0cc2aeb827 Update examples to match conventions 2013-03-16 00:06:10 +13:00
Simon Welsh
a772eb1528 Update coding conventions to match SilverStripe practices 2013-03-16 00:06:04 +13:00
Andrew Short
bc941c18b6 Merge branch '3.1' 2013-03-15 21:58:37 +11:00
Dan
7d35d899fb Fixed link and added branch direction
Broken link to edit docs, perhaps should link to repo instead of directory to avoid having a branch in the URL.  Also added blurb to clarify what branch doc edits should occur in.
2013-03-08 10:24:49 -05:00
Ingo Schommer
ce66bc1eaf Merge remote-tracking branch 'origin/3.1'
Conflicts:
	tests/travis/before_script
2013-02-27 13:34:03 +01:00
Ingo Schommer
67b2d3faa0 Added note on module translations 2013-02-20 13:32:27 +01:00
Ingo Schommer
786d0516da More docs on CMS issue reporting 2013-01-22 15:10:50 +01:00
Ingo Schommer
f833226da0 Updated issue reporting guidelines 2013-01-22 12:05:07 +01:00
Ingo Schommer
3fd1769142 Added docs about which branch to choose 2012-12-21 14:26:51 +01:00
Ingo Schommer
7c3ce86bbb Updated docs to fit new 'buildtools' workflow 2012-11-21 16:15:48 +01:00
Ingo Schommer
bcee252c2f Fixed sapphiredocs references 2012-11-06 11:01:48 +01:00
Sam Minnee
9e7b8baecf Point people at silverstripe-dev and not the forum for discussing patches. 2012-10-09 14:53:48 +13:00
Sam Minnee
7d203a9af1 Moved all translator-targeted documentation to contributing/translation and left translation-process for advanced topics relating to module maintainers and the core team. 2012-10-09 14:53:47 +13:00
Sam Minnee
c4d2f9e6b2 Corrected a number of inbound links pointing to the documentation. 2012-10-09 14:53:47 +13:00
Sam Minnee
c28dd4c24b Make the copyright assignment clearer, and gave some explanation of why we do this. 2012-10-09 14:53:45 +13:00
Sam Minnee
65d20e4acc Simplified some of the code contribution guidelines.
The current guides have a few areas where they recommend an approach that is more complex than what most people take.

 - Rebase straight onto upsteam/msaster
 - Force push a rebased branch

I also fixed the conflict resolution help to be relevant to rebase commands, and kept the push instruction out of the rebase instruction.
2012-10-09 14:53:45 +13:00
Sam Minnee
433d29ce7b Removed 'release candidate branch' step of contributing.
I don't know what that release candidate branch stuff is, but:

 * I've never seen any of the core team do it
 * I think it's overkill for most patches
 * I think it's being too prescriptive: if contributors want to do that, that's cool, but it doesn't affect the core team.
 * It makes our contributing guidelines more complex than they need to be.
2012-10-09 14:53:44 +13:00
Sam Minnee
439339d4fc Broke up contributing docs into 4 sections and unified code contribtion guide.
The guidelines for contributing code were scattered across a section of contributing.md and collaboration-on-git.md.  I've updated this to have separate contributing/code.md page with all the content in a single cohesive page.  We also have contributing/documentation.md, contributing/issues.md and contributing/translation.md.
2012-10-09 14:53:39 +13:00
Sam Minnée
898f9ad3a9 DOC Gave easier instructions for would-be authors
The use of GitHub for documentation isn't ideal in a world full of wikis,
but we do it because it has other substantial advantages. However, we
shouldn't assume that every would-be author is comfortable using pull requests.

This change presents the edit-on-github interaction as the most straightforward
one, suggesting that advanced users may which to check out locally.
2012-08-30 12:54:52 +12:00
Ingo Schommer
0abef4232e Pointer to CMS architecture docs 2012-08-05 20:39:05 +02:00
Will Rossiter
bbbec359d5 Update ideal commit message to reflect new guidelines 2012-08-05 18:29:41 +12:00
Ingo Schommer
d45b33e9c7 Docs about merging back translations 2012-07-13 14:25:44 +02:00
Ingo Schommer
ee71356fca Removed 'subversion' docs
No longer required since we've successfully switched to git
2012-06-28 09:00:13 +02:00
Ingo Schommer
45b2cbfddd Using new template controls in docs 2012-06-27 16:09:31 +02:00
Ingo Schommer
868d3697fd Fixed usage of DataList etc in docs (fixes #7518) 2012-06-27 16:09:31 +02:00
Ingo Schommer
2b31f4aa15 API New commit tagging rules in contrib guidelines 2012-06-27 00:07:47 +02:00
Ingo Schommer
3e7bf77a70 MINOR Translation process docs 2012-06-22 15:07:25 +02:00
Ingo Schommer
464504a9bf MINOR Updated commit docs 2012-06-20 17:25:53 +02:00
Sean Harvey
8407c76b82 Merge pull request #451 from chillu/security-docs
Improved security docs around DataList, SQLQuery
2012-05-16 03:48:50 -07:00
Ingo Schommer
3a11c690ed MINOR Updated security documentation (phpdoc and markdown) around new DataList and SQLQuery APIs, additional automatic escaping on some stricter inputs like column names 2012-05-16 11:59:22 +02:00
Ingo Schommer
6e99e187b4 MINOR Css coding conventions for CMS 2012-05-16 11:38:20 +02:00
Ingo Schommer
f18b2f6342 MINOR Docs mention of automatic master lang uploads 2012-05-04 11:19:48 +03:00
Ingo Schommer
c7ca63e0d1 MINOR Updated translation-process docs, migrated FAQs from translate.silverstripe.org 2012-04-27 17:56:29 +02:00
Ingo Schommer
7e222393ea MINOR Updated docs with getlocalization.com instructions 2012-04-27 17:33:14 +02:00
Simon Welsh
656369008c API-CHANGE Update docs to match renaming of sapphire to framework 2012-04-15 10:50:19 +12:00
Philipp Krenn
a67c6ce936 ENHANCEMENT Added section on security ratings, moved security process description from 'contributing' to 'release process' section 2012-02-01 11:10:10 +01:00
Ingo Schommer
04a10a4265 MINOR Updated coding conventions to require the 'public' keyword for class methods and variables 2012-01-30 23:13:42 +01:00
Ingo Schommer
7f9ced2a42 MINOR Docs on github collab 2012-01-08 19:44:55 +01:00
Will Rossiter
dc84665ec2 MINOR: removed incorrect getter/setter statements. 2011-09-07 13:08:54 +12:00
Ingo Schommer
490fd01213 MINOR Contributing docs 2011-06-08 10:57:36 +12:00
Ingo Schommer
b21dbd9641 MINOR Fixed from-source docs, added 'preview' release cycle to release-process docs 2011-05-02 08:44:09 +12:00
Ingo Schommer
d61444e976 API CHANGE Moved Translatable class into new 'translatable' module 2011-03-29 18:07:56 +13:00
Ingo Schommer
28084243d3 MINOR Improved patch documentation 2011-03-21 09:23:04 +13:00
Ingo Schommer
04ae1abe65 Merge remote-tracking branch 'mandrew/master'
Conflicts:
	docs/en/misc/contributing.md
2011-03-09 17:17:10 +13:00
Ingo Schommer
2003888152 MINOR Updated contributing guidelines 2011-02-25 08:56:52 +13:00
Ingo Schommer
7cb687b5e0 MINOR Added docs/ contributing notes 2011-02-23 20:14:04 -08:00
Michael Andrewartha
e260b697c0 MINOR: formatting changes and fixes to original document formatting 2011-02-22 10:23:22 +13:00
Ingo Schommer
b1c36ce0a4 ENHANCEMENT Added sapphire/docs (migrated from https://github.com/chillu/silverstripe-doc-restructuring) 2011-02-07 19:48:44 +13:00