tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
11,305 Commits 29 Branches 513 Tags 147 MiB
Commit Graph

15 Commits

Author SHA1 Message Date
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
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