Ingo Schommer
e9cf4affc7
Merge remote-tracking branch 'origin/3.0'
2012-10-09 09:32:43 +02: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
Ingo Schommer
38e7df2e91
NEW Enable SiteTree::$nested_urls by default
2012-10-08 17:05:05 +02:00
Ingo Schommer
d1ee7612f5
Merge remote-tracking branch 'origin/3.0'
2012-10-08 16:48:52 +02:00
Saophalkun Ponlu
e3a27ea7da
CMS member profile now is no longer in a popup ( #7880 )
2012-10-08 12:57:55 +02:00
kentvv
ef0cd7b428
Update docs/en/howto/extend-cms-interface.md
...
Minor changes to file links.
2012-10-08 13:11:33 +13:00
Juan Molina
ab065b41bd
Update docs/en/howto/simple-contact-form.md
...
Minor code highlighting fix.
2012-10-08 00:11:57 +03:00
Juan Molina
2c480ed94e
Update docs/en/reference/dataextension.md
...
Removed ForumRole broken link and minor typo.
2012-10-07 18:11:40 +03:00
Ingo Schommer
be13ba3ef9
Removed 'built-in page controls' links from docs
...
See https://github.com/silverstripe/sapphire/pull/842 , thanks Juanitou!
2012-10-05 17:39:19 +02:00
Simon Welsh
5768e421dc
Merge branch '3.0'
2012-10-05 14:40:32 +13:00
Hamish Friedlander
11f1c0a5c3
NEW Add documentation for the new config system in 3.0
2012-10-04 16:34:57 +13:00
Ingo Schommer
56f7ce1dcf
Merge remote-tracking branch 'origin/3.0'
...
Conflicts:
control/Cookie.php
control/Director.php
control/HTTPResponse.php
model/Database.php
model/MySQLDatabase.php
model/SQLQuery.php
view/Requirements.php
view/SSViewer.php
2012-10-03 16:16:19 +02:00
Ingo Schommer
4684601c38
Fixed markdown whitespace usage
2012-10-02 11:38:16 +02:00
Ingo Schommer
fe4f0c92e2
Markdown line endings
2012-10-02 00:02:44 +02:00
Sam Minnee
1f7fc1f76a
FIX Remove instances of lines longer than 120c
...
The entire framework repo (with the exception of system-generated files) has been amended to respect the 120c line-length limit. This is in preparation for the enforcement of this rule with PHP_CodeSniffer.
2012-09-30 17:18:13 +13:00
Will Rossiter
a86b54b3ed
Update tutorial to include RSS feed API change.
2012-09-27 18:46:48 +12:00
Sean Harvey
e4ab02e1c3
Merge branch '3.0'
2012-09-27 10:39:31 +12:00
Howard Grigg
69e9876059
Correct brush name in template docs to avoid js popup
2012-09-25 22:27:30 +10:00
Sean Harvey
92e62ebb91
Merge pull request #812 from chillu/pull/sitetree-meta-removal
...
Removed SiteTree.MetaTitle and MetaKeywords usage
2012-09-24 21:15:20 -07:00
Sean Harvey
2654290848
Merge pull request #811 from wilr/removestatic
...
API: Remove static main and dev/buildcache
2012-09-24 19:12:35 -07:00
Simon Welsh
2b172aa891
Merge branch 'patch-2' of https://github.com/anselmdk/sapphire into 3.0
2012-09-24 18:22:49 +12:00
Anselm Christophersen
0df9b1c8a0
added CroppedImage
2012-09-23 19:46:06 +03:00
Ingo Schommer
5df519c6b5
Removed SiteTree.MetaTitle and MetaKeywords usage
2012-09-21 11:31:24 +02:00
Will Rossiter
e72114dad7
API: Remove static main and dev/buildcache
...
Files moved to a separate module (silverstripe-static).
2012-09-21 19:56:56 +12:00
Simon Welsh
6d696d506f
API Allow subgroups in the WHERE clause of a Data/SQLQuery
...
Adds three extra methods to Data/SQLQuery query that allow for starting
a disjunctive subgroup, a conjunctive subgroup and for ending a subgroup.
Database::sqlWhereToString() now builds up the WHERE clause one by one
instead of with a straight implode. Uses a stack to know which conenctive
to use.
2012-09-21 14:59:47 +12:00
Simon Welsh
1e629f4585
Merge branch '3.0'
...
Conflicts:
control/Cookie.php
control/Director.php
dev/Profiler.php
view/Requirements.php
2012-09-21 14:56:56 +12:00
Ingo Schommer
e2f073f38a
Method visibility according to coding conventions
2012-09-20 10:46:59 +02:00
Howard Grigg
7381cb46a3
Updated Template docs to include using backslash to escape
2012-09-18 22:35:46 +10:00
Will Rossiter
e509fb501d
Tidy up RSSFeed docs based on community feedback. (Thanks Matt Howlett)
2012-09-18 19:42:21 +12:00
Ingo Schommer
c1064ccd0f
Merge pull request #783 from halkyon/iis_install_simplify
...
Simplify IIS installation instructions, refer to stable download
2012-09-17 16:06:58 -07:00
Sean Harvey
9c2be0f025
Merge branch '3.0'
2012-09-17 15:16:52 +12:00
Sean Harvey
40c3af37c2
Merge tag '3.0.2' into 3.0
2012-09-17 14:27:42 +12:00
Sean Harvey
ea35b08634
Added 3.0.2 changelog (and added missing 3.0.1 changelog to the list)
2012-09-17 13:25:31 +12:00
Sean Harvey
b6c1a64b7d
Fixed link to RC3 changelog
2012-09-17 12:31:24 +12:00
Sean Harvey
a6f5b99a5c
Formatted warnings correctly
2012-09-17 12:24:45 +12:00
Peter Indiola
7f3f560a60
Update docs/en/topics/forms.md
...
Minor update to line 79 of the Form Fields sample code. Missing comma for the next field. throws error when using the code.
2012-09-15 09:06:37 +08:00
Sean Harvey
7a8c35f4e3
Merge pull request #789 from anselmdk/patch-1
...
Removed some line breaks for code blocks to render properly in the doc m...
2012-09-12 16:18:30 -07:00
Ingo Schommer
0670a15923
Merge branch '3.0.2' into 3.0
2012-09-13 00:55:00 +02:00
Sean Harvey
1aed488762
Simplify IIS installation instructions, refer to stable download
...
The documentation was quite verbose, and most of this can be replaced
with instructions on using PHP Manager for IIS which sets up most of
the PHP configuration for us, with small tweaks done afterwards.
In addition, there were references to SVN version control locations
which are long since used, we now refer to stable download locations
on silverstripe.org instead, for SilverStripe as well as the mssql
module.
2012-09-13 10:08:38 +12:00
Anselm Christophersen
1434190c36
Removed some line breaks for code blocks to render properly in the doc module
...
See <http://doc.silverstripe.org/framework/en/tutorials/5-dataobject-relationship-management > for what I mean
2012-09-12 19:53:06 +03:00
Ingo Schommer
db1bffb054
Added 3.0.2-rc2 changelog
2012-09-12 11:17:40 +02:00
Ingo Schommer
6544c8fc13
Merge remote-tracking branch 'origin/3.0'
2012-09-11 14:05:45 +02:00
Howard Grigg
20fead5feb
DOCS - Correcting links to Roadmap and Changelog
2012-09-11 18:00:46 +10:00
Will Rossiter
189259f65b
Merge pull request #785 from halkyon/req_tweaks
...
IIS Requirement documentation tweaks
2012-09-10 20:50:38 -07:00
