Go to file
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
_config Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
.tx API JS i18n files with short locale names, generated by build task 2013-10-25 12:05:46 +02:00
admin Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
api Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
cache Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
cli Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
conf Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
control Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
core Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
css Tweak UploadField width for better alignment 2015-07-16 11:09:08 -07:00
dev Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
docs Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
email Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
filesystem Moving MP4 from audio category to movie Fix #4370 2015-07-08 15:58:38 +02:00
forms Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
i18n Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
images BUG: Display of AssetUpload upload fields 2013-05-25 18:01:07 +12:00
javascript Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 11:24:25 +12:00
lang Update translations 2015-06-19 18:18:00 +12:00
model Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
oembed Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
parsers Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
scss Tweak UploadField width for better alignment 2015-07-16 11:09:08 -07:00
search Merge remote-tracking branch 'origin/3.1' into 3 2015-03-11 11:40:06 +13:00
security Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
src/SilverStripe/Framework/Injector NEW: Allow specifying a factory to use for creating services. 2014-02-03 11:30:22 +11:00
tasks Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
templates Merge remote-tracking branch 'origin/3.1' into 3 2015-06-17 11:24:25 +12:00
tests Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
thirdparty Merge remote-tracking branch 'origin/3.1' into 3 2015-06-02 19:13:38 +12:00
view Set deprecation level for all changes in 3.x to 4.0 2015-06-19 13:07:41 +12:00
_config.php Removing redundant aggregatestore cache config (#3404) 2014-08-21 09:13:28 +12:00
_register_database.php Remove all redundant whitespace 2014-08-19 09:17:15 +12:00
.editorconfig Adding .editorconfig file 2014-12-02 15:13:55 +00:00
.gitattributes FIX: docs not included in composer package installs (through export-ignore git attribute) 2015-06-19 12:01:41 +01:00
.gitignore ENHANCEMENT Message colours updated 2012-11-06 13:23:20 +13:00
.htaccess API: Remove static main and dev/buildcache 2012-09-21 19:56:56 +12:00
.scrutinizer.yml Added better Scrutinizer support 2015-05-12 23:27:36 +12:00
.travis.yml Merge branch '3.1' into 3.2 2015-07-20 10:48:01 +01:00
cli-script.php Merge remote-tracking branch 'origin/3.1' into 3 2015-02-20 10:17:19 +13:00
composer.json Update composer.json 2015-07-03 17:21:04 +01:00
config.rb Set default encoding for compass 2013-10-30 16:11:11 +00:00
CONTRIBUTING.md Add note about semvar to contributing.md 2014-12-04 12:14:18 +13:00
main.php Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
main.php5 MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
README.md Adding dependency badge and reference badge 2015-06-03 08:57:07 +12:00
sake Fix sake not checking all the locations for cli-script.php 2013-12-21 12:33:48 +13:00
silverstripe_version API CHANGE silverstripe_version file now contains the plain version number, rather than an SVN path 2012-02-01 18:42:21 +01:00
web.config Improve IIS security 2015-05-11 12:01:30 +12:00

SilverStripe Framework

Build Status Latest Stable Version Latest Unstable Version Total Downloads License Dependency Status Reference Status

PHP5 framework forming the base for the SilverStripe CMS (http://silverstripe.org). Requires a silverstripe-installer base project. Typically used alongside the cms module.

Installation

See installation on different platforms, and installation from source.

Bugtracker

Bugs are tracked on github.com. Please read our issue reporting guidelines.

Development and Contribution

If you would like to make changes to the SilverStripe core codebase, we have an extensive guide to contributing code.

License

Copyright (c) 2006-2014, SilverStripe Limited - www.silverstripe.com
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

    * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
    * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the 
      documentation and/or other materials provided with the distribution.
    * Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote products derived from this software 
      without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE 
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE 
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
OF SUCH DAMAGE.

Attribution