Go to file
Ingo Schommer 312850aee9 Merge branch 'master' into integration
Conflicts:
	admin/css/screen.css
	admin/scss/_style.scss
2012-02-24 00:32:30 +01:00
admin Merge branch 'master' into integration 2012-02-24 00:32:30 +01:00
api Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
cache Merge branch '2.4' 2011-02-14 18:47:53 +13:00
cli MINOR Removing executable flag from all files (thanks miiihi) 2011-09-18 22:04:02 +02:00
conf Change path directory in comment 2011-04-26 23:45:34 -04:00
control BUGFIX Fixed undefined method suser_error() in Cookie::set() 2012-02-16 14:59:56 +13:00
core BUGFIX Convert::html2raw() not correctly stripping script and style tags 2012-02-15 07:55:52 +13:00
css BUGFIX Changed CSS class structure of GridField to avoid duplication of ".ss-gridfield" selector in different contexts, and make selectors less verbose (no more "fieldset.ss-gridfield"). Added "field" class to GridField container to ensure it displays correctly alongside other form fields (mainly around margins and paddings) 2012-02-23 23:29:58 +01:00
dev Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
docs API CHANGE Removed prototype.js style $() alias usage for document.getElementById() to avoid confusion with the more common jQuery() alias. 2012-02-16 12:27:47 +01:00
email Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
filesystem API CHANGE Moved AssetAdmin-specific fields from Folder->getCMSFields() to AssetAdmin->getEditForm(). For modifying those fields via DataExtension, please use AssetAdmin->updateEditForm() instead 2012-02-23 23:29:57 +01:00
forms MINOR Added CSS class for identifying column in GridFieldDefaultColumns 2012-02-23 23:29:58 +01:00
i18n Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
images ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
javascript Merge remote-tracking branch 'silverstripe-scienceninjas/pull/SSF-12' 2012-02-23 23:38:29 +01:00
lang Clean up of trailing ?> per coding standard 2012-02-12 12:41:04 -08:00
model Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
parsers Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
scss BUGFIX Changed CSS class structure of GridField to avoid duplication of ".ss-gridfield" selector in different contexts, and make selectors less verbose (no more "fieldset.ss-gridfield"). Added "field" class to GridField container to ensure it displays correctly alongside other form fields (mainly around margins and paddings) 2012-02-23 23:29:58 +01:00
search Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
security ENHANCEMENT Using native jQuery UI buttons and icon styling for a less coupled implementation (e.g. assuming that a "constructive" button always has a specific icon, or one at all). All CMS UI buttons switched to use <button> markup, which allows for inline icons and correctly aligned multi-line button labels. 2012-02-17 15:58:32 +01:00
tasks Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
templates MINOR AssetUploadField styling 2012-02-23 18:39:42 +01:00
tests MINOR Added CSS class for identifying column in GridFieldDefaultColumns 2012-02-23 23:29:58 +01:00
thirdparty BUGFIX Removed tinymce-advcode plugin which breaks with new TinyMCE and newer browsers. Both the plugin and the underlying 'codepress' engine are unmaintained. Fall back to standard (non-highlighted) TinyMCE <textarea> editing (fixes #6779) 2012-02-11 01:08:04 +01:00
view Reset ... 2012-01-17 00:57:39 +01:00
_config.php API CHANGE: Remove deprecated db/build. 2011-10-29 17:44:56 +13:00
_register_database.php MINOR: repair installer for sqlite (from r109787) 2010-10-19 01:26:27 +00:00
.gitignore ENHANCEMENT Renamed DataGrid to GridField 2011-10-28 16:35:39 +13:00
.htaccess BUGFIX Disallow web access to sapphire/silverstripe_version to avoid information leakage 2010-12-09 22:53:24 +00:00
cli-script.php Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
config.rb MINOR Using SCSS/Compass for sapphire/css 2012-01-08 19:14:32 +01:00
main.php BUGFIX Set default mbstring encoding in Core.php instead of main.php and cli-script.php so phpunit binary test runs behave consistently (same as running through TestRunner+cli-script.php). Fixes URLSegmentFilterTest 2011-12-04 13:32:03 +01:00
main.php5 MINOR phpdoc documentation 2009-03-22 22:59:14 +00: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 ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
sake MINOR: Make sake executable 2012-01-10 11:10:38 +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
static-main.php Clean up trailing ?> per coding standard 2012-02-12 12:40:16 -08:00
web.config BUGFIX Disallow web access to sapphire/silverstripe_version to avoid information leakage 2010-12-09 22:53:24 +00:00

Overview

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.

License

Copyright (c) 2007-2011, 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