Commit Graph

101 Commits

Author SHA1 Message Date
Ingo Schommer
bb03f6ba2f Merge remote-tracking branch 'origin/3.1'
Conflicts:
	forms/HtmlEditorField.php
2014-06-15 22:50:20 +12:00
Daniel Hensby
a32a1bcf11 DOCS Explicitly exclude dev deps for deployment
Docs should tell users how to deploy without development dependencies
2014-06-05 18:57:25 +01:00
Damian Mooyman
982ad569b9 Merge remote-tracking branch 'origin/3.1' 2014-04-22 12:09:51 +12:00
camfindlay
a0607845e4 FIX - missing link url for composer
My bad, have amended this.
2014-04-08 13:21:05 +12:00
camfindlay
026e4be429 Info about getting set up using composer and MAMP
Added by request of Gábor Novoszádi from community feedback and thanks to the gist from @kkirsche. I have supplied a link to the gist as it is well written, with permission we may look to rework for direct inclusion at some point :)
2014-04-07 21:59:43 +12:00
Simon Welsh
d431e98ecf Merge branch '3.1'
Conflicts:
	forms/Form.php
	forms/FormField.php
	security/Member.php
	security/MemberLoginForm.php
2014-03-10 22:58:49 +13:00
Simon Welsh
0e0597f8cd Merge branch '3.0' into 3.1
Conflicts:
	control/Director.php
	dev/Backtrace.php
	docs/en/installation/nginx.md
	model/HTMLValue.php
	tests/model/SQLQueryTest.php
2014-03-10 22:56:27 +13:00
Simon Welsh
21f462a77b Update nginx.md
Provides a nginx.conf that follows nginx good practices and duplicates the functionality of
the .htaccess files in framework, cms and installer.
2014-03-10 22:48:22 +13:00
Tim Snadden
07ca70fce4 Update composer.md 2014-03-10 11:13:19 +13:00
Sander van Dragt
ced49d9090 Better visibility of key phrasing 2014-02-19 11:25:44 +00:00
Tom Densham
f2568f8489 FIX Requirement documentation of MySQL driver
Currently the documentation states that the `mysql` module for PHP is required, however as of #84 (over 2 years ago) this is no longer the case and the required module is now `mysqli`.
2014-02-18 23:06:29 +13:00
Ingo Schommer
d8361f9d3f Merge remote-tracking branch 'origin/3.1' 2014-02-18 22:06:59 +13:00
Tom Densham
8b3d74ed0f FIX Requirement documentation of MySQL driver
Currently the documentation states that the `mysql` module for PHP is required, however as of #84 (over 2 years ago) this is no longer the case and the required module is now `mysqli`.
2014-02-14 13:29:54 +00:00
Ingo Schommer
4af9143d3b Merge remote-tracking branch 'origin/3.1'
Conflicts:
	docs/en/misc/contributing/code.md
2014-02-07 16:43:22 +13:00
Ingo Schommer
1e2a2ca969 Merge pull request #2831 from silverstripe-rebelalliance/fixingURLs
NEW: Updating out of date URLs in the framework source code and docs
2014-02-07 16:16:24 +13:00
Kirk Mayo
632884252b NEW: Updating out of date URLs in the framework source code and docs 2014-02-07 15:10:44 +13:00
Ingo Schommer
620ee834d0 Docs for whitespace fixes 2014-02-07 11:57:06 +13:00
Ingo Schommer
6176d65bd2 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	forms/gridfield/GridFieldSortableHeader.php
	model/DataList.php
	model/fieldtypes/Enum.php
2013-12-02 20:49:34 +01:00
Martin D.
b75064c09c Update server-requirements.md
Typo fix
2013-11-20 11:40:00 -05:00
Andrew Short
bedf292612 Merge branch '3.1'
Conflicts:
	docs/en/reference/execution-pipeline.md
	lang/nl.yml
