tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity
19549d620f
silverstripe-framework/templates
History
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
..
email Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
forms Revert #3358 2014-08-04 12:13:19 +12:00
Includes Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00
AssetUploadField.ss BUGFIX:fixed styling of asset upload page and dialog in the asset admin and media insert via WYSIWYG editor open/8231. 2013-02-04 14:15:27 +13:00
BlankPage.ss MINOR HTML5 for BlankPage.ss default template 2012-04-13 15:32:05 +02:00
Controller.ss Fix typo in templates/Controller.ss 2013-01-23 23:55:34 +01:00
GridFieldDetailForm.ss API CHANGE: Renaming of gridfield components #6921 2012-03-09 12:54:02 +13:00
HtmlEditorField_UploadField.ss BUGFIX:fixed styling of asset upload page and dialog in the asset admin and media insert via WYSIWYG editor open/8231. 2013-02-04 14:15:27 +13:00
Image_iframe.ss Merge remote-tracking branch 'origin/3.0' into 3.1 2013-08-07 17:14:47 +02:00
RightLabelledFieldHolder.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
RSSFeed.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
SapphireInfo.ss API-CHANGE sapphire folder can now be renamed. 2012-04-15 10:50:19 +12:00
SearchForm.ss Updated loop/if/with to be more consistent 2013-07-14 20:43:52 +12:00
UploadField_FileEdit.ss ENHANCEMENT New UploadField class to replace FileIframeField, ImageField and SimpleImageField 2012-02-03 01:00:08 +01:00
UploadField.ss FIX: Defer loading of UploadField EditForm iframes (fixes #2711) 2013-12-19 09:11:31 +00:00