tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
16,397 Commits 29 Branches 510 Tags 146 MiB
Commit Graph

27 Commits

Author SHA1 Message Date
Daniel Hensby 24ea2638fe
Create licence file so that GitHub (and humans) can more easily find it 2018-02-12 11:21:03 +00:00
Robert Reiz 747e87baeb Adding dependency badge and reference badge 2015-06-03 08:57:07 +12:00
Damian Mooyman 0b1f297873 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	.travis.yml
	README.md
	admin/code/LeftAndMain.php
	admin/css/screen.css
	admin/scss/screen.scss
	api/RestfulService.php
	conf/ConfigureFromEnv.php
	control/injector/ServiceConfigurationLocator.php
	control/injector/SilverStripeServiceConfigurationLocator.php
	core/ClassInfo.php
	core/Object.php
	css/AssetUploadField.css
	css/ComplexTableField_popup.css
	dev/CSSContentParser.php
	dev/DevelopmentAdmin.php
	docs/en/changelogs/index.md
	docs/en/misc/contributing/code.md
	docs/en/reference/execution-pipeline.md
	filesystem/GD.php
	filesystem/ImagickBackend.php
	filesystem/Upload.php
	forms/Form.php
	forms/FormField.php
	forms/HtmlEditorConfig.php
	forms/gridfield/GridFieldDetailForm.php
	forms/gridfield/GridFieldSortableHeader.php
	lang/en.yml
	model/Aggregate.php
	model/DataList.php
	model/DataObject.php
	model/DataQuery.php
	model/Image.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	model/fieldtypes/HTMLText.php
	model/fieldtypes/Text.php
	scss/AssetUploadField.scss
	search/filters/SearchFilter.php
	security/Authenticator.php
	security/LoginForm.php
	security/Member.php
	security/MemberAuthenticator.php
	security/MemberLoginForm.php
	security/Security.php
	tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php
	tests/control/HTTPTest.php
	tests/control/RequestHandlingTest.php
	tests/filesystem/UploadTest.php
	tests/forms/FormTest.php
	tests/forms/NumericFieldTest.php
	tests/model/DataListTest.php
	tests/model/DataObjectTest.php
	tests/model/TextTest.php
	tests/security/MemberAuthenticatorTest.php
	tests/security/SecurityDefaultAdminTest.php
	tests/view/SSViewerCacheBlockTest.php
	tests/view/SSViewerTest.php
 2014-11-18 12:45:54 +13:00
Sam Minnee b99288db04 MINOR: Fixed copyright year 2014-09-18 13:13:38 +12:00
Sean Harvey aa8c4fd004 Adding some README badges for downloads, license and stable version. 2014-09-09 09:28:43 +12:00
Simon Welsh 28d9b16325 Correct source of Travis status image 2014-07-11 10:36:41 +10:00
Simon Welsh fbce9fd7cd Merge branch '3.1' 
Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js
 2013-07-05 10:22:58 +12:00
Dan Brooks 409be9a840 Fixed broken github issue tracker link 2013-07-04 16:41:53 +01:00
Sam Minnee d97ca43cd0 Merge branch '3.1' 
Conflicts:
	README.md
	dev/install/install.php5
	forms/ConfirmedPasswordField.php
	tests/forms/FormTest.php
 2013-05-23 19:01:58 +12:00
Ingo Schommer a87bbb2903 Updated github path 2013-05-17 00:45:52 +02:00
Ingo Schommer ef3d974821 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	docs/en/misc/contributing/issues.md
 2013-04-02 02:05:58 +02: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 f5754c11aa Contribution guidelines, new bugtracker links 2013-04-02 01:51:40 +02:00
Ingo Schommer 1b83e489ef Updated bugtracker links 2013-04-02 01:19:28 +02:00
Ingo Schommer ce66bc1eaf Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	tests/travis/before_script
 2013-02-27 13:34:03 +01:00
ajshort 9920e5bc45 Update the Travis build versions to 3.1. 2013-02-27 20:36:18 +11:00
Hamish Friedlander 5edf86fe7a Merge branch '3.0.3' into 3.0 2012-11-16 14:57:50 +13:00
Stig Lindqvist cf11892ab2 Updated license in readme to include year 2012 2012-11-13 22:32:31 +13:00
Ingo Schommer 05a44e8bfc Correct branch for Travis build status image 2012-11-09 13:21:28 +01:00
Ingo Schommer 28dce229a3 Build status in README 2012-10-16 18:26:20 +02:00
Sam Minnee 439339d4fc Broke up contributing docs into 4 sections and unified code contribtion guide. 
The guidelines for contributing code were scattered across a section of contributing.md and collaboration-on-git.md.  I've updated this to have separate contributing/code.md page with all the content in a single cohesive page.  We also have contributing/documentation.md, contributing/issues.md and contributing/translation.md.
 2012-10-09 14:53:39 +13:00
Simon Welsh 15a5dab395 MINOR: Add a fallback thumbnail image for oEmbed inserts 2012-05-25 15:40:17 +12:00
Simon Welsh 3a6341a251 API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
Ingo Schommer c0d187071a ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
Ingo Schommer a63215c6a5 MINOR Added README 2011-02-12 14:27:36 +13:00
Sam Minnee b59d12e16e MINOR: Removed README.md that was accidentally added. 
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88529 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 10:36:26 +00:00
Sam Minnee d6345b4c79 Added readme for github 
From: Sam Minnee <sam@silverstripe.com>

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88527 467b73ca-7a2a-4603-9d3b-597d59a354a9
 2009-10-11 10:31:02 +00:00