merge WIP changelog and stashed changes

CHANGELOG.md

@@ -20,6 +20,11 @@
 * server update and restart is required
 * ready to display warnings about new server updates starting in 4.7.1 or 4.8.0
 * lots of new translations!
+* updated readme
+  * notes about staying up to date
+  * public listings
+  * removed references to freenode
+* nginx update to add trailing slashes
 
 ## Features
 
@@ -40,6 +45,10 @@
   * kanban
   * code
   * slide?
+* new form app
+  * with participant, author, and auditor roles
+  * partially replaces the poll app
+* ability to add a file to your drive from the file menu even if it's already in a team
 
 ## Bug fixes
 

www/form/inner.js

@@ -906,7 +906,6 @@ define([
         },
     };
 
-
     var TYPES = {
         input: {
             defaultOpts: {

www/support/ui.js

@@ -133,9 +133,13 @@ define([
             'account', // Msg.support_cat_account
             'data', // Msg.support_cat_data
             'bug', // Msg.support_cat_bug
+            // XXX report
             'other' // Msg.support_cat_other
         ];
         if (all) { categories.push('all'); } // Msg.support_cat_all
+
+
+
         categories = categories.map(function (key) {
             return {
                 tag: 'a',
@@ -174,6 +178,7 @@ define([
         var catContainer = h('div.cp-dropdown-container' + (title ? '.cp-hidden': ''));
         makeCategoryDropdown(ctx, catContainer, function (key) {
             $(category).val(key);
+            // XXX add a hint suggesting relevant information to include for the chosen category
         });
 
         var attachments, addAttachment;