Ingo Schommer 8ab66c93b6 Merge remote-tracking branch 'origin/3.1' ... Conflicts: code/reports/Report.php composer.json		2013-01-21 11:24:05 +01:00
..
lang	Merge pull request #175 from creamarketing/swedish-javascript-translations	2012-08-29 04:50:37 -07:00
AssetAdmin.DragDrop.js	BUGFIX Adding missing onunmatch in AssetAdmin.DragDrop	2012-05-23 16:09:08 +12:00
AssetAdmin.js	BUGFIX: Disable javascript not used right now because assets don't have batch actions. (Trac #7367)	2012-06-15 15:50:11 +12:00
CMSMain.AddForm.js	BUG Enforce "add page" restrictions, improve UI (fixes #7879)	2012-12-03 16:52:17 +01:00
CMSMain.EditForm.js	BUG Only use $.button in onunmatch if init'ed (fixes #8181)	2013-01-21 08:43:29 +01:00
CMSMain.js	API CHANGE Combined "Pages" and "Edit Page" into a single menu entry	2012-04-17 22:59:08 +02:00
CMSMain.Tree.js	BUG Enforce "add page" restrictions, improve UI (fixes #7879)	2012-12-03 16:52:17 +01:00
CMSPageHistoryController.js	BUGFIX Corrected page history pane loading (fixes #7477)	2012-06-15 12:50:54 +02:00
RedirectorPage.js	BUGFIX: add missing onunmatches causing exceptions in entwine	2012-05-18 14:33:17 +12:00
SilverStripeNavigator.js	NEW Side by side editing functionality - first cut (os#7412)	2012-12-10 18:09:54 +01:00
SiteTreeURLSegmentField.js	BUGFIX Provide fallback text for translations.	2012-11-14 10:03:05 +10:00