silverstripe-framework/javascript
Damian Mooyman 88fdc75456 Merge remote-tracking branch 'composer/3.1' into 3
Conflicts:
	.editorconfig
	docs/en/00_Getting_Started/00_Server_Requirements.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_IIS7.md
	docs/en/00_Getting_Started/01_Installation/04_Other_installation_Options/Windows_Platform_Installer.md
	docs/en/00_Getting_Started/04_Directory_Structure.md
	docs/en/00_Getting_Started/index.md
	docs/en/01_Tutorials/01_Building_A_Basic_Site.md
	docs/en/01_Tutorials/02_Extending_A_Basic_Site.md
	docs/en/01_Tutorials/03_Forms.md
	docs/en/01_Tutorials/04_Site_Search.md
	docs/en/01_Tutorials/05_Dataobject_Relationship_Management.md
	docs/en/01_Tutorials/index.md
	docs/en/02_Developer_Guides/00_Model/01_Data_Model_and_ORM.md
	docs/en/02_Developer_Guides/00_Model/11_Scaffolding.md
	docs/en/02_Developer_Guides/01_Templates/06_Themes.md
	docs/en/02_Developer_Guides/03_Forms/How_Tos/Simple_Contact_Form.md
	docs/en/02_Developer_Guides/05_Extending/05_Injector.md
	docs/en/02_Developer_Guides/09_Security/04_Secure_Coding.md
	docs/en/02_Developer_Guides/10_Email/index.md
	docs/en/02_Developer_Guides/11_Integration/01_RestfulService.md
	docs/en/02_Developer_Guides/12_Search/01_Searchcontext.md
	docs/en/02_Developer_Guides/14_Files/index.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/03_CMS_Layout.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/06_Javascript_Development.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_CMS_Tree.md
	docs/en/02_Developer_Guides/15_Customising_the_Admin_Interface/How_Tos/Customise_Site_Reports.md
	docs/en/02_Developer_Guides/18_Cookies_And_Sessions/01_Cookies.md
	docs/en/04_Changelogs/3.1.9.md
	docs/en/05_Contributing/00_Issues_and_Bugs.md
	docs/en/05_Contributing/02_Release_Process.md
	docs/en/05_Contributing/03_Documentation.md
	filesystem/File.php
	filesystem/GD.php
	model/DataDifferencer.php
	model/Versioned.php
	security/BasicAuth.php
	security/Member.php
	tests/filesystem/FileTest.php
	tests/forms/uploadfield/UploadFieldTest.php
	tests/model/VersionedTest.php
	tests/security/BasicAuthTest.php
2015-01-15 18:52:46 +13:00
..
jquery-ondemand FIX: IE8 support in jquery.ondemand.js (fixes #2872) 2014-02-19 16:57:27 +00:00
lang Update translations 2015-01-12 17:54:49 +13:00
tree Add codesniffer that ensures indentation is with tabs. 2012-12-12 17:39:34 +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-11 10:19:00 +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 'composer/3.1' into 3 2015-01-15 18:52:46 +13: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