GitHub/WoltLab/WCF.git
12 years agoMerge pull request #707 from Gravatronics/enhancement/immediateLanguageChange
Alexander Ebert [Tue, 17 Jul 2012 16:28:25 +0000 (09:28 -0700)]
Merge pull request #707 from Gravatronics/enhancement/immediateLanguageChange

Immediately changes the interface language if the active user changes their language

12 years agoImmediately changes the interface language if the active user changes their language
Matthias Schmidt [Tue, 17 Jul 2012 16:22:51 +0000 (18:22 +0200)]
Immediately changes the interface language if the active user changes their language

12 years agoMerge branch 'master' of github.com:WoltLab/WCF
Alexander Ebert [Mon, 16 Jul 2012 22:21:14 +0000 (00:21 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF

12 years agoApplications are now singletons
Alexander Ebert [Mon, 16 Jul 2012 22:20:19 +0000 (00:20 +0200)]
Applications are now singletons

12 years agoMerge pull request #702 from Gravatronics/cleanup/noSandbox
Alexander Ebert [Mon, 16 Jul 2012 18:01:31 +0000 (11:01 -0700)]
Merge pull request #702 from Gravatronics/cleanup/noSandbox

Removes unnecessary "sandbox=false"

12 years agoMerge pull request #701 from Gravatronics/bug/packageUninstallOverlayCSS
Alexander Ebert [Mon, 16 Jul 2012 18:01:05 +0000 (11:01 -0700)]
Merge pull request #701 from Gravatronics/bug/packageUninstallOverlayCSS

Fixes CSS classes in packageUninstallationStepPrepare template

12 years agoMerge pull request #700 from Gravatronics/enhancement/cachedPackageGetter
Alexander Ebert [Mon, 16 Jul 2012 18:00:15 +0000 (11:00 -0700)]
Merge pull request #700 from Gravatronics/enhancement/cachedPackageGetter

Adds possibility to get all cached packages

12 years agoMerge pull request #699 from Gravatronics/enhancement/globalJSButtonLangVars
Alexander Ebert [Mon, 16 Jul 2012 17:56:11 +0000 (10:56 -0700)]
Merge pull request #699 from Gravatronics/enhancement/globalJSButtonLangVars

Adds missing important global button language items to JavaScript

12 years agoMerge pull request #696 from Gravatronics/cleanup/obsoleteImages
Alexander Ebert [Mon, 16 Jul 2012 17:51:35 +0000 (10:51 -0700)]
Merge pull request #696 from Gravatronics/cleanup/obsoleteImages

Deletes obsolete images

12 years agoMerge pull request #695 from Gravatronics/bug/applicatonGroupLinks
Alexander Ebert [Mon, 16 Jul 2012 17:43:29 +0000 (10:43 -0700)]
Merge pull request #695 from Gravatronics/bug/applicatonGroupLinks

Fixes link bugs within application groups

12 years agoMerge pull request #694 from Gravatronics/enhancement/installationPackageRequirements
Alexander Ebert [Mon, 16 Jul 2012 17:42:14 +0000 (10:42 -0700)]
Merge pull request #694 from Gravatronics/enhancement/installationPackageRequirements

Updates handling of required packages

12 years agoMerge pull request #693 from Gravatronics/enhancement/systemPackageComments
Alexander Ebert [Mon, 16 Jul 2012 17:40:55 +0000 (10:40 -0700)]
Merge pull request #693 from Gravatronics/enhancement/systemPackageComments

Updates comments of system package classes

12 years agoMerge pull request #692 from Gravatronics/enhancement/templateFileHandlerTableName
Alexander Ebert [Mon, 16 Jul 2012 17:40:30 +0000 (10:40 -0700)]
Merge pull request #692 from Gravatronics/enhancement/templateFileHandlerTableName

Removes first underscore from tableName of file handlers

12 years agoMerge pull request #691 from Gravatronics/cleanup/acpHeaderTplComment
Alexander Ebert [Mon, 16 Jul 2012 17:40:13 +0000 (10:40 -0700)]
Merge pull request #691 from Gravatronics/cleanup/acpHeaderTplComment

Fixes acp header template comment

12 years agoMerge pull request #703 from Gravatronics/bug/userOptionEditorDefaultValue
Tim Düsterhus [Mon, 16 Jul 2012 16:15:26 +0000 (09:15 -0700)]
Merge pull request #703 from Gravatronics/bug/userOptionEditorDefaultValue

Fixes setting default value in UserOptionEditor::create()

12 years agoFixes setting default value in UserOptionEditor::create()
Matthias Schmidt [Mon, 16 Jul 2012 16:01:27 +0000 (18:01 +0200)]
Fixes setting default value in UserOptionEditor::create()

12 years agoAdded getLanguages() and getIconPath()
Alexander Ebert [Mon, 16 Jul 2012 12:45:49 +0000 (14:45 +0200)]
Added getLanguages() and getIconPath()

12 years agoAdded JS and CSS for language choosers
Alexander Ebert [Mon, 16 Jul 2012 12:44:35 +0000 (14:44 +0200)]
Added JS and CSS for language choosers

12 years agoRemoves unnecessary "sandbox=false"
Matthias Schmidt [Mon, 16 Jul 2012 06:04:08 +0000 (08:04 +0200)]
Removes unnecessary "sandbox=false"

With WCF 2.0 "sandbox=false" is the default setting.

12 years agoFixes CSS classes in packageUninstallationStepPrepare template
Matthias Schmidt [Mon, 16 Jul 2012 05:50:23 +0000 (07:50 +0200)]
Fixes CSS classes in packageUninstallationStepPrepare template

12 years agoAdds possibility to get all cached packages
Matthias Schmidt [Sun, 15 Jul 2012 20:09:53 +0000 (22:09 +0200)]
Adds possibility to get all cached packages

12 years agoAdds missing important global button language items to JavaScript
Matthias Schmidt [Sun, 15 Jul 2012 19:28:05 +0000 (21:28 +0200)]
Adds missing important global button language items to JavaScript

12 years agoDeletes obsolete images
Matthias Schmidt [Sat, 14 Jul 2012 20:26:09 +0000 (22:26 +0200)]
Deletes obsolete images

12 years agoFixes link bugs within application groups
Matthias Schmidt [Sat, 14 Jul 2012 19:47:38 +0000 (21:47 +0200)]
Fixes link bugs within application groups

* LinkHandler doesn't consider if the request is an acp request.
* The link of page menu item that belongs to an application has to be build with an association to the application.

12 years agoAdjusts case of first letter
Matthias Schmidt [Sat, 14 Jul 2012 18:55:11 +0000 (20:55 +0200)]
Adjusts case of first letter

12 years agoUpdates handling of required packages
Matthias Schmidt [Sat, 14 Jul 2012 18:51:24 +0000 (20:51 +0200)]
Updates handling of required packages

12 years agoAdds some missing package language items
Matthias Schmidt [Sat, 14 Jul 2012 18:08:07 +0000 (20:08 +0200)]
Adds some missing package language items

12 years agoUpdates comments of system package classes
Matthias Schmidt [Sat, 14 Jul 2012 17:36:23 +0000 (19:36 +0200)]
Updates comments of system package classes

12 years agoRemoves first underscore from tableName of file handlers
Matthias Schmidt [Sat, 14 Jul 2012 17:24:18 +0000 (19:24 +0200)]
Removes first underscore from tableName of file handlers

This way the tableName property behaves the same way like the property of the package installation plugins.

12 years agoFixes acp header template comment
Matthias Schmidt [Sat, 14 Jul 2012 17:13:04 +0000 (19:13 +0200)]
Fixes acp header template comment

12 years agoMerge pull request #688 from Gravatronics/enhancement/categoryUpdates
Alexander Ebert [Sat, 14 Jul 2012 16:41:24 +0000 (09:41 -0700)]
Merge pull request #688 from Gravatronics/enhancement/categoryUpdates

Enhances category system

12 years agoMerge pull request #689 from Gravatronics/enhancement/optionLanguageItems
Alexander Ebert [Sat, 14 Jul 2012 16:41:09 +0000 (09:41 -0700)]
Merge pull request #689 from Gravatronics/enhancement/optionLanguageItems

Sorts option language items and add a few missing ones

12 years agoAdded 'countrycode' attribute for languages
Alexander Ebert [Sat, 14 Jul 2012 16:37:25 +0000 (18:37 +0200)]
Added 'countrycode' attribute for languages

12 years agoRenamed flag (reflecting country code instead of language code)
Alexander Ebert [Sat, 14 Jul 2012 16:31:15 +0000 (18:31 +0200)]
Renamed flag (reflecting country code instead of language code)

12 years agoSorts option language items and add a few missing ones
Matthias Schmidt [Sat, 14 Jul 2012 16:00:20 +0000 (18:00 +0200)]
Sorts option language items and add a few missing ones

12 years agoFixes noneAvailable class name
Matthias Schmidt [Sat, 14 Jul 2012 15:41:36 +0000 (17:41 +0200)]
Fixes noneAvailable class name

12 years agoMakes description optional for category types
Matthias Schmidt [Sat, 14 Jul 2012 15:36:28 +0000 (17:36 +0200)]
Makes description optional for category types

12 years agoUnifies language item
Matthias Schmidt [Sat, 14 Jul 2012 15:19:55 +0000 (17:19 +0200)]
Unifies language item

12 years agoFixed filename
Alexander Ebert [Sat, 14 Jul 2012 14:48:04 +0000 (16:48 +0200)]
Fixed filename

12 years agoImproved image viewer
Alexander Ebert [Sat, 14 Jul 2012 14:46:28 +0000 (16:46 +0200)]
Improved image viewer

Added support for large images (scaled down to match window while preserving aspect ratio)

12 years agoMerge pull request #686 from Gravatronics/enhancement/packageVersionSort
Alexander Ebert [Sat, 14 Jul 2012 13:34:40 +0000 (06:34 -0700)]
Merge pull request #686 from Gravatronics/enhancement/packageVersionSort

Removes possibility to sort package list by package version

12 years agoMerge pull request #685 from Gravatronics/cleanup/unusedUseStatements
Alexander Ebert [Sat, 14 Jul 2012 13:33:41 +0000 (06:33 -0700)]
Merge pull request #685 from Gravatronics/cleanup/unusedUseStatements

Removes unused use statements

12 years agoMerge pull request #684 from Gravatronics/enhancement/i18nHandlerGetValues
Alexander Ebert [Sat, 14 Jul 2012 13:33:17 +0000 (06:33 -0700)]
Merge pull request #684 from Gravatronics/enhancement/i18nHandlerGetValues

Adds I18nHandler::getValues()

12 years agoMerge pull request #682 from Gravatronics/enhancement/categoryLangVar
Alexander Ebert [Sat, 14 Jul 2012 13:32:00 +0000 (06:32 -0700)]
Merge pull request #682 from Gravatronics/enhancement/categoryLangVar

Makes it easier to get category language variables

12 years agoRemoves possibility to sort package list by package version
Matthias Schmidt [Sat, 14 Jul 2012 13:20:28 +0000 (15:20 +0200)]
Removes possibility to sort package list by package version

Since the sorting is handled by the database, the sorting of the package version won't be correct, thus it's removed.

12 years agoRemoves unused use statements
Matthias Schmidt [Sat, 14 Jul 2012 12:32:19 +0000 (14:32 +0200)]
Removes unused use statements

12 years agoMerge pull request #683 from Gravatronics/bug/userGroupAddForm
Tim Düsterhus [Sat, 14 Jul 2012 11:48:07 +0000 (04:48 -0700)]
Merge pull request #683 from Gravatronics/bug/userGroupAddForm

Fixes UserGroupAddForm bug

12 years agoAdds I18nHandler::getValues()
Matthias Schmidt [Sat, 14 Jul 2012 10:58:37 +0000 (12:58 +0200)]
Adds I18nHandler::getValues()

This method is useful if you want to do something else with the i18n values which are now accessible.

12 years agoFixes UserGroupAddForm bug
Matthias Schmidt [Sat, 14 Jul 2012 10:45:01 +0000 (12:45 +0200)]
Fixes UserGroupAddForm bug

12 years agoFixing path to imageviewer.less
Tim Düsterhus [Fri, 13 Jul 2012 14:31:56 +0000 (16:31 +0200)]
Fixing path to imageviewer.less

12 years agoMerge branch 'refs/heads/master' into enhancement/categoryLangVar
Matthias Schmidt [Fri, 13 Jul 2012 14:17:21 +0000 (16:17 +0200)]
Merge branch 'refs/heads/master' into enhancement/categoryLangVar

Conflicts:
wcfsetup/install/files/acp/templates/categoryAdd.tpl

12 years agoChanging default groupType to 4
Tim Düsterhus [Fri, 13 Jul 2012 14:16:57 +0000 (16:16 +0200)]
Changing default groupType to 4

12 years agoMerge pull request #681 from Gravatronics/bug/categoryAddValidation
Alexander Ebert [Fri, 13 Jul 2012 11:00:40 +0000 (04:00 -0700)]
Merge pull request #681 from Gravatronics/bug/categoryAddValidation

Adds missing validation of category's i18n values

12 years agoMerge pull request #680 from Gravatronics/enhancement/formDataLangVar
Alexander Ebert [Fri, 13 Jul 2012 11:00:26 +0000 (04:00 -0700)]
Merge pull request #680 from Gravatronics/enhancement/formDataLangVar

Adds wcf.global.form.data lang var

12 years agoFixes wrong variable
Matthias Schmidt [Thu, 12 Jul 2012 20:18:49 +0000 (22:18 +0200)]
Fixes wrong variable

12 years agoMakes it easier to get category language variables
Matthias Schmidt [Thu, 12 Jul 2012 20:15:35 +0000 (22:15 +0200)]
Makes it easier to get category language variables

Replaces `ICategoryType::getLangVarPrefix()` with `ICategoryType::getLanguageVariable()` which returns the value directly. This makes the template code more compact.

12 years agoAdds missing validation of category's i18n values
Matthias Schmidt [Thu, 12 Jul 2012 20:10:04 +0000 (22:10 +0200)]
Adds missing validation of category's i18n values

12 years agoMerge pull request #636 from Gravatronics/cleanup/absCatLiPageWhitespaces
Alexander Ebert [Thu, 12 Jul 2012 14:26:08 +0000 (07:26 -0700)]
Merge pull request #636 from Gravatronics/cleanup/absCatLiPageWhitespaces

Removes whitespaces from AbstractCategoryListPage

12 years agoMerge pull request #631 from Gravatronics/bug/categoryHandler
Alexander Ebert [Thu, 12 Jul 2012 14:25:50 +0000 (07:25 -0700)]
Merge pull request #631 from Gravatronics/bug/categoryHandler

Fixes array key in CategoryHandler::getChildCategories()

12 years agoMerge pull request #639 from Gravatronics/bug/categoryListSortableNodeLabel
Alexander Ebert [Thu, 12 Jul 2012 14:25:05 +0000 (07:25 -0700)]
Merge pull request #639 from Gravatronics/bug/categoryListSortableNodeLabel

Adds missing sortableNodeLabel span in categoryList template

12 years agoMerge pull request #660 from Gravatronics/enhancement/databaseObjectInterfaces
Alexander Ebert [Thu, 12 Jul 2012 14:24:41 +0000 (07:24 -0700)]
Merge pull request #660 from Gravatronics/enhancement/databaseObjectInterfaces

Adds two new database object interfaces

12 years agoMerge pull request #671 from Gravatronics/enhancement/categoryNodes
Alexander Ebert [Thu, 12 Jul 2012 14:19:39 +0000 (07:19 -0700)]
Merge pull request #671 from Gravatronics/enhancement/categoryNodes

Makes it easier to use own category nodes

12 years agoMerge pull request #640 from Gravatronics/bug/categoryListTemplateClosingTags
Alexander Ebert [Thu, 12 Jul 2012 14:19:15 +0000 (07:19 -0700)]
Merge pull request #640 from Gravatronics/bug/categoryListTemplateClosingTags

Fixes number of closing tags if list depth decreases

12 years agoMerge pull request #669 from Gravatronics/bug/packageView
Alexander Ebert [Thu, 12 Jul 2012 14:18:55 +0000 (07:18 -0700)]
Merge pull request #669 from Gravatronics/bug/packageView

Fixes bugs related to the packageView template

12 years agoMerge pull request #676 from Gravatronics/bug/disabledI18nLangVarJs
Alexander Ebert [Thu, 12 Jul 2012 14:18:37 +0000 (07:18 -0700)]
Merge pull request #676 from Gravatronics/bug/disabledI18nLangVarJs

Adds `wcf.global.button.disabledI18n` to JavaScript frontend language dictionary

12 years agoMerge pull request #675 from Gravatronics/bug/multipleLanguageInput
Alexander Ebert [Thu, 12 Jul 2012 14:18:21 +0000 (07:18 -0700)]
Merge pull request #675 from Gravatronics/bug/multipleLanguageInput

Fixes WCF.MultipleLanguageInput

12 years agoMerge pull request #670 from Gravatronics/enhancement/previewLanguageItem
Alexander Ebert [Thu, 12 Jul 2012 14:18:08 +0000 (07:18 -0700)]
Merge pull request #670 from Gravatronics/enhancement/previewLanguageItem

Adds global preview language item

12 years agoMerge pull request #674 from Gravatronics/bug/LANGUAGE_ID
Alexander Ebert [Thu, 12 Jul 2012 14:17:44 +0000 (07:17 -0700)]
Merge pull request #674 from Gravatronics/bug/LANGUAGE_ID

Adds missing LANGUAGE_ID JavaScript variable in frontend

12 years agoMerge pull request #673 from Gravatronics/enhancement/i18nFrontEndTemplate
Alexander Ebert [Thu, 12 Jul 2012 14:17:31 +0000 (07:17 -0700)]
Merge pull request #673 from Gravatronics/enhancement/i18nFrontEndTemplate

Adds multipleLanguageInputJavascript frontend template

12 years agoAdded flags
Alexander Ebert [Wed, 11 Jul 2012 18:17:19 +0000 (20:17 +0200)]
Added flags

Included flags: Most European countries as well as the flags for most spoken languages (country used with the majority of speakers per language)

All flags are optimized for 24px * 15px.

Every flag-SVG is Public Domain, feel free to use it for whatever you want.

12 years agoFixed imageViewer (forgot CSS)
Alexander Ebert [Mon, 9 Jul 2012 21:12:49 +0000 (23:12 +0200)]
Fixed imageViewer (forgot CSS)

12 years agoAdded ImageViewer
Alexander Ebert [Mon, 9 Jul 2012 16:58:10 +0000 (18:58 +0200)]
Added ImageViewer

Based upon "Slimbox 2" by Christophe Beyls 2007-2010, http://www.digitalia.be/software/slimbox2#get_help, MIT-style license

12 years agoMerge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Mon, 9 Jul 2012 15:41:28 +0000 (17:41 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF

12 years agoFixed detection of CacheSource
Tim Düsterhus [Mon, 9 Jul 2012 15:40:25 +0000 (17:40 +0200)]
Fixed detection of CacheSource

12 years agoConverting wcfLogo2.svg into unix linebreaks
Tim Düsterhus [Sat, 7 Jul 2012 19:16:42 +0000 (21:16 +0200)]
Converting wcfLogo2.svg into unix linebreaks

12 years agoRemoved unnecessary userObj fetching (prevented ACP access)
Alexander Ebert [Sat, 7 Jul 2012 17:59:28 +0000 (19:59 +0200)]
Removed unnecessary userObj fetching (prevented ACP access)

12 years agoCommited dos linebreaks by accident
Tim Düsterhus [Sat, 7 Jul 2012 15:35:48 +0000 (17:35 +0200)]
Commited dos linebreaks by accident

12 years agoProxy WCF::getUser() through the session
Tim Düsterhus [Sat, 7 Jul 2012 15:26:10 +0000 (17:26 +0200)]
Proxy WCF::getUser() through the session

Fixes #667

12 years agoMerge pull request #677 from max-m/master
Tim Düsterhus [Sat, 7 Jul 2012 14:13:42 +0000 (07:13 -0700)]
Merge pull request #677 from max-m/master

Fixes array to string conversion.

12 years agoFixes array to string conversion.
max-m [Sat, 7 Jul 2012 14:12:11 +0000 (17:12 +0300)]
Fixes array to string conversion.

12 years agoProbably fix issue during WCFSetup created by 48364911b
Tim Düsterhus [Sat, 7 Jul 2012 13:47:10 +0000 (15:47 +0200)]
Probably fix issue during WCFSetup created by 48364911b

12 years agoMerge branch 'health' of https://github.com/wbbaddons/WCF
Tim Düsterhus [Sat, 7 Jul 2012 13:17:54 +0000 (15:17 +0200)]
Merge branch 'health' of https://github.com/wbbaddons/WCF

12 years agoOptimizing output of header.tpl when there is no valid acpMenu-item
Tim Düsterhus [Sat, 7 Jul 2012 13:04:29 +0000 (15:04 +0200)]
Optimizing output of header.tpl when there is no valid acpMenu-item

12 years agoFix ACP for users without admin.general.canUseAcp
Tim Düsterhus [Sat, 7 Jul 2012 12:57:49 +0000 (14:57 +0200)]
Fix ACP for users without admin.general.canUseAcp

Fixes #552

12 years agoFixing class in permissionDenied.tpl
Tim Düsterhus [Sat, 7 Jul 2012 12:55:41 +0000 (14:55 +0200)]
Fixing class in permissionDenied.tpl

12 years agoFixes comment typo
Matthias Schmidt [Sat, 7 Jul 2012 07:21:41 +0000 (09:21 +0200)]
Fixes comment typo

12 years agoFixes wrong function call
Matthias Schmidt [Sat, 7 Jul 2012 07:15:16 +0000 (09:15 +0200)]
Fixes wrong function call

12 years agoAdds `wcf.global.button.disabledI18n` to JavaScript frontend language dictionary
Matthias Schmidt [Sat, 7 Jul 2012 05:16:46 +0000 (07:16 +0200)]
Adds `wcf.global.button.disabledI18n` to JavaScript frontend language dictionary

12 years agoFixes comment
Matthias Schmidt [Sat, 7 Jul 2012 05:11:38 +0000 (07:11 +0200)]
Fixes comment

12 years agoFixes WCF.MultipleLanguageInput
Matthias Schmidt [Sat, 7 Jul 2012 05:10:30 +0000 (07:10 +0200)]
Fixes WCF.MultipleLanguageInput

12 years agoAdds missing LANGUAGE_ID JavaScript variable in frontend
Matthias Schmidt [Fri, 6 Jul 2012 20:03:32 +0000 (22:03 +0200)]
Adds missing LANGUAGE_ID JavaScript variable in frontend

Needed by `WCF.MultipleLanguageInput`

12 years agoAdds multipleLanguageInputJavascript frontend template
Matthias Schmidt [Fri, 6 Jul 2012 19:53:22 +0000 (21:53 +0200)]
Adds multipleLanguageInputJavascript frontend template

12 years agoMakes it easier to use own category nodes
Matthias Schmidt [Fri, 6 Jul 2012 09:01:33 +0000 (11:01 +0200)]
Makes it easier to use own category nodes

With the changes of this commit you can easily extend the given node classes (without having to copy&paste the `__construct` methods and just change the class name). This makes it possible for your own implementation to add additional conditions for a category to be included in the list (like acl options "canViewCategory" or "canViewDisabledCategory").

12 years agoFixes language item position and makes it available in JavaScript
Matthias Schmidt [Fri, 6 Jul 2012 08:19:29 +0000 (10:19 +0200)]
Fixes language item position and makes it available in JavaScript

12 years agoAdds global preview language item
Matthias Schmidt [Fri, 6 Jul 2012 08:16:46 +0000 (10:16 +0200)]
Adds global preview language item

12 years agoFixes bugs related to the packageView template
Matthias Schmidt [Fri, 6 Jul 2012 07:53:55 +0000 (09:53 +0200)]
Fixes bugs related to the packageView template

12 years agoMerge branch 'master' of github.com:WoltLab/WCF
Tim Düsterhus [Thu, 5 Jul 2012 19:58:52 +0000 (21:58 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF

12 years agoAdding menuitem to jump to frontend
Tim Düsterhus [Thu, 5 Jul 2012 19:50:00 +0000 (21:50 +0200)]
Adding menuitem to jump to frontend

12 years agoWork-around for template guessing if accessing *Edit page
Alexander Ebert [Thu, 5 Jul 2012 17:48:04 +0000 (19:48 +0200)]
Work-around for template guessing if accessing *Edit page

12 years agoMerge branch 'master' of github.com:WoltLab/WCF
Marcel Werk [Wed, 4 Jul 2012 16:49:57 +0000 (18:49 +0200)]
Merge branch 'master' of github.com:WoltLab/WCF