v0.1.0-beta.7

The behaviour is not overly intuitive, and the icon wasn't helping
(hamburger icon usually means "menu"). Now the back button always goes
back to the index, no matter where you are, and there's a tooltip that
says "Back to discussion list".

.gitattributes

@@ -2,3 +2,10 @@
 .gitignore export-ignore
 .gitmodules export-ignore
 .travis.yml export-ignore
+.editorconfig export-ignore
+.styleci.yml export-ignore
+
+phpunit.xml export-ignore
+tests export-ignore
+
+js/*/dist/*.js -diff

.styleci.yml

@@ -5,6 +5,7 @@ enabled:
 
 disabled:
   - align_double_arrow
+  - blank_line_after_opening_tag
   - multiline_array_trailing_comma
   - new_with_braces
   - phpdoc_align

.travis.yml

@@ -1,9 +1,9 @@
 language: php
 
 php:
-  - 5.5
   - 5.6
   - 7.0
+  - 7.1
   - hhvm
 
 matrix:

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2014-2016 Toby Zerner
+Copyright (c) 2014-2017 Toby Zerner
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

composer.json

@@ -20,7 +20,7 @@
         "docs": "http://flarum.org/docs"
     },
     "require": {
-        "php": ">=5.5.9",
+        "php": ">=5.6.0",
         "dflydev/fig-cookies": "^1.0.2",
         "doctrine/dbal": "^2.5",
         "components/font-awesome": "^4.6",
@@ -50,10 +50,10 @@
         "symfony/http-foundation": "^2.7",
         "symfony/translation": "^2.7",
         "symfony/yaml": "^2.7",
-        "s9e/text-formatter": "^0.6.1",
+        "s9e/text-formatter": "^0.8.1",
         "tobscure/json-api": "^0.3.0",
         "zendframework/zend-diactoros": "^1.1",
-        "zendframework/zend-stratigility": "^1.1"
+        "zendframework/zend-stratigility": "^1.3"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.4",

js/admin/src/components/AddExtensionModal.js

@@ -15,7 +15,7 @@ export default class AddExtensionModal extends Modal {
   }
 
   title() {
-    return 'Add Extension';
+    return app.translator.trans('core.admin.add_extension.title');
   }
 
   content() {

js/admin/src/components/AppearancePage.js

@@ -28,8 +28,8 @@ export default class AppearancePage extends Page {
               </div>
 
               <div className="AppearancePage-colors-input">
-                <input className="FormControl" placeholder="#aaaaaa" value={this.primaryColor()} onchange={m.withAttr('value', this.primaryColor)}/>
+                <input className="FormControl" type="color" placeholder="#aaaaaa" value={this.primaryColor()} onchange={m.withAttr('value', this.primaryColor)}/>
-                <input className="FormControl" placeholder="#aaaaaa" value={this.secondaryColor()} onchange={m.withAttr('value', this.secondaryColor)}/>
+                <input className="FormControl" type="color" placeholder="#aaaaaa" value={this.secondaryColor()} onchange={m.withAttr('value', this.secondaryColor)}/>
               </div>
 
               {Switch.component({

js/admin/src/components/BasicsPage.js

@@ -5,6 +5,7 @@ import Button from 'flarum/components/Button';
 import Alert from 'flarum/components/Alert';
 import saveSettings from 'flarum/utils/saveSettings';
 import ItemList from 'flarum/utils/ItemList';
+import Switch from 'flarum/components/Switch';
 
 export default class BasicsPage extends Page {
   init() {
@@ -16,6 +17,7 @@ export default class BasicsPage extends Page {
       'forum_title',
       'forum_description',
       'default_locale',
+      'show_language_selector',
       'default_route',
       'welcome_title',
       'welcome_message'
@@ -23,13 +25,15 @@ export default class BasicsPage extends Page {
     this.values = {};
 
     const settings = app.data.settings;
-    this.fields.forEach(key => this.values[key] = m.prop(settings[key]));
+    this.fields.forEach(key => this.values[key] = m.prop(settings[key] || false));
 
     this.localeOptions = {};
     const locales = app.data.locales;
     for (const i in locales) {
       this.localeOptions[i] = `${locales[i]} (${i})`;
     }
+
+    if (typeof this.values.show_language_selector() !== "number") this.values.show_language_selector(1);
   }
 
   view() {
@@ -60,7 +64,13 @@ export default class BasicsPage extends Page {
                 children: [
                   Select.component({
                     options: this.localeOptions,
+                    value: this.values.default_locale(),
                     onchange: this.values.default_locale
+                  }),
+                  Switch.component({
+                    state: this.values.show_language_selector(),
+                    onchange: this.values.show_language_selector,
+                    children: app.translator.trans('core.admin.basics.show_language_selector_label'),
                   })
                 ]
               })

js/admin/src/components/PermissionGrid.js

@@ -91,6 +91,13 @@ export default class PermissionGrid extends Component {
       allowGuest: true
     }, 100);
 
+    items.add('viewUserList', {
+      icon: 'users',
+      label: app.translator.trans('core.admin.permissions.view_user_list_label'),
+      permission: 'viewUserList',
+      allowGuest: true
+    }, 100);
+
     items.add('signUp', {
       icon: 'user-plus',
       label: app.translator.trans('core.admin.permissions.sign_up_label'),

js/bower.json

@@ -11,6 +11,7 @@
     "es6-micro-loader": "caridy/es6-micro-loader#v0.2.1",
     "fastclick": "~1.0.6",
     "autolink": "~1.0.0",
-    "m.attrs.bidi": "tobscure/m.attrs.bidi"
+    "m.attrs.bidi": "tobscure/m.attrs.bidi",
+    "punycode": "http://cdnjs.cloudflare.com/ajax/libs/punycode/1.4.1/punycode.js"
   }
 }

js/forum/Gulpfile.js

@@ -23,7 +23,8 @@ gulp({
 
     bowerDir + '/spin.js/spin.js',
     bowerDir + '/spin.js/jquery.spin.js',
-    bowerDir + '/fastclick/lib/fastclick.js'
+    bowerDir + '/fastclick/lib/fastclick.js',
+    bowerDir + '/punycode/index.js'
   ],
   modules: {
     'flarum': [

js/forum/src/components/EditUserModal.js

@@ -15,6 +15,7 @@ export default class EditUserModal extends Modal {
 
     this.username = m.prop(user.username() || '');
     this.email = m.prop(user.email() || '');
+    this.isActivated = m.prop(user.isActivated() || false);
     this.setPassword = m.prop(false);
     this.password = m.prop(user.password() || '');
     this.groups = {};
@@ -37,22 +38,32 @@ export default class EditUserModal extends Modal {
       <div className="Modal-body">
         <div className="Form">
           <div className="Form-group">
-            <label>Username</label>
+            <label>{app.translator.trans('core.forum.edit_user.username_heading')}</label>
             <input className="FormControl" placeholder={extractText(app.translator.trans('core.forum.edit_user.username_label'))}
               bidi={this.username} />
           </div>
 
           {app.session.user !== this.props.user ? [
             <div className="Form-group">
-              <label>Email</label>
+              <label>{app.translator.trans('core.forum.edit_user.email_heading')}</label>
               <div>
                 <input className="FormControl" placeholder={extractText(app.translator.trans('core.forum.edit_user.email_label'))}
                   bidi={this.email} />
               </div>
+              {!this.isActivated() ? (
+                <div>
+                  {Button.component({
+                    className: 'Button Button--block',
+                    children: app.translator.trans('core.forum.edit_user.activate_button'),
+                    loading: this.loading,
+                    onclick: this.activate.bind(this)
+                  })}
+                </div>
+              ) : ''}
             </div>,
 
             <div className="Form-group">
-              <label>Password</label>
+              <label>{app.translator.trans('core.forum.edit_user.password_heading')}</label>
               <div>
                 <label className="checkbox">
                   <input type="checkbox" checked={this.setPassword()} onchange={e => {
@@ -61,7 +72,7 @@ export default class EditUserModal extends Modal {
                     if (e.target.checked) this.$('[name=password]').select();
                     m.redraw.strategy('none');
                   }}/>
-                  Set new password
+                  {app.translator.trans('core.forum.edit_user.set_password_label')}
                 </label>
                 {this.setPassword() ? (
                   <input className="FormControl" type="password" name="password" placeholder={extractText(app.translator.trans('core.forum.edit_user.password_label'))}
@@ -72,7 +83,7 @@ export default class EditUserModal extends Modal {
           ] : ''}
 
           <div className="Form-group EditUserModal-groups">
-            <label>Groups</label>
+            <label>{app.translator.trans('core.forum.edit_user.groups_heading')}</label>
             <div>
               {Object.keys(this.groups)
                 .map(id => app.store.getById('groups', id))
@@ -100,6 +111,24 @@ export default class EditUserModal extends Modal {
     );
   }
 
+  activate() {
+    this.loading = true;
+    const data = {
+      username: this.username(),
+      isActivated: true,
+    };
+    this.props.user.save(data, {errorHandler: this.onerror.bind(this)})
+      .then(() => {
+        this.isActivated(true);
+        this.loading = false;
+        m.redraw();
+      })
+      .catch(() => {
+        this.loading = false;
+        m.redraw();
+      });
+  }
+
   data() {
     const groups = Object.keys(this.groups)
       .filter(id => this.groups[id]())

js/forum/src/components/HeaderSecondary.js

@@ -39,7 +39,7 @@ export default class HeaderSecondary extends Component {
 
     items.add('search', app.search.render(), 30);
 
-    if (Object.keys(app.data.locales).length > 1) {
+    if (app.forum.attribute("showLanguageSelector") && Object.keys(app.data.locales).length > 1) {
       const locales = [];
 
       for (const locale in app.data.locales) {

js/forum/src/components/IndexPage.js

@@ -8,7 +8,7 @@ import WelcomeHero from 'flarum/components/WelcomeHero';
 import DiscussionComposer from 'flarum/components/DiscussionComposer';
 import LogInModal from 'flarum/components/LogInModal';
 import DiscussionPage from 'flarum/components/DiscussionPage';
-import Select from 'flarum/components/Select';
+import Dropdown from 'flarum/components/Dropdown';
 import Button from 'flarum/components/Button';
 import LinkButton from 'flarum/components/LinkButton';
 import SelectDropdown from 'flarum/components/SelectDropdown';
@@ -55,7 +55,7 @@ export default class IndexPage extends Page {
       app.cache.discussionList = new DiscussionList({params});
     }
 
-    app.history.push('index', icon('bars'));
+    app.history.push('index', app.translator.trans('core.forum.header.back_to_index_tooltip'));
 
     this.bodyClass = 'App--index';
   }
@@ -212,10 +212,20 @@ export default class IndexPage extends Page {
     }
 
     items.add('sort',
-      Select.component({
+      Dropdown.component({
-        options: sortOptions,
+        buttonClassName: 'Button',
-        value: this.params().sort || Object.keys(sortMap)[0],
+        label: sortOptions[this.params().sort] || Object.keys(sortMap).map(key => sortOptions[key])[0],
-        onchange: this.changeSort.bind(this)
+        children: Object.keys(sortOptions).map(value => {
+          const label = sortOptions[value];
+          const active = (this.params().sort || Object.keys(sortMap)[0]) === value;
+
+          return Button.component({
+            children: label,
+            icon: active ? 'check' : true,
+            onclick: this.changeSort.bind(this, value),
+            active: active,
+          })
+        }),
       })
     );
 
@@ -236,7 +246,13 @@ export default class IndexPage extends Page {
         title: app.translator.trans('core.forum.index.refresh_tooltip'),
         icon: 'refresh',
         className: 'Button Button--icon',
-        onclick: () => app.cache.discussionList.refresh()
+        onclick: () => {
+          app.cache.discussionList.refresh();
+          if (app.session.user) {
+            app.store.find('users', app.session.user.id());
+            m.redraw();
+          }
+        }
       })
     );
 

js/forum/src/components/LogInModal.js

@@ -11,7 +11,7 @@ import extractText from 'flarum/utils/extractText';
  *
  * ### Props
  *
- * - `email`
+ * - `identification`
  * - `password`
  */
 export default class LogInModal extends Modal {
@@ -19,11 +19,11 @@ export default class LogInModal extends Modal {
     super.init();
 
     /**
-     * The value of the email input.
+     * The value of the identification input.
      *
      * @type {Function}
      */
-    this.email = m.prop(this.props.email || '');
+    this.identification = m.prop(this.props.identification || '');
 
     /**
      * The value of the password input.
@@ -31,6 +31,13 @@ export default class LogInModal extends Modal {
      * @type {Function}
      */
     this.password = m.prop(this.props.password || '');
+
+    /**
+     * The value of the remember me input.
+     *
+     * @type {Function}
+     */
+    this.remember = m.prop(!!this.props.remember);
   }
 
   className() {
@@ -48,8 +55,8 @@ export default class LogInModal extends Modal {
 
         <div className="Form Form--centered">
           <div className="Form-group">
-            <input className="FormControl" name="email" type="text" placeholder={extractText(app.translator.trans('core.forum.log_in.username_or_email_placeholder'))}
+            <input className="FormControl" name="identification" type="text" placeholder={extractText(app.translator.trans('core.forum.log_in.username_or_email_placeholder'))}
-              bidi={this.email}
+              bidi={this.identification}
               disabled={this.loading} />
           </div>
 
@@ -59,6 +66,15 @@ export default class LogInModal extends Modal {
               disabled={this.loading} />
           </div>
 
+          <div className="Form-group">
+            <div>
+              <label className="checkbox">
+                <input type="checkbox" bidi={this.remember} disabled={this.loading} />
+                {app.translator.trans('core.forum.log_in.remember_me_label')}
+              </label>
+            </div>
+          </div>
+
           <div className="Form-group">
             {Button.component({
               className: 'Button Button--primary Button--block',
@@ -90,7 +106,7 @@ export default class LogInModal extends Modal {
    * @public
    */
   forgotPassword() {
-    const email = this.email();
+    const email = this.identification();
     const props = email.indexOf('@') !== -1 ? {email} : undefined;
 
     app.modal.show(new ForgotPasswordModal(props));
@@ -104,14 +120,14 @@ export default class LogInModal extends Modal {
    */
   signUp() {
     const props = {password: this.password()};
-    const email = this.email();
+    const identification = this.identification();
-    props[email.indexOf('@') !== -1 ? 'email' : 'username'] = email;
+    props[identification.indexOf('@') !== -1 ? 'email' : 'username'] = identification;
 
     app.modal.show(new SignUpModal(props));
   }
 
   onready() {
-    this.$('[name=' + (this.email() ? 'password' : 'email') + ']').select();
+    this.$('[name=' + (this.identification() ? 'password' : 'identification') + ']').select();
   }
 
   onsubmit(e) {
@@ -119,13 +135,15 @@ export default class LogInModal extends Modal {
 
     this.loading = true;
 
-    const email = this.email();
+    const identification = this.identification();
     const password = this.password();
+    const remember = this.remember();
 
-    app.session.login(email, password, {errorHandler: this.onerror.bind(this)}).then(
+    app.session.login({identification, password, remember}, {errorHandler: this.onerror.bind(this)})
-      () => window.location.reload(),
+      .then(
-      this.loaded.bind(this)
+        () => window.location.reload(),
-    );
+        this.loaded.bind(this)
+      );
   }
 
   onerror(error) {

js/forum/src/components/RenameDiscussionModal.js

@@ -0,0 +1,70 @@
+import Modal from 'flarum/components/Modal';
+import Button from 'flarum/components/Button';
+
+/**
+ * The 'RenameDiscussionModal' displays a modal dialog with an input to rename a discussion
+ */
+export default class RenameDiscussionModal extends Modal {
+  init() {
+    super.init();
+
+    this.discussion = this.props.discussion;
+    this.currentTitle = this.props.currentTitle;
+    this.newTitle = m.prop(this.currentTitle);
+  }
+
+  className() {
+    return 'RenameDiscussionModal Modal--small';
+  }
+
+  title() {
+    return app.translator.trans('core.forum.rename_discussion.title');
+  }
+
+  content() {
+    return (
+      <div className="Modal-body">
+        <div className="Form Form--centered">
+          <div className="Form-group">
+            <input className="FormControl" bidi={this.newTitle} type="text" />
+          </div>
+          <div className="Form-group">
+            {Button.component({
+              className: 'Button Button--primary Button--block',
+              type: 'submit',
+              loading: this.loading,
+              children: app.translator.trans('core.forum.rename_discussion.submit_button')
+            })}
+          </div>
+        </div>
+      </div>
+    )
+  }
+
+  onsubmit(e) {
+    e.preventDefault();
+
+    this.loading = true;
+
+    const title = this.newTitle;
+    const currentTitle = this.currentTitle;
+
+    // If the title is different to what it was before, then save it. After the
+    // save has completed, update the post stream as there will be a new post
+    // indicating that the discussion was renamed.
+    if (title && title !== currentTitle) {
+      return this.discussion.save({title}).then(() => {
+        if (app.viewingDiscussion(this.discussion)) {
+          app.current.stream.update();
+        }
+        m.redraw();
+        this.hide();
+      }).catch(() => {
+        this.loading = false;
+        m.redraw();
+      });
+    } else {
+      this.hide();
+    }
+  }
+}

js/forum/src/components/Search.js

@@ -83,6 +83,7 @@ export default class Search extends Component {
       })}>
         <div className="Search-input">
           <input className="FormControl"
+            type="search"
             placeholder={extractText(app.translator.trans('core.forum.header.search_placeholder'))}
             value={this.value()}
             oninput={m.withAttr('value', this.value)}

js/forum/src/components/SignUpModal.js

@@ -116,7 +116,7 @@ export default class SignUpModal extends Modal {
    */
   logIn() {
     const props = {
-      email: this.email() || this.username(),
+      identification: this.email() || this.username(),
       password: this.password()
     };
 

js/forum/src/components/UserBio.js

@@ -45,15 +45,14 @@ export default class UserBio extends Component {
         }
       }
 
-      content = <div className="UserBio-content">{subContent}</div>;
+      content = <div className="UserBio-content" onclick={this.edit.bind(this)}>{subContent}</div>;
     }
 
     return (
       <div className={'UserBio ' + classList({
           editable: this.props.editable,
           editing: this.editing
-        })}
+        })}>
-        onclick={this.edit.bind(this)}>
         {content}
       </div>
     );

js/forum/src/components/UserPage.js

@@ -26,8 +26,6 @@ export default class UserPage extends Page {
      */
     this.user = null;
 
-    app.history.push('user');
-
     this.bodyClass = 'App--user';
   }
 
@@ -74,7 +72,6 @@ export default class UserPage extends Page {
   show(user) {
     this.user = user;
 
-    app.history.push('user', user.username());
     app.setTitle(user.username());
 
     m.redraw();

js/forum/src/initializers/boot.js

@@ -4,7 +4,6 @@ import ScrollListener from 'flarum/utils/ScrollListener';
 import Pane from 'flarum/utils/Pane';
 import Drawer from 'flarum/utils/Drawer';
 import mapRoutes from 'flarum/utils/mapRoutes';
-import icon from 'flarum/helpers/icon';
 import Navigation from 'flarum/components/Navigation';
 import HeaderPrimary from 'flarum/components/HeaderPrimary';
 import HeaderSecondary from 'flarum/components/HeaderSecondary';
@@ -31,7 +30,7 @@ export default function boot(app) {
   }
 
   app.routes[defaultAction].path = '/';
-  app.history.push(defaultAction, icon('bars'), '/');
+  app.history.push(defaultAction, app.translator.trans('core.forum.header.back_to_index_tooltip'), '/');
 
   m.startComputation();
 
@@ -62,6 +61,10 @@ export default function boot(app) {
     if (e.ctrlKey || e.metaKey || e.which === 2) return;
     e.preventDefault();
     app.history.home();
+    if (app.session.user) {
+      app.store.find('users', app.session.user.id());
+      m.redraw();
+    }
   });
 
   // Add a class to the body which indicates that the page has been scrolled

js/forum/src/utils/DiscussionControls.js

@@ -3,6 +3,7 @@ import ReplyComposer from 'flarum/components/ReplyComposer';
 import LogInModal from 'flarum/components/LogInModal';
 import Button from 'flarum/components/Button';
 import Separator from 'flarum/components/Separator';
+import RenameDiscussionModal from 'flarum/components/RenameDiscussionModal';
 import ItemList from 'flarum/utils/ItemList';
 import extractText from 'flarum/utils/extractText';
 
@@ -227,19 +228,9 @@ export default {
    * @return {Promise}
    */
   renameAction() {
-    const currentTitle = this.title();
+    return app.modal.show(new RenameDiscussionModal({
-    const title = prompt(extractText(app.translator.trans('core.forum.discussion_controls.rename_text')), currentTitle);
+      currentTitle: this.title(),
-
+      discussion: this
-    // If the title is different to what it was before, then save it. After the
+    }));
-    // save has completed, update the post stream as there will be a new post
-    // indicating that the discussion was renamed.
-    if (title && title !== currentTitle) {
-      return this.save({title}).then(() => {
-        if (app.viewingDiscussion(this)) {
-          app.current.stream.update();
-        }
-        m.redraw();
-      });
-    }
   }
 };

js/forum/src/utils/UserControls.js

@@ -18,11 +18,11 @@ export default {
    * @return {ItemList}
    * @public
    */
-  controls(discussion, context) {
+  controls(user, context) {
     const items = new ItemList();
 
     ['user', 'moderation', 'destructive'].forEach(section => {
-      const controls = this[section + 'Controls'](discussion, context).toArray();
+      const controls = this[section + 'Controls'](user, context).toArray();
       if (controls.length) {
         controls.forEach(item => items.add(item.itemName, item));
         items.add(section + 'Separator', Separator.component());

js/forum/src/utils/affixSidebar.js

@@ -4,22 +4,38 @@
  *
  * @param {DOMElement} element
  * @param {Boolean} isInitialized
+ * @param {Object} context
  */
-export default function affixSidebar(element, isInitialized) {
+export default function affixSidebar(element, isInitialized, context) {
   if (isInitialized) return;
 
-  const $sidebar = $(element);
+  const onresize = () => {
-  const $header = $('#header');
+    const $sidebar = $(element);
-  const $footer = $('#footer');
+    const $header = $('#header');
+    const $footer = $('#footer');
+    const $affixElement = $sidebar.find('> ul');
 
-  // Don't affix the sidebar if it is taller than the viewport (otherwise
+    $(window).off('.affix');
-  // there would be no way to scroll through its content).
+    $affixElement
-  if ($sidebar.outerHeight(true) > $(window).height() - $header.outerHeight(true)) return;
+      .removeClass('affix affix-top affix-bottom')
+      .removeData('bs.affix');
 
-  $sidebar.find('> ul').affix({
+    // Don't affix the sidebar if it is taller than the viewport (otherwise
-    offset: {
+    // there would be no way to scroll through its content).
-      top: () => $sidebar.offset().top - $header.outerHeight(true) - parseInt($sidebar.css('margin-top'), 10),
+    if ($sidebar.outerHeight(true) > $(window).height() - $header.outerHeight(true)) return;
-      bottom: () => this.bottom = $footer.outerHeight(true)
+
-    }
+    $affixElement.affix({
-  });
+      offset: {
+        top: () => $sidebar.offset().top - $header.outerHeight(true) - parseInt($sidebar.css('margin-top'), 10),
+        bottom: () => this.bottom = $footer.outerHeight(true)
+      }
+    });
+  };
+
+  // Register the affix plugin to execute on every window resize (and trigger)
+  $(window).on('resize', onresize).resize();
+
+  context.onunload = () => {
+    $(window).off('resize', onresize);
+  }
 }

js/lib/Session.js

@@ -30,11 +30,11 @@ export default class Session {
    * @return {Promise}
    * @public
    */
-  login(identification, password, options = {}) {
+  login(data, options = {}) {
     return app.request(Object.assign({
       method: 'POST',
       url: app.forum.attribute('baseUrl') + '/login',
-      data: {identification, password}
+      data
     }, options));
   }
 

js/lib/components/Navigation.js

@@ -50,10 +50,10 @@ export default class Navigation extends Component {
     const previous = history.getPrevious() || {};
 
     return LinkButton.component({
-      className: 'Button Navigation-back ' + (previous.title ? '' : 'Button--icon'),
+      className: 'Button Navigation-back Button--icon',
       href: history.backUrl(),
       icon: 'chevron-left',
-      children: previous.title,
+      title: previous.title,
       config: () => {},
       onclick: e => {
         if (e.shiftKey || e.ctrlKey || e.metaKey || e.which === 2) return;

js/lib/helpers/icon.js

@@ -6,7 +6,7 @@
  * @return {Object}
  */
 export default function icon(name, attrs = {}) {
-  attrs.className = 'icon fa fa-fw fa-' + name + ' ' + (attrs.className || '');
+  attrs.className = 'icon fa fa-' + name + ' ' + (attrs.className || '');
 
   return <i {...attrs}/>;
 }

js/lib/models/Discussion.js

@@ -102,5 +102,3 @@ Object.assign(Discussion.prototype, {
     return posts ? posts.data.map(link => link.id) : [];
   }
 });
-
-export default Discussion;

js/lib/models/Notification.js

@@ -17,5 +17,3 @@ Object.assign(Notification.prototype, {
   sender: Model.hasOne('sender'),
   subject: Model.hasOne('subject')
 });
-
-export default Notification;

js/lib/models/Post.js

@@ -26,5 +26,3 @@ Object.assign(Post.prototype, {
   canEdit: Model.attribute('canEdit'),
   canDelete: Model.attribute('canDelete')
 });
-
-export default Post;

js/lib/models/User.js

@@ -109,5 +109,3 @@ Object.assign(User.prototype, {
     return this.save({preferences});
   }
 });
-
-export default User;

js/lib/utils/mixin.js

@@ -3,7 +3,7 @@
  * the prototype of a parent object.
  *
  * @example
- * class MyClass extends mixin(ExtistingClass, evented, etc) {}
+ * class MyClass extends mixin(ExistingClass, evented, etc) {}
  *
  * @param {Class} Parent The class to extend the new class from.
  * @param {...Object} mixins The objects to mix in.

less/admin/BasicsPage.less

@@ -9,7 +9,7 @@
   }
 
   fieldset {
-    margin-bottom: 30px;
+    margin-bottom: 20px;
 
     > ul {
       list-style: none;

less/forum/Composer.less

@@ -61,6 +61,7 @@
     }
     .icon {
       font-size: 14px;
+      margin-right: 3px;
     }
   }
 }

less/forum/NotificationGrid.less

@@ -31,6 +31,7 @@
   .icon {
     font-size: 14px;
     margin-right: 2px;
+    .fa-fw();
   }
 }
 .NotificationGrid-checkbox {

less/lib/Button.less

@@ -224,14 +224,14 @@
   }
 }
 .Button-icon {
-  margin-right: 3px;
+  margin-right: 7px;
 }
 .Button-icon,
 .Button-caret {
   font-size: 14px;
 }
 .Button-caret {
-  margin-left: 3px;
+  margin-left: 7px;
 }
 .Button-badge {
   font-size: 12px;

less/lib/Dropdown.less

@@ -49,6 +49,7 @@
         float: left;
         margin-left: -25px;
         margin-top: 2px;
+        .fa-fw();
       }
 
       &.disabled {

less/lib/Search.less

@@ -60,6 +60,7 @@
     padding-left: 32px;
     padding-right: 32px;
     .transition(all 0.4s);
+    box-sizing: inherit !important;
   }
   .Button {
     float: left;

less/lib/Select.less

@@ -16,4 +16,5 @@
   margin-left: -30px;
   pointer-events: none;
   color: @control-color;
+  .fa-fw();
 }

less/lib/scaffolding.less

@@ -83,6 +83,10 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+
+  > ul > li {
+    margin-bottom: 10px;
+  }
 }
 legend {
   font-size: 14px;

migrations/2015_02_24_000000_create_access_tokens_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_api_keys_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_config_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_discussions_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_email_tokens_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_groups_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_notifications_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_password_tokens_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_permissions_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_posts_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_users_discussions_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_users_groups_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_02_24_000000_create_users_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_09_15_000000_create_auth_tokens_table.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_09_20_224327_add_hide_to_discussions.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_09_22_030432_rename_notification_read_time.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_10_07_130531_rename_config_to_settings.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_10_24_194000_add_ip_address_to_posts.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_12_05_042721_change_access_tokens_columns.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2015_12_17_194247_change_settings_value_column_to_text.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2016_02_04_095452_add_slug_to_discussions.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

migrations/2017_04_07_114138_add_is_private_to_discussions.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Flarum\Database\Migration;
+
+return Migration::addColumns('discussions', [
+    'is_private' => ['boolean', 'default' => false]
+]);

migrations/2017_04_07_114138_add_is_private_to_posts.php

@@ -0,0 +1,16 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Flarum\Database\Migration;
+
+return Migration::addColumns('posts', [
+    'is_private' => ['boolean', 'default' => false]
+]);

migrations/2017_04_09_152230_change_posts_content_column_to_mediumtext.php

@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of Flarum.
+ *
+ * (c) Toby Zerner <toby.zerner@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Schema\Builder;
+
+return [
+    'up' => function (Builder $schema) {
+        $schema->table('posts', function (Blueprint $table) {
+            $table->mediumText('content')->change();
+        });
+    },
+
+    'down' => function (Builder $schema) {
+        $schema->table('posts', function (Blueprint $table) {
+            $table->text('content')->change();
+        });
+    }
+];

src/Admin/AdminServiceProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Admin/Controller/WebAppController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Admin/Middleware/RequireAdministrateAbility.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Admin/Server.php

@@ -25,11 +25,16 @@ class Server extends AbstractServer
     protected function getMiddleware(Application $app)
     {
         $pipe = new MiddlewarePipe;
+        $pipe->raiseThrowables();
 
         if ($app->isInstalled()) {
             $path = parse_url($app->url('admin'), PHP_URL_PATH);
             $errorDir = __DIR__.'/../../error';
 
+            // All requests should first be piped through our global error handler
+            $debugMode = ! $app->isUpToDate() || $app->inDebugMode();
+            $pipe->pipe($path, new HandleErrors($errorDir, $app->make('log'), $debugMode));
+
             if ($app->isUpToDate()) {
                 $pipe->pipe($path, $app->make('Flarum\Http\Middleware\ParseJsonBody'));
                 $pipe->pipe($path, $app->make('Flarum\Http\Middleware\StartSession'));
@@ -41,12 +46,10 @@ class Server extends AbstractServer
                 event(new ConfigureMiddleware($pipe, $path, $this));
 
                 $pipe->pipe($path, $app->make('Flarum\Http\Middleware\DispatchRoute', ['routes' => $app->make('flarum.admin.routes')]));
-                $pipe->pipe($path, new HandleErrors($errorDir, $app->make('log'), $app->inDebugMode()));
             } else {
                 $app->register('Flarum\Update\UpdateServiceProvider');
 
                 $pipe->pipe($path, $app->make('Flarum\Http\Middleware\DispatchRoute', ['routes' => $app->make('flarum.update.routes')]));
-                $pipe->pipe($path, new HandleErrors($errorDir, $app->make('log'), true));
             }
         }
 

src/Admin/UrlGenerator.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Admin/WebApp.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/ApiKey.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/ApiServiceProvider.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Client.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *
@@ -12,30 +13,29 @@ namespace Flarum\Api;
 
 use Exception;
 use Flarum\Core\User;
+use Flarum\Foundation\Application;
 use Flarum\Http\Controller\ControllerInterface;
-use Illuminate\Contracts\Container\Container;
 use InvalidArgumentException;
 use Zend\Diactoros\ServerRequestFactory;
 
 class Client
 {
-    /**
-     * @var Container
-     */
-    protected $container;
-
     /**
      * @var ErrorHandler
      */
     protected $errorHandler;
+    /**
+     * @var Application
+     */
+    private $app;
 
     /**
-     * @param Container $container
+     * @param Application $app
      * @param ErrorHandler $errorHandler
      */
-    public function __construct(Container $container, ErrorHandler $errorHandler)
+    public function __construct(Application $app, ErrorHandler $errorHandler)
     {
-        $this->container = $container;
+        $this->app = $app;
         $this->errorHandler = $errorHandler;
     }
 
@@ -47,6 +47,7 @@ class Client
      * @param array $queryParams
      * @param array $body
      * @return \Psr\Http\Message\ResponseInterface
+     * @throws Exception
      */
     public function send($controller, $actor, array $queryParams = [], array $body = [])
     {
@@ -55,7 +56,7 @@ class Client
         $request = $request->withAttribute('actor', $actor);
 
         if (is_string($controller)) {
-            $controller = $this->container->make($controller);
+            $controller = $this->app->make($controller);
         }
 
         if (! ($controller instanceof ControllerInterface)) {
@@ -67,6 +68,10 @@ class Client
         try {
             return $controller->handle($request);
         } catch (Exception $e) {
+            if ($this->app->inDebugMode()) {
+                throw $e;
+            }
+
             return $this->errorHandler->handle($e);
         }
     }

src/Api/Controller/AbstractCollectionController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/AbstractCreateController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/AbstractDeleteController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/AbstractResourceController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/AbstractSerializeController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *
@@ -185,7 +186,7 @@ abstract class AbstractSerializeController implements ControllerInterface
      */
     protected function extractFilter(ServerRequestInterface $request)
     {
-        return $this->buildParameters($request)->getFilter();
+        return $this->buildParameters($request)->getFilter() ?: [];
     }
 
     /**

src/Api/Controller/CreateDiscussionController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/CreateGroupController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/CreatePostController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/CreateUserController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/DeleteAvatarController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/DeleteDiscussionController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/DeleteFaviconController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/DeleteGroupController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/DeleteLogoController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/DeletePostController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/DeleteUserController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/ForgotPasswordController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/ListDiscussionsController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/ListGroupsController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/ListNotificationsController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/ListPostsController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/ListUsersController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *
@@ -11,6 +12,7 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Api\UrlGenerator;
+use Flarum\Core\Exception\PermissionDeniedException;
 use Flarum\Core\Search\SearchCriteria;
 use Flarum\Core\Search\User\UserSearcher;
 use Psr\Http\Message\ServerRequestInterface;
@@ -33,7 +35,7 @@ class ListUsersController extends AbstractCollectionController
      */
     public $sortFields = [
         'username',
-        'postsCount',
+        'commentsCount',
         'discussionsCount',
         'lastSeenTime',
         'joinTime'
@@ -65,6 +67,11 @@ class ListUsersController extends AbstractCollectionController
     protected function data(ServerRequestInterface $request, Document $document)
     {
         $actor = $request->getAttribute('actor');
+
+        if ($actor->cannot('viewUserList')) {
+            throw new PermissionDeniedException;
+        }
+
         $query = array_get($this->extractFilter($request), 'q');
         $sort = $this->extractSort($request);
 

src/Api/Controller/ReadAllNotificationsController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/SendConfirmationEmailController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *

src/Api/Controller/SetPermissionController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of Flarum.
  *