git.stricted.de - GitHub/WoltLab/WCF.git/commit

Merge branch 'master' of git://github.com/WoltLab/WCF into enhancement/cleanup

Conflicts:
wcfsetup/install/files/js/WCF.js
wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/ACPSearchProviderPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/CronjobPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php
wcfsetup/install/files/lib/system/template/plugin/DatediffModifierTemplatePlugin.class.php

author	Matthias Schmidt <gravatronics@live.com>
	Sun, 14 Oct 2012 07:02:36 +0000 (09:02 +0200)
committer	Matthias Schmidt <gravatronics@live.com>
	Sun, 14 Oct 2012 07:02:36 +0000 (09:02 +0200)
commit	4164efd316d5fd21df37bf379fa44b8ab6a7a25e
tree	62e66e8a816a2febbc1290a4232e3081b952635c	tree \| snapshot (tar.gz zip)
parent	2483f3f9d82e3557fbf1b010e7fcf707f3fda197	commit \| diff
parent	dc8fe3e064b96895388876ec12f56bafa7672304	commit \| diff

wcfsetup/install/files/acp/js/WCF.ACP.js	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/js/WCF.js	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/action/AJAXProxyAction.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/action/ClipboardAction.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/AbstractDatabaseObjectAction.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/DatabaseObject.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/DatabaseObjectDecorator.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/IStorableObject.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/category/CategoryAction.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/cronjob/CronjobAction.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/language/LanguageEditor.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/option/OptionEditor.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/package/update/server/PackageUpdateServerAction.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/style/Style.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/style/StyleAction.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/user/User.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/data/user/UserAction.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/cache/builder/StyleCacheBuilder.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/image/adapter/GDImageAdapter.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/image/adapter/ImageAdapter.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/language/I18nHandler.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/PackageInstallationDispatcher.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/ACPMenuPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/ACPSearchProviderPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/ACPTemplatePackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/AbstractXMLPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/ClipboardActionPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/CoreObjectPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/CronjobPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/EventListenerPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/ObjectTypeDefinitionPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/ObjectTypePackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/OptionPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/PIPPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/PageMenuPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/SitemapPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/StylePackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/TemplateListenerPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/UserGroupOptionPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/package/plugin/UserOptionPackageInstallationPlugin.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/request/RouteHandler.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/style/StyleHandler.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/system/template/plugin/DatediffModifierTemplatePlugin.class.php	diff1 \|	\|	blob \| history
wcfsetup/install/files/lib/util/DateUtil.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/lib/util/StringUtil.class.php	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/files/style/dialog.less	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/de.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/install/lang/en.xml	diff1 \|	diff2 \|	blob \| history
wcfsetup/setup/db/install.sql	diff1 \|	diff2 \|	blob \| history