Simon Welsh
fbce9fd7cd
Merge branch '3.1'
...
Conflicts:
.travis.yml
docs/en/misc/contributing/code.md
javascript/HtmlEditorField.js
2013-07-05 10:22:58 +12:00
Simon Welsh
d844c74e3c
Merge branch '3.0' into 3.1
...
Conflicts:
.travis.yml
control/HTTP.php
email/Mailer.php
tests/control/HTTPTest.php
2013-07-05 10:17:14 +12:00
Ingo Schommer
2a4fd90316
Docs: Note about branch merging
2013-06-25 10:35:30 +02:00
Ingo Schommer
94b4237372
Merge remote-tracking branch 'origin/3.1'
2013-06-19 11:17:33 +02:00
Will Rossiter
8fca3799c3
Update module development, remove outdated release steps
2013-06-15 12:06:25 +12:00
CheeseSucker
89a272b291
[MINOR] Changed so that ä is displayed as ä as intended by author.
2013-06-15 02:23:01 +03:00
CheeseSucker
9c6b58d206
Fixed typo.
2013-06-15 00:28:02 +02:00
Ingo Schommer
88536998b9
Merge remote-tracking branch 'origin/3.1'
...
Conflicts:
.travis.yml
2013-05-31 18:08:59 +02:00
Che Van Lawrence
657c2033ae
Improve docs (mostly spelling)
2013-05-29 18:23:25 +02:00
Sam Minnee
d97ca43cd0
Merge branch '3.1'
...
Conflicts:
README.md
dev/install/install.php5
forms/ConfirmedPasswordField.php
tests/forms/FormTest.php
2013-05-23 19:01:58 +12:00
Ingo Schommer
a87bbb2903
Updated github path
2013-05-17 00:45:52 +02:00
Ingo Schommer
a35de54882
Updated github path
2013-05-17 00:41:16 +02:00
Ingo Schommer
5f91c3724d
Consistently used dollar notation in template docs (see #1794 )
2013-04-26 11:48:59 +02:00
Ingo Schommer
f8ee3e1b73
Merge pull request #1742 from svandragt/patch-1
...
Clarified the context of the step-by-step process
2013-04-14 13:27:16 -07:00
Ingo Schommer
f514067f2f
Updated commit message usage to reflect github best practices
2013-04-11 17:35:55 +03:00
Ingo Schommer
0343a77d30
Merge remote-tracking branch 'origin/3.1'
2013-04-11 11:42:04 +02:00
Sander van Dragt
7b49425e16
Clarified the context of the step-by-step process
...
Also limited the dependency on branching of 'master' to make the example more versatile and consistent with the best practice in this document.
2013-04-09 16:51:20 +02:00
Matt Lewandowsky
d613ba0593
Provide guidance for cross-repo issue referencing
2013-04-05 04:57:09 -07:00
Ingo Schommer
a0f0e9bce3
Update translation.md
2013-04-04 17:44:40 +03:00
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
