silverstripe-framework/javascript
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
..
jquery-ondemand FIX: IE8 support in jquery.ondemand.js (fixes #2872) 2014-02-19 16:57:27 +00:00
lang Update translations 2014-08-05 15:02:18 +12:00
tree Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:33:31 +13:00
AssetUploadField.js NEW Show the allowed extensions as a toggle tip as per trac 7993 2012-12-19 17:00:39 +01:00
ConfirmedPasswordField.js FIX: Disable autocomplete on ConfirmedPasswordField instances. 2013-05-10 20:32:59 +12:00
DateField.js DateField.js event selector regression (fixes #1528) 2013-04-16 09:54:30 +02:00
GridField.js BUG Fix several issues around onmatch/onunmatch entwines. 2014-07-17 14:14:52 +12:00
HtmlEditorField.js Merge remote-tracking branch 'origin/3.1' 2014-08-14 09:08:26 +12:00
i18n.js API New JS sprintf and inject replacement functions 2014-06-05 22:47:49 +03:00
i18nx.js API New JS sprintf and inject replacement functions 2014-06-05 22:47:49 +03:00
InlineFormAction.js MINOR Fixed js accessor (thanks AngryPHPNerd) 2012-02-16 23:07:24 +01:00
PermissionCheckboxSetField.js BUGFIX: Fix JS for PermissionCheckboxsetField in SecurityAdmin 2014-01-15 15:51:35 +13:00
SelectionGroup.js API Removed keyed arrays for title/value setting in SelectionGroup 2012-12-11 11:06:06 +01:00
TabSet.js BUG Fix several issues around onmatch/onunmatch entwines. 2014-07-17 14:14:52 +12:00
ToggleCompositeField.js BUG Fix several issues around onmatch/onunmatch entwines. 2014-07-17 14:14:52 +12:00
ToggleField.js BUG Fixing ToggleField to work correctly with jQuery 2012-11-16 11:33:58 +13:00
TreeDropdownField.js BUG Add a synthetic event to workaround IE8 issues. 2014-07-31 15:38:47 +12:00
UploadField_downloadtemplate.js FIX UploadField validation error and styles 2014-01-04 22:30:35 +02:00
UploadField_select.js FIX: Update references to ID values from 79c9433 2013-05-26 11:11:55 +12:00
UploadField_uploadtemplate.js API UploadField functions on new records 2013-05-27 15:22:59 +12:00
UploadField.js Merge remote-tracking branch 'origin/3.1' 2014-11-18 12:45:54 +13:00