Simon Welsh fbce9fd7cd Merge branch '3.1' ...

Conflicts:
	.travis.yml
	docs/en/misc/contributing/code.md
	javascript/HtmlEditorField.js

2013-07-05 10:22:58 +12:00

..

jquery-ondemand

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +13:00

lang

NEW UploadField displays a warning before overwriting files (only relevant if config.yml: Upload:replaceFile = true).

2013-05-25 19:07:06 +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 GridField action onclick assuming URL without "?" character

2013-05-15 15:49:23 +12:00

HtmlEditorField.js

Merge branch '3.1'

2013-07-05 10:22:58 +12:00

i18n.js

Add codesniffer that ensures indentation is with tabs.

2012-12-12 17:33:31 +13:00

i18nx.js

ENHANCEMENT: change those harded-coded 'sapphire' to 'framework' either in javascript code or inline document, or a <a> href propty.

2012-10-05 17:00:39 +13:00

InlineFormAction.js

MINOR Fixed js accessor (thanks AngryPHPNerd)

2012-02-16 23:07:24 +01:00

PermissionCheckboxSetField.js

ENHANCEMENT: open/7881 - removed disabled checkboxes and replaced them with green ticks. Added help text above the list of permissions. Removed action buttons by fade out when user goes to users permissions tab.

2012-09-28 16:37:35 +02:00

SelectionGroup.js

API Removed keyed arrays for title/value setting in SelectionGroup

2012-12-11 11:06:06 +01:00

TabSet.js

API Allow ignoring persistent tab state through entwine property.

2012-12-13 17:43:25 +01:00

ToggleCompositeField.js

Set 'active' correctly for accordion widget

2012-12-18 23:22:37 -08:00

ToggleField.js

BUG Fixing ToggleField to work correctly with jQuery

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

TreeDropdownField.js

Merge remote-tracking branch 'origin/3.0' into 3.1

2013-06-19 14:03:43 +02:00

UploadField_downloadtemplate.js

API UploadField functions on new records

2013-05-27 15:22:59 +12: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 branch '3.1'

2013-07-05 10:22:58 +12:00