Damian Mooyman 1e1a7a345c Merge remote-tracking branch 'origin/3' ...

Conflicts:
	control/Director.php
	filesystem/File.php
	filesystem/GD.php
	filesystem/ImagickBackend.php
	forms/HtmlEditorField.php
	javascript/UploadField_uploadtemplate.js
	model/Image.php
	model/Image_Backend.php
	model/fieldtypes/Enum.php
	templates/AssetUploadField.ss
	tests/model/ImageTest.php
	tests/search/FulltextFilterTest.php

2015-11-03 14:23:16 +13:00

..

jquery-ondemand

FIX: IE8 support in jquery.ondemand.js (fixes #2872)

2014-02-19 16:57:27 +00:00

lang

Send user to new area when inserting url

2015-10-29 11:37:59 +13: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

Update DateField.js

2015-08-27 16:50:25 -04:00

GridField.js

Merge remote-tracking branch 'origin/3'

2015-11-03 14:23:16 +13:00

HtmlEditorField.js

Merge remote-tracking branch 'origin/3'

2015-11-03 14:23:16 +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

Add three column layout to Page content view

2015-07-02 10:22:24 +12:00

ToggleCompositeField.js

BUG Fix accordion sometimes displaying scrollbars

2015-04-14 13:18:57 +12:00

ToggleField.js

BUG Fixing ToggleField to work correctly with jQuery

2012-11-16 11:33:58 +13:00

TreeDropdownField.js

FIX TreeDropdownField doesnt change label on unselect

2015-06-11 16:14:08 +01:00

UploadField_downloadtemplate.js

Merge remote-tracking branch 'origin/3'

2015-11-03 14:23:16 +13:00

UploadField_select.js

FIX: Update references to ID values from 79c9433

2013-05-26 11:11:55 +12:00

UploadField_uploadtemplate.js

Merge remote-tracking branch 'origin/3'

2015-11-03 14:23:16 +13:00

UploadField.js

Send user to new area when inserting url

2015-10-29 11:37:59 +13:00