tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-25 05:59:23 +02:00
Code Issues Projects Releases Wiki Activity
11,615 Commits 29 Branches 515 Tags 147 MiB
PHP 99.4%
Scheme 0.5%
2160fb8000
Go to file
Ingo Schommer 2160fb8000 Merge remote-tracking branch 'origin/3.0' into 3.1 
Conflicts:
	admin/javascript/LeftAndMain.js
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php
	tests/control/ControllerTest.php
2013-06-19 14:03:43 +02:00
_config API UploadField functions on new records 2013-05-27 15:22:59 +12:00
admin Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-19 14:03:43 +02:00
api Merge remote-tracking branch 'origin/3.0' into 3.1 2013-05-09 10:34:20 +02:00
cache 2013-06-12 16:47:07 +02:00
cli API Marked statics private, use Config API instead (#8317) 2013-03-24 17:20:53 +01:00
conf Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-19 14:03:43 +02:00
control FIX: Ensure that actions inferred from templates with the "_action" suffix also respect allowed_actions. 2013-06-19 20:11:50 +12:00
core BUG Manually require SS_DAG in Core.php 2013-06-18 23:00:32 +02:00
css Merge pull request #2099 from chillu/pulls/insert-media-tweaks 2013-06-18 21:32:00 -07:00
dev Enforce 'dev' environment for test runs 2013-06-19 00:13:02 +02:00
docs Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-19 14:03:43 +02:00
email Fixed Email.admin_email config static naming 2013-03-27 13:41:24 +01:00
filesystem ENHANCEMENT: Allow programmers to set OwnerID for new files. 2013-06-14 18:30:09 +02:00
forms Merge pull request #2099 from chillu/pulls/insert-media-tweaks 2013-06-18 21:32:00 -07:00
i18n Fixed injector usage in i18nTextCollector 2013-06-02 23:30:33 +02:00
images BUG: Display of AssetUpload upload fields 2013-05-25 18:01:07 +12:00
javascript Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-19 14:03:43 +02:00
lang Updated translations 2013-06-03 00:07:59 +02:00
model REGRESSION: fixed background color for PaddedImage 2013-06-19 20:35:24 +12: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 Merge pull request #2099 from chillu/pulls/insert-media-tweaks 2013-06-18 21:32:00 -07:00
search FIX Allow filtering on joined columns 2013-06-15 12:06:24 +12:00
security Merge pull request #2077 from halkyon/changepassword_validation_redirection_issue 2013-06-07 22:44:13 -07:00
tasks NEW Merge i18nTextCollector with existing (fixes #1838) 2013-06-02 20:17:28 +02:00
templates API UploadField functions on new records 2013-05-27 15:22:59 +12:00
tests Merge remote-tracking branch 'origin/3.0' into 3.1 2013-06-19 14:03:43 +02:00
thirdparty OEmbed resize on correct attrs (fixes #1950) 2013-05-25 01:26:34 +02:00
view FIX: Ensure that actions inferred from templates with the "_action" suffix also respect allowed_actions. 2013-06-19 20:11:50 +12:00
_config.php Update the deprecation notification version to 3.1 2013-03-19 19:33:05 +11: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 MINOR: fix a couple minor typos 2013-06-18 18:28:46 +00:00
composer.json Merge remote-tracking branch 'origin/2.4' into 3.0 2013-05-17 00:37:30 +02: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 (#8317) 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 Updated github path 2013-05-17 00:45:52 +02:00
sake API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12: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

README.md

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.

Links

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