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-changetracker

API Change tracker allows explicit dirty messages

2013-10-24 17:53:40 +13:00

jquery-fitheighttoparent

MINOR Removing executable flag from all files (thanks miiihi)

2011-09-18 22:04:02 +02:00

lang

Merge remote-tracking branch 'origin/3.2' into 3

2015-11-03 13:06:39 +13:00

CMSSecurity.js

API Enable re-authentication within the CMS if a user session is lost

2014-10-14 15:19:48 +13:00

leaktools.js

ENHANCEMENT: In dev mode, include some basic leak detection functions in the admin panel

2012-06-15 01:19:19 +02:00

LeftAndMain.ActionTabSet.js

Don't try to unbind events from inside top-level iframes

2015-11-01 06:14:30 +13:00

LeftAndMain.BatchActions.js

BUG Fix bulk actions making sitetree unclickable

2015-08-21 16:24:13 +12:00

LeftAndMain.Content.js

BUG: Clicking icon in site tree link fails

2015-05-27 09:22:42 -07:00

LeftAndMain.EditForm.js

FIX: Issues with field focus in edit forms (fixes #4621)

2015-09-23 15:19:24 +01:00

LeftAndMain.FieldDescriptionToggle.js

Add toggleable description to CMS fields

2015-04-24 11:40:29 +12:00

LeftAndMain.FieldHelp.js

BUG Fix several issues around onmatch/onunmatch entwines.

2014-07-17 14:14:52 +12:00

LeftAndMain.js

update cms notifications

2015-09-02 15:47:48 +12:00

LeftAndMain.Layout.js

Disable split view mode when not enough room

2015-09-15 10:28:37 +12:00

LeftAndMain.Menu.js

Merge branch '3.1' into 3.2

2015-07-20 10:48:01 +01:00

LeftAndMain.Panel.js

BUG Fix JS error on clicking collapsed panel

2015-08-24 17:36:29 +12:00

LeftAndMain.Ping.js

BUG Fixing session keep alive for non-ADMIN users

2012-11-05 15:41:10 +13:00

LeftAndMain.Preview.js

Disable split view mode when not enough room

2015-09-15 10:28:37 +12:00

LeftAndMain.Tree.js

Merge remote-tracking branch 'origin/3.2' into 3

2015-11-03 13:06:39 +13:00

LeftAndMain.TreeDropdownField.js

FIX 7763 TreeDropdownField needs to refresh after CMS edit form save

2012-08-29 10:52:56 +12:00

lib.js

Fixed JS error in lib.js (fixes #3481)

2015-02-11 16:59:53 +00:00

MemberDatetimeOptionsetField.js

BUG Fix several issues around onmatch/onunmatch entwines.

2014-07-17 14:14:52 +12:00

MemberImportForm.js

BUGFIX: add missing onunmatches

2012-05-23 16:24:15 +12:00

ModelAdmin.js

FIX Properly show link for showing and hiding class spec in model admin

2013-01-15 18:52:05 +13:00

SecurityAdmin.js

Merge remote-tracking branch 'origin/3.1'

2014-02-04 08:19:04 +13:00

ssui.core.js

Move 'upload new file' section to main files area

2015-09-28 12:02:33 +13:00