2013-11-11 18:18:25 +11:00
Loz Calver
01746d175a Update docs to consistently use http://localhost/ (fixes #1919) 2013-10-23 20:24:52 +01:00
colymba
f89f203392 Raised minimum PHP Veresion to 5.3.3 2013-10-23 11:10:42 +03:00
Andrew Short
688d853a95 Merge pull request #2555 from halkyon/readme_fixes
Use quotes around composer require argument for some shells.
2013-10-16 18:38:58 -07:00
Sean Harvey
d7e1a1c45f Use quotes around composer require argument for some shells.
The asterisk is a reserved character in some shells and will cause an error
if you don't put quotes around the argument, as it will be interpreted.
2013-10-17 14:36:34 +13:00
Ingo Schommer
902c8db859 FAQ docs about composer install vs. archives
See http://www.silverstripe.org/installing-silverstripe/show/21447?start=8#post324638
2013-10-04 11:21:04 +02:00
Che Van Lawrence
657c2033ae Improve docs (mostly spelling) 2013-05-29 18:23:25 +02:00
Nightjar
5ec8158977 Check that Webserver is not Apache/1.x in light of installer assets/.htaccess alterations 2013-05-25 20:03:36 +12:00
Che Van Lawrence
ec8eeeb07a Update common-problems.md 2013-05-25 11:50:31 +12:00
Che Van Lawrence
b6b13c1adf Update common-problems.md 2013-05-25 11:49:22 +12:00
Che Van Lawrence
2acf91a1bd Update common-problems.md 2013-05-25 11:48:09 +12:00
Che Van Lawrence
51f11869a8 Update server-requirements.md 2013-05-25 11:41:00 +12:00
Stephen Shkardoon
45462baff1 Fix misleading composer link
Fix misleading composer link
2013-05-25 10:41:56 +12:00
Ingo Schommer
3b02d22989 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	dev/CsvBulkLoader.php
2013-05-09 10:34:20 +02:00
Christian Lohmaier
26ed69508a fix nginx documentation to one that actually works :-)
example configuration wuldn't allow to install silverstripe, as
install.php does exist as a regular file (and that was ignored in the
old version of the documentation)
Similarily, the last rule in the htaccess snippet that should allow the
access to the tinymce php files were never applied, as a previously
listed regex did match and denied access. Even if it would have taken
effect: as those files do exist on disk, they would have been handed out
as-is and not been interpreted by php.
Also the statement regarding accidental/exploitable execution of
arbitrary php was misleading (and to some degree even wrong) in the old
context.

squashed commit as per pr#1791
2013-04-23 12:37:25 +02:00
Ingo Schommer
f86ca423ca Added --no-update hint to composer docs 2013-04-18 16:08:08 +02:00
Ingo Schommer
59dc0085d8 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	docs/en/reference/urlvariabletools.md
	tests/forms/CheckboxFieldTest.php
2013-04-12 01:13:32 +02:00
Ingo Schommer
a68fb1f096 Fixed /admin/pages/publishall link in docs 2013-04-09 23:00:27 +02:00
Jeremy Shipman
f88fcec2a4 Update composer.md
Fixed small typos
2013-04-03 15:16:35 +13:00
Ingo Schommer
c08ab18c03 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	.travis.yml
	admin/javascript/LeftAndMain.AddForm.js
	docs/en/reference/requirements.md
2013-04-02 02:00:50 +02:00
Ingo Schommer
42a422775e Fixed path in docs 2013-03-24 22:47:01 +01:00
Ingo Schommer
3334eafcb1 API Marked statics private, use Config API instead (#8317)
See "Static configuration properties are now immutable, you must use Config API." in the 3.1 change log for details.
2013-03-24 17:20:53 +01:00
Ingo Schommer
63c8441410 Merge remote-tracking branch 'origin/3.0' into 3.1
Conflicts:
	admin/javascript/LeftAndMain.js
2013-03-21 00:11:17 +01:00
Ingo Schommer
72d5f3cf17 Composer contribution fork/upstream docs (fixes #8332) 2013-03-20 11:37:41 +01:00
Ingo Schommer
250834d9d2 Updated browser requirements, dropping IE7 support
See https://groups.google.com/forum/?fromgroups=#!topic/silverstripe-dev/GahZfDLvb-I
2013-03-18 14:33:43 +01:00
Ingo Schommer
a61f5c1244 Fixed composer docs 2013-02-25 12:23:56 +01:00
Ingo Schommer
44cc467fc7 Note about vendor prefixes 2013-02-25 11:58:12 +01:00
Ingo Schommer
567e39cd19 Updated composer docs 2013-02-25 11:47:11 +01:00
Ingo Schommer
094db0f4ab Fixed composer install instructions
We've switched the installer to use @stable flags by default,
so those need to be explicitly removed when checking out a dev version.
2013-02-20 13:25:44 +01:00
drzax
fc0a81fef4 Update docs/en/installation/composer.md
No need to talk down to people in documentation.
2013-02-19 11:19:50 +10:00
Hamish Friedlander
acfc0be471 Document that yaml files shouldnt be served directly 2013-01-29 14:11:52 +13:00