Merge branch 'master' into next

diff --cc com.woltlab.wcf/acpMenu.xml
index e6cd1a8e2c82b0970daab84d02a35231278c16e1,d9278aae04cf312641537b7fd68ca2ed9d24e7c7..5a1a504089f901b03fa6fbc33adbe05ccb5cfb3c
--- 1/com.woltlab.wcf/acpMenu.xml
--- 2/com.woltlab.wcf/acpMenu.xml
+++ b/com.woltlab.wcf/acpMenu.xml
@@@ -6,107 -6,125 +6,108 @@@
                        <showorder>1</showorder>
                        <icon>fa-wrench</icon>
                </acpmenuitem>
 -              
 -                      <!-- option -->
 -                      <acpmenuitem name="wcf.acp.menu.link.option">
 -                              <parent>wcf.acp.menu.link.configuration</parent>
 -                              <showorder>1</showorder>
 -                              <permissions>admin.configuration.canEditOption</permissions>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.option.category">
 -                              <parent>wcf.acp.menu.link.option</parent>
 -                              <showorder>1</showorder>
 -                      </acpmenuitem>
 -                      <!-- /option -->
 -                      
 -                      <!-- package -->
 -                      <acpmenuitem name="wcf.acp.menu.link.package">
 -                              <parent>wcf.acp.menu.link.configuration</parent>
 -                              <showorder>2</showorder>
 -                              <permissions>admin.configuration.package.canInstallPackage,admin.configuration.package.canUpdatePackage,admin.configuration.package.canUninstallPackage,admin.configuration.package.canEditServer</permissions>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.application.management">
 -                              <controller>wcf\acp\page\ApplicationManagementPage</controller>
 -                              <parent>wcf.acp.menu.link.package</parent>
 -                              <permissions>admin.configuration.canManageApplication</permissions>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.package.list">
 -                              <controller>wcf\acp\page\PackageListPage</controller>
 -                              <parent>wcf.acp.menu.link.package</parent>
 -                              <permissions>admin.configuration.package.canUpdatePackage,admin.configuration.package.canUninstallPackage</permissions>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.package.install">
 -                              <controller>wcf\acp\form\PackageStartInstallForm</controller>
 -                              <parent>wcf.acp.menu.link.package.list</parent>
 -                              <permissions>admin.configuration.package.canInstallPackage</permissions>
 -                              <icon>fa-plus</icon>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.package.server.list">
 -                              <controller>wcf\acp\page\PackageUpdateServerListPage</controller>
 -                              <parent>wcf.acp.menu.link.package</parent>
 -                              <permissions>admin.configuration.package.canEditServer</permissions>
 -                      </acpmenuitem>
 -              
 -                      <acpmenuitem name="wcf.acp.menu.link.package.server.add">
 -                              <controller>wcf\acp\form\PackageUpdateServerAddForm</controller>
 -                              <parent>wcf.acp.menu.link.package.server.list</parent>
 -                              <permissions>admin.configuration.package.canEditServer</permissions>
 -                              <icon>fa-plus</icon>
 -                      </acpmenuitem>
 -                      <!-- /package -->
 -              
 -                      <!-- other -->
 -                      <acpmenuitem name="wcf.acp.menu.link.other">
 -                              <parent>wcf.acp.menu.link.configuration</parent>
 -                              <showorder>3</showorder>
 -                      </acpmenuitem>
 -                      <acpmenuitem name="wcf.acp.menu.link.activityPoint">
 -                              <parent>wcf.acp.menu.link.other</parent>
 -                              <controller>wcf\acp\form\UserActivityPointOptionForm</controller>
 -                              <permissions>admin.user.canEditActivityPoints</permissions>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.notificationPresetSettings">
 -                              <parent>wcf.acp.menu.link.other</parent>
 -                              <controller>wcf\acp\form\NotificationPresetSettingsForm</controller>
 -                              <permissions>admin.user.canEditUser</permissions>
 -                      </acpmenuitem>
 -              
 -                      <acpmenuitem name="wcf.acp.menu.link.contact.settings">
 -                              <parent>wcf.acp.menu.link.other</parent>
 -                              <controller>wcf\acp\form\ContactSettingsPage</controller>
 -                              <options>module_contact_form</options>
 -                              <permissions>admin.contact.canManageContactForm</permissions>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
 -                              <parent>wcf.acp.menu.link.other</parent>
 -                              <controller>wcf\acp\page\CaptchaQuestionListPage</controller>
 -                              <permissions>admin.captcha.canManageCaptchaQuestion</permissions>
 -                      </acpmenuitem>
 -                      <acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
 -                              <parent>wcf.acp.menu.link.captcha.question.list</parent>
 -                              <controller>wcf\acp\form\CaptchaQuestionAddForm</controller>
 -                              <permissions>admin.captcha.canManageCaptchaQuestion</permissions>
 -                              <icon>fa-plus</icon>
 -                      </acpmenuitem>
 -                      <!-- /other -->
 -                      
 -                      <!-- devtools -->
 -                      <acpmenuitem name="wcf.acp.menu.link.devtools">
 -                              <parent>wcf.acp.menu.link.configuration</parent>
 -                              <showorder>99</showorder>
 -                              <options>enable_developer_tools</options>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.devtools.project.list">
 -                              <parent>wcf.acp.menu.link.devtools</parent>
 -                              <controller>wcf\acp\page\DevtoolsProjectListPage</controller>
 -                              <permissions>admin.configuration.package.canInstallPackage</permissions>
 -                      </acpmenuitem>
 -                      <acpmenuitem name="wcf.acp.menu.link.devtools.project.add">
 -                              <parent>wcf.acp.menu.link.devtools.project.list</parent>
 -                              <controller>wcf\acp\form\DevtoolsProjectAddForm</controller>
 -                              <permissions>admin.configuration.package.canInstallPackage</permissions>
 -                              <icon>fa-plus</icon>
 -                      </acpmenuitem>
 -                      
 -                      <acpmenuitem name="wcf.acp.menu.link.devtools.notificationTest">
 -                              <parent>wcf.acp.menu.link.devtools</parent>
 -                              <controller>wcf\acp\page\DevtoolsNotificationTestPage</controller>
 -                              <permissions>admin.configuration.package.canInstallPackage</permissions>
 -                      </acpmenuitem>
 -                      <!-- /devtools -->
 -              
 +              <!-- option -->
 +              <acpmenuitem name="wcf.acp.menu.link.option">
 +                      <parent>wcf.acp.menu.link.configuration</parent>
 +                      <permissions>admin.configuration.canEditOption</permissions>
 +                      <showorder>1</showorder>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.option.category">
 +                      <parent>wcf.acp.menu.link.option</parent>
 +                      <showorder>1</showorder>
 +              </acpmenuitem>
 +              <!-- /option -->
 +              <!-- package -->
 +              <acpmenuitem name="wcf.acp.menu.link.package">
 +                      <parent>wcf.acp.menu.link.configuration</parent>
 +                      <permissions>admin.configuration.package.canInstallPackage,admin.configuration.package.canUpdatePackage,admin.configuration.package.canUninstallPackage,admin.configuration.package.canEditServer</permissions>
 +                      <showorder>2</showorder>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.application.management">
 +                      <controller>wcf\acp\page\ApplicationManagementPage</controller>
 +                      <parent>wcf.acp.menu.link.package</parent>
 +                      <permissions>admin.configuration.canManageApplication</permissions>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.package.list">
 +                      <controller>wcf\acp\page\PackageListPage</controller>
 +                      <parent>wcf.acp.menu.link.package</parent>
 +                      <permissions>admin.configuration.package.canUpdatePackage,admin.configuration.package.canUninstallPackage</permissions>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.package.install">
 +                      <controller>wcf\acp\form\PackageStartInstallForm</controller>
 +                      <parent>wcf.acp.menu.link.package.list</parent>
 +                      <permissions>admin.configuration.package.canInstallPackage</permissions>
 +                      <icon>fa-plus</icon>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.package.server.list">
 +                      <controller>wcf\acp\page\PackageUpdateServerListPage</controller>
 +                      <parent>wcf.acp.menu.link.package</parent>
 +                      <permissions>admin.configuration.package.canEditServer</permissions>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.package.server.add">
 +                      <controller>wcf\acp\form\PackageUpdateServerAddForm</controller>
 +                      <parent>wcf.acp.menu.link.package.server.list</parent>
 +                      <permissions>admin.configuration.package.canEditServer</permissions>
 +                      <icon>fa-plus</icon>
 +              </acpmenuitem>
 +              <!-- /package -->
 +              <!-- other -->
 +              <acpmenuitem name="wcf.acp.menu.link.other">
 +                      <parent>wcf.acp.menu.link.configuration</parent>
 +                      <showorder>3</showorder>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.activityPoint">
 +                      <controller>wcf\acp\form\UserActivityPointOptionForm</controller>
 +                      <parent>wcf.acp.menu.link.other</parent>
 +                      <permissions>admin.user.canEditActivityPoints</permissions>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.notificationPresetSettings">
 +                      <controller>wcf\acp\form\NotificationPresetSettingsForm</controller>
 +                      <parent>wcf.acp.menu.link.other</parent>
 +                      <permissions>admin.user.canManageNotificationSettings</permissions>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.contact.settings">
 +                      <controller>wcf\acp\page\ContactSettingsPage</controller>
 +                      <parent>wcf.acp.menu.link.other</parent>
 +                      <options>module_contact_form</options>
 +                      <permissions>admin.contact.canManageContactForm</permissions>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.captcha.question.list">
 +                      <controller>wcf\acp\page\CaptchaQuestionListPage</controller>
 +                      <parent>wcf.acp.menu.link.other</parent>
 +                      <permissions>admin.captcha.canManageCaptchaQuestion</permissions>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.captcha.question.add">
 +                      <controller>wcf\acp\form\CaptchaQuestionAddForm</controller>
 +                      <parent>wcf.acp.menu.link.captcha.question.list</parent>
 +                      <permissions>admin.captcha.canManageCaptchaQuestion</permissions>
 +                      <icon>fa-plus</icon>
 +              </acpmenuitem>
 +              <!-- /other -->
 +              <!-- devtools -->
 +              <acpmenuitem name="wcf.acp.menu.link.devtools">
 +                      <parent>wcf.acp.menu.link.configuration</parent>
 +                      <options>enable_developer_tools</options>
 +                      <showorder>99</showorder>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.devtools.project.list">
 +                      <controller>wcf\acp\page\DevtoolsProjectListPage</controller>
 +                      <parent>wcf.acp.menu.link.devtools</parent>
 +                      <permissions>admin.configuration.package.canInstallPackage</permissions>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.devtools.project.add">
 +                      <controller>wcf\acp\form\DevtoolsProjectAddForm</controller>
 +                      <parent>wcf.acp.menu.link.devtools.project.list</parent>
 +                      <permissions>admin.configuration.package.canInstallPackage</permissions>
 +                      <icon>fa-plus</icon>
 +              </acpmenuitem>
 +              <acpmenuitem name="wcf.acp.menu.link.devtools.notificationTest">
 +                      <controller>wcf\acp\page\DevtoolsNotificationTestPage</controller>
 +                      <parent>wcf.acp.menu.link.devtools</parent>
++                      <permissions>admin.configuration.package.canInstallPackage</permissions>
 +              </acpmenuitem>
 +              <!-- /devtools -->
                <!-- /configuration -->
 -              
                <!-- user -->
                <acpmenuitem name="wcf.acp.menu.link.user">
                        <showorder>2</showorder>

diff --cc com.woltlab.wcf/page.xml
Simple merge

diff --cc wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
Simple merge

diff --cc wcfsetup/install/lang/de.xml
Simple merge

diff --cc wcfsetup/install/lang/en.xml
Simple merge