scott1702 7580d35be8 Fix ability to edit files immeditately after upload ...

Conflicts:
	javascript/dist/UploadField.js

2016-04-05 22:38:55 +12:00

..

AssetUploadField.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

ConfirmedPasswordField.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

DateField.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

GridField.js

Implement client-side routing with Page.js

2016-04-01 13:45:14 +13:00

HtmlEditorField.js

API TinyMCE Image shortcodes

2016-03-21 09:23:40 +13:00

i18n.js

FIX Inserting a 'Download a file' without selecting an image

2016-03-11 00:35:13 +00:00

i18nx.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

InlineFormAction.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

jQuery.js

Tidy grunt file

2016-03-28 21:02:15 +13:00

PermissionCheckboxSetField.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

router.js

BUG Fix error when using search bar

2016-04-05 17:10:21 +12:00

SelectionGroup.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

TabSet.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

TinyMCE_SSPlugin.js

API Move ss buttons plugin out of thirdparty

2016-03-21 13:51:33 +13:00

ToggleCompositeField.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

ToggleField.js

API Update TinyMCE to 4.x

2016-02-23 10:10:02 +13:00

TreeDropdownField.js

Merge remote-tracking branch 'origin/3.3'

2016-03-04 17:06:04 +13:00

UploadField_downloadtemplate.js

API Update TinyMCE to 4.x

2016-02-23 10:10:02 +13:00

UploadField_select.js

API Update TinyMCE to 4.x

2016-02-23 10:10:02 +13:00

UploadField_uploadtemplate.js

API Update TinyMCE to 4.x

2016-02-23 10:10:02 +13:00

UploadField.js

Fix ability to edit files immeditately after upload

2016-04-05 22:38:55 +12:00