1
0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Go to file
Ingo Schommer 88536998b9 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	.travis.yml
2013-05-31 18:08:59 +02:00
_config Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
admin NEW: Add LeftAndMain.session_keepalive_ping config option. 2013-05-31 16:27:30 +12:00
api Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-09 10:34:20 +02:00
cache Coding conventions. Tidy up of PHPDoc formatting. 2013-05-12 12:39:37 +12:00
cli API Marked statics private, use Config API instead () 2013-03-24 17:20:53 +01:00
conf Allow SS_DATABASE_NAME in _ss_environment.php configuration 2013-04-22 14:14:32 +02:00
control Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
core FIX: error message doesn't always include class name 2013-05-25 14:43:40 +12:00
css Fixed UploadField width (same as textual fields) 2013-05-29 17:25:46 +02:00
dev Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
docs Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
email Check for $bounceAddress before using (fixes ) 2013-04-05 11:46:15 +02:00
filesystem New video formats in allowed_extensions 2013-05-29 18:22:47 +02:00
forms Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
i18n Merge pull request from simonwelsh/short-array-parse 2013-05-06 20:32:51 -07:00
images BUG: Display of AssetUpload upload fields 2013-05-25 18:01:07 +12:00
javascript BUG Fixing missing </div> and </button> in UploadField_uploadtemplate 2013-05-27 22:40:22 +12:00
lang API UploadField functions on new records 2013-05-27 15:22:59 +12:00
model Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
oembed BUG: Classes applied to media are too generic to use 2013-05-25 17:29:25 +12:00
parsers Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-17 13:51:54 +02:00
scss Fixed UploadField width (same as textual fields) 2013-05-29 17:25:46 +02:00
search API Make DataList and ArrayList immutable 2012-12-14 13:30:35 +13:00
security Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
tasks This is a fixed version for RegenerateCachedImagesTask (former FlushGeneratedImagesTask) such that it regenerates images instead of silently removing them and breaking existing pages 2013-04-06 15:56:27 +02:00
templates Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
tests Merge remote-tracking branch 'origin/3.1' 2013-05-31 18:08:59 +02:00
thirdparty OEmbed resize on correct attrs (fixes ) 2013-05-25 01:26:34 +02:00
view FIX: exclude directory from available themes when underscore is first character 2013-05-23 16:49:35 +01:00
_config.php Increased deprecation notification version 2013-03-20 11:53:09 +01:00
_register_database.php FIX Remove instances of lines longer than 120c 2012-09-30 17:18:13 +13: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 Add code-sniffs other than line length to scrutinizer 2013-05-23 10:39:01 +12:00
.travis.yml Removes PHPCS env from Travis build 2013-05-23 19:05:46 +12:00
cli-script.php NEW: More helpful message for 'sake dev/build' on new envs. 2013-05-30 16:49:43 +12:00
composer.json Merge branch '3.1' 2013-05-23 19:01:58 +12:00
config.rb MINOR Using SCSS/Compass for sapphire/css 2012-01-08 19:14:32 +01:00
CONTRIBUTING.md Added github-compatible contributing notes 2012-10-11 17:20:00 +02:00
main.php API Marked statics private, use Config API instead () 2013-03-24 17:20:53 +01:00
main.php5 MINOR Update @package values to match renaming sapphire 2012-04-15 10:50:19 +12:00
Makefile ENHANCEMENT Allowing JSTestDriver execution in tests/javascript/ by adding bash scripts and new Makefile command ("make jasmine") 2011-03-22 18:05:43 +13:00
README.md Merge branch '3.1' 2013-05-23 19:01:58 +12:00
sake Search parent folders in sake for SilverStripe installation. 2013-02-23 16:41:43 +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 BUGFIX Disallow web access to sapphire/silverstripe_version to avoid information leakage 2010-12-09 22:53:24 +00:00

SilverStripe Framework

Build 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) 2007-2013, 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