Ingo Schommer e0aa610172 Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	.travis.yml
	templates/Includes/ReportAdmin_Content.ss
	templates/ReportAdminForm.ss

2013-08-03 19:46:46 +02:00

..

AssetAdmin_Content.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

AssetAdmin_EditForm.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

AssetAdmin_Tools.ss

BUG Fully qualified namespace for _t() in templates

2012-08-06 13:44:33 +02:00

AssetAdmin_UploadContent.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSMain_Content.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSMain_EditForm.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSMain_ListView.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSMain_Tools.ss

FIX Ticket #8318 Append the HTML used for expanding/collapsing the site tree column in template instead of creating it on the fly with js

2013-03-18 08:57:13 +13:00

CMSMain_TreeView.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSPageAddController_Content.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSPageHistoryController_Tools.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSPagesController_Content.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSPagesController_ContentToolActions.ss

Moving "edit tree" button next to "add new" (fixes #8119)

2012-12-17 15:35:52 +01:00

CMSPagesController_ContentToolbar.ss

Batch actions UI enhancement (#7878)

2012-11-02 23:05:20 +01:00

CMSPagesController_Tools.ss

BUG Fully qualified namespace for _t() in templates

2012-08-06 13:44:33 +02:00

CMSSettingsController_Content.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

CMSSettingsController_EditForm.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

Install_deleteinstallfiles.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

Install_successfullyinstalled.ss

Updated templates to be more consistent and removed trailing spaces

2013-07-18 13:14:29 +02:00

SubscribeSubmission.ss

MINOR Removing executable flag from all files (thanks miiihi)

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