Damian Mooyman ca754eb887 Merge 3.3 into 3.4 ...

# Conflicts:
#	admin/javascript/lang/fa_IR.js
#	admin/javascript/lang/it.js
#	admin/javascript/lang/src/fa_IR.js
#	admin/javascript/lang/src/it.js
#	lang/cs.yml
#	lang/eo.yml
#	lang/fa_IR.yml
#	lang/fi.yml
#	lang/it.yml
#	lang/sk.yml

2016-08-05 16:48:26 +12:00

..

jquery-changetracker

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

jquery-fitheighttoparent

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

lang

Update translations

2016-08-05 11:06:51 +12: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

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

LeftAndMain.ActionTabSet.js

FIX for #5683: Address security warning in CMS when attempting to access <iframe> contents (Back-porting fix from PR #5163)

2016-06-12 17:26:36 -07:00

LeftAndMain.BatchActions.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

LeftAndMain.Content.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

LeftAndMain.EditForm.js

Merge branch '3.2' into 3.3

2016-06-13 12:29:45 +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

Merge branch '3.2' into 3.3

2016-07-15 14:33:38 +01:00

LeftAndMain.Layout.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

LeftAndMain.Menu.js

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

2016-03-04 14:55:08 +13:00

LeftAndMain.Panel.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

LeftAndMain.Ping.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

LeftAndMain.Preview.js

Add special flag to CMS preview requests

2016-01-22 13:02:59 +13:00

LeftAndMain.Tree.js

Merge 3.3 into 3

2016-05-11 14:06:23 +12: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

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

MemberDatetimeOptionsetField.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

MemberImportForm.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

ModelAdmin.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

SecurityAdmin.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00

ssui.core.js

MINORE: Remove training whitespace.

2016-01-07 10:15:54 +13:00