thredded 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8023f4374b36ef9c88f7619b9768b5be2c4bca46
-  data.tar.gz: 9d18f2e394e2bbf3e4469735cd48ca5f0003bfd2
+  metadata.gz: 0404295457d213a2f5fdb46e8cff204fb08dc55b
+  data.tar.gz: 11dd30fc6953380143931bb1ebd52b7dd6ec1f57
 SHA512:
-  metadata.gz: 8144322f3774be32136e270fdf52733062d53917882e2759a1b122280332904df9fd558085d17a4b565dea5a4f5c17dc8019a81b16b022cd471518a64b3880d1
-  data.tar.gz: 41d7acb3dfbe5a619cb6abb47ee313ab04e6697867ec2c09566f7a6fadf85c32547b99729c844d57a9b2248738e9d455edcaf38588693f1e9d77bb24631c1f46
+  metadata.gz: 1d66513bb8d504e9f1f6762b709f857c435a8fd6729f9e10ec08fcc0cae746e792132f3bbc64cf366c62603a6bc6fbae1fa1d6b3df9587bff8c618615a84383b
+  data.tar.gz: 58ea29e130f147a419b27f75312411c4e6786af2320a20563ae6ee895733cbaac787168beacbb7943480690cb34622f05a119866d87f2f56978af68b48f501b9

data/CHANGELOG.mkdn

@@ -1,3 +1,29 @@
+# 0.5.0
+
+**NB:** If updating to this version from 0.4.x, you will need to copy and run [this migration](https://github.com/thredded/thredded/blob/5e203c8eec05919d97f4d26fa2a1fc3081e992a7/db/upgrade_migrations/20160501151908_upgrade_v0_4_to_v0_5.rb).
+
+## Added
+
+This release includes two major features:
+
+* Topic subscriptions and an improved notifications system. [#310](https://github.com/thredded/thredded/pull/310)
+* A basic [moderation system](https://github.com/thredded/thredded#moderation). [#45](https://github.com/thredded/thredded/issues/45)
+
+Additionally, content formatting is now easier to configure. [#321](https://github.com/thredded/thredded/pull/321)
+
+## Changed
+
+* `<figure>` and `<figcaption>` are now allowed in formatted post content.
+
+## Fixed
+
+* YouTube embeds. [#314](https://github.com/thredded/thredded/issues/314)
+* Creating a topic now marks it as read. [#322](https://github.com/thredded/thredded/issues/322)
+* Dates older than a year now display the year. [#309](https://github.com/thredded/thredded/issues/309)
+* `<a>` tags without `href` in posts no longer cause an exception. [#313](https://github.com/thredded/thredded/issues/313)
+
+See the full list of changes here: https://github.com/thredded/thredded/compare/v0.4.0...v0.5.0.
+
 # 0.4.0 - 2016-05-21
 
 **NB:** If updating to this version from 0.3.x, you will need to copy and run [this migration](https://github.com/thredded/thredded/blob/559fc205b9ee405abfe3968b981254f01f928027/db/upgrade_migrations/20160429222452_upgrade_v0_3_to_v0_4.rb).

data/README.mkdn

@@ -4,20 +4,17 @@ _Thredded_ is a Rails 4.2+ forum/messageboard engine. Its goal is to be as simpl
 
 Some of the features currently in Thredded:
 
-* Markdown post formatting (by default).
+* Markdown post formatting with some BBCode support (by default).
 * (Un)read posts tracking.
-* Email notifications, @-mentions, per-messageboard notification settings.
+* Email notifications, topic subscriptions, @-mentions, per-messageboard notification settings.
 * Private group messaging.
 * Full-text search using the database.
 * Pinned and locked topics.
 * List of currently online users, for all forums and per-messageboard.
 * Flexible permissions system.
+* Basic moderation.
 * Lightweight default theme configurable via Sass.
 
-Planned features:
-
-* Flexible moderation system with per-messageboard settings. #45
-
 <a href='https://pledgie.com/campaigns/27480'><img alt='Click here to lend your support to: Thredded and make a donation at pledgie.com !' src='https://pledgie.com/campaigns/27480.png?skin_name=chrome' border='0' ></a>
 
 <img src="http://emoji.fileformat.info/gemoji/point_up.png" width="24"> If you are so inclined, donating to the project will help aid in its development
@@ -47,7 +44,7 @@ application and not an engine like Thredded.
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.4.0'
+gem 'thredded', '~> 0.5.0'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -86,6 +83,25 @@ DbTextSearch::CaseInsensitive.add_index(
     connection, Thredded.user_class.table_name, Thredded.user_name_column, unique: true)
 ```
 
+### Upgrading an existing install
+
+1) To upgrade the initializer:
+
+```console
+rails g thredded:install
+```
+
+But then compare this with the previous version to decide what to keep.
+
+2) To upgrade the database (in this example from v0.4 to the v0.5):
+
+```console
+cp `bundle show thredded`/db/upgrade_migrations/20160501151908_upgrade_v0_4_to_v0_5.rb db/migrate
+rake db:migrate
+```
+
+Note that for guaranteed best results you will want to run this with the gem checked out with v0.5.0
+
 ### Migrating from Forem
 
 Are you currently using [Forem]? Thredded provides [a migration][forem-to-thredded] to copy all of your existing data from Forem over
@@ -358,6 +374,35 @@ Currently, the default behaviour is to render an error message with an appropria
 layout. You may want to override the handling for `Thredded::Errors::LoginRequired` to render a login form instead.
 For an example of how to do this, see the initializer.
 
+## Moderation
+
+Thredded comes with two options for the moderation system:
+
+1. Reactive moderation, where posts from first-time users are published immediately but enter the moderation queue
+   (default).
+2. Pre-emptive moderation, where posts from first-time users are not published until they have been approved.
+
+This is controlled by the `Thredded.content_visible_while_pending_moderation` setting.
+
+Users, topics, and posts can be in one of three moderation states: `pending_moderation`, `approved`, and `blocked`.
+By default, new users are `pending_moderation`, and new posts and topics inherit their default moderation_state from
+the user's.
+
+When you approve a new user's post, all of their later posts will be approved automatically.
+
+Additionally, users always see their own posts regardless of the moderation state. For blocked users, this means
+they might not realize they have been blocked right away.
+
+Blocked users cannot send private messages.
+
+### Disabling moderation
+
+To disable moderation, e.g. if you run internal forums that do not need moderation, run the following migration:
+
+```ruby
+change_column_default :thredded_user_details, :moderation_state, 1 # approved
+```
+
 ## Development
 
 To be more clear - this is the for when you are working on *this* gem.

data/app/assets/images/thredded/moderation.svg

@@ -0,0 +1,4 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+    <path d="M12 6c0-.55-.45-1-1-1H5.82l.66-3.18.02-.23c0-.31-.13-.59-.33-.8L5.38 0 .44 4.94C.17 5.21 0 5.59 0 6v6.5c0 .83.67 1.5 1.5 1.5h6.75c.62 0 1.15-.38 1.38-.91l2.26-5.29c.07-.17.11-.36.11-.55V6zm10.5 4h-6.75c-.62 0-1.15.38-1.38.91l-2.26 5.29c-.07.17-.11.36-.11.55V18c0 .55.45 1 1 1h5.18l-.66 3.18-.02.24c0 .31.13.59.33.8l.79.78 4.94-4.94c.27-.27.44-.65.44-1.06v-6.5c0-.83-.67-1.5-1.5-1.5z"/>
+    <path d="M0 0h24v24H0z" fill="none"/>
+</svg>

data/app/assets/images/thredded/private-messages.svg

@@ -1,4 +1,4 @@
-<svg height="32" viewBox="0 0 24 24" width="32" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <path d="M0 0h24v24H0z" fill="none"/>
     <path d="M20 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H4V8l8 5 8-5v10zm-8-7L4 6h16l-8 5z"/>
 </svg>

data/app/assets/images/thredded/settings.svg

@@ -1,4 +1,4 @@
-<svg height="48" viewBox="0 0 24 24" width="32" xmlns="http://www.w3.org/2000/svg">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
     <path d="M0 0h24v24H0z" fill="none"/>
     <path d="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/>
 </svg>

data/app/assets/stylesheets/thredded/_base.scss

@@ -1,11 +1,11 @@
 // This Sass package defines Thredded variables, mixins, and placeholders.
 
 @import "base/variables";
+@import "base/grid";
 
 @import "base/alerts";
 @import "base/buttons";
 @import "base/forms";
-@import "base/grid";
 @import "base/lists";
 @import "base/nav";
 @import "base/tables";

data/app/assets/stylesheets/thredded/_thredded.scss

@@ -9,6 +9,7 @@
   @import "layout/search-navigation";
   @import "layout/user-navigation";
   @import "layout/navigation";
+  @import "layout/moderation";
 
   @import "components/base";
   @import "components/alerts";

data/app/assets/stylesheets/thredded/base/_buttons.scss

@@ -38,3 +38,19 @@
     }
   }
 }
+
+%thredded--buttons-list {
+  text-align: center;
+  a, .button_to {
+    display: block;
+    margin-top: $thredded-small-spacing;
+  }
+  @include thredded-media-tablet-and-up {
+    a, .button_to {
+      display: inline-block;
+    }
+    a + a, .button_to + .button_to {
+      margin-left: $thredded-small-spacing;
+    }
+  }
+}

data/app/assets/stylesheets/thredded/base/_grid.scss

@@ -4,12 +4,24 @@
   }
 }
 
+@mixin thredded-media-tablet-and-down {
+  @media screen and (max-width: map-get($thredded-grid-breakpoint-max-widths, tablet)) {
+    @content;
+  }
+}
+
 @mixin thredded-media-tablet-and-up {
   @media screen and (min-width: map-get($thredded-grid-breakpoint-max-widths, mobile) + 0.00001rem) {
     @content;
   }
 }
 
+@mixin thredded-media-desktop-and-up {
+  @media screen and (min-width: map-get($thredded-grid-breakpoint-max-widths, tablet) + 0.00001rem) {
+    @content;
+  }
+}
+
 @mixin thredded--clearfix {
   &::after {
     clear: both;

data/app/assets/stylesheets/thredded/components/_base.scss

@@ -11,3 +11,7 @@
 &--link {
   @extend %thredded--link;
 }
+
+&--blockquote {
+  @extend %thredded--blockquote;
+}

data/app/assets/stylesheets/thredded/components/_messageboard.scss

@@ -51,17 +51,5 @@
 }
 
 &--messageboards--actions {
-  text-align: center;
-  a {
-    display: block;
-    margin-top: $thredded-small-spacing;
-  }
-  @include thredded-media-tablet-and-up {
-    a {
-      display: inline-block;
-    }
-    a + a {
-      margin-left: $thredded-small-spacing;
-    }
-  }
+  @extend %thredded--buttons-list;
 }

data/app/assets/stylesheets/thredded/components/_topic-header.scss

@@ -28,3 +28,30 @@
   font-size: $thredded-font-size-small;
   margin-left: 0.4rem;
 }
+&--topic-follow-info {
+  float: right;
+  color: $thredded-secondary-text-color;
+  &.thredded--following {
+    font-size: 0.65rem;
+  }
+  &.thredded--notfollowing {
+    font-size: $thredded-font-size-small;
+  }
+  font-style: normal;
+  max-width: 60%;
+  text-align: right;
+  p {
+    margin: 0;
+  }
+  form {
+    display: inline-block;
+    input[type=submit] {
+      background:none;
+      border:none;
+      padding:0;
+      font: inherit;
+      cursor: pointer;
+      @extend %thredded--link;
+    }
+  }
+}

data/app/assets/stylesheets/thredded/layout/_main-navigation.scss

@@ -2,7 +2,7 @@
   @extend %thredded--list-unstyled;
   @include thredded--clearfix;
   display: block;
-  @include thredded-media-tablet-and-up {
+  @include thredded-media-desktop-and-up {
     margin-top: $thredded-small-spacing;
   }
 }

data/app/assets/stylesheets/thredded/layout/_moderation.scss

@@ -0,0 +1,45 @@
+&--post-moderation-actions {
+  @extend %thredded--buttons-list;
+}
+
+&--moderation--history-link {
+  float: right;
+  margin: 0.4rem 0.6rem $thredded-small-spacing 0;
+  position: relative;
+  z-index: 1;
+}
+
+&--moderated-notice {
+  margin-bottom: $thredded-base-spacing;
+  padding: $thredded-small-spacing $thredded-base-spacing;
+  background: $thredded-light-gray;
+}
+
+&--post-moderation-record {
+  .thredded--post {
+    margin-bottom: 0;
+    margin-left: 4rem;
+  }
+  &--moderation-state-notice {
+    margin-bottom: 1rem;
+    a {
+      @extend %thredded--link;
+    }
+    .thredded--post-moderation-record-approved & {
+      color: $thredded-alert-success-color;
+    }
+    .thredded--post-moderation-record-blocked & {
+      color: $thredded-alert-danger-color;
+    }
+  }
+  &--content-changed-notice {
+    font-style: italic;
+    a {
+      @extend %thredded--link;
+    }
+  }
+}
+
+&--post-moderation-record + &--post-moderation-record {
+  margin-top: $thredded-large-spacing;
+}

data/app/assets/stylesheets/thredded/layout/_navigation.scss

@@ -6,7 +6,8 @@
   }
 }
 
-@include thredded-media-mobile {
+@include thredded-media-tablet-and-down {
+  $icon-nav-item-width: 2.625rem;
   &--navigation {
     display: table;
     position: relative;
@@ -18,7 +19,10 @@
   }
   &--navigation-breadcrumbs {
     font-size: $thredded-font-size-small;
-    padding-right: 5rem;
+    padding-right: $icon-nav-item-width * 2;
+    .thredded--is-moderator & {
+      padding-right: $icon-nav-item-width * 3;
+    }
   }
   &--navigation--search {
     display: none;
@@ -50,12 +54,17 @@
         height: 2rem;
       }
     }
+    %icon-counter {
+      bottom: 0.3rem;
+      position: absolute;
+      right: -0.2rem;
+    }
     .thredded--nav-text {
       display: none;
     }
     &--settings {
       @extend %icon-nav-item;
-      right: 2.6rem;
+      right: $icon-nav-item-width;
     }
     &--private-topics {
       @extend %icon-nav-item;
@@ -65,9 +74,14 @@
         position: relative;
       }
       &--unread {
-        bottom: 0.3rem;
-        position: absolute;
-        right: -0.2rem;
+        @extend %icon-counter;
+      }
+    }
+    &--moderation {
+      @extend %icon-nav-item;
+      right: $icon-nav-item-width * 2;
+      &--pending-count {
+        @extend %icon-counter
       }
     }
   }

data/app/assets/stylesheets/thredded/layout/_search-navigation.scss

@@ -5,7 +5,7 @@
   top: 0;
   right: 0;
 
-  @include thredded-media-mobile {
+  @include thredded-media-tablet-and-down {
     position: initial;
   }
 
@@ -17,7 +17,7 @@
     box-shadow: none;
     width: 100%;
 
-    @include thredded-media-tablet-and-up {
+    @include thredded-media-desktop-and-up {
       $padding-x: 0.75rem;
       background: transparent;
       border-color: transparent;

data/app/assets/stylesheets/thredded/layout/_user-navigation.scss

@@ -8,7 +8,6 @@
   @include thredded-media-tablet-and-up {
     font-size: $thredded-font-size-small;
     margin-bottom: 0;
-    margin-top: $thredded-large-spacing;
   }
 
   a {
@@ -41,7 +40,9 @@
 .thredded--preferences &--user-navigation--settings,
 .thredded--new-private-topic &--user-navigation--private-topics,
 .thredded--private-topics-index &--user-navigation--private-topics,
-.thredded--private-topic-show &--user-navigation--private-topics {
+.thredded--private-topic-show &--user-navigation--private-topics,
+.thredded--pending-moderation &--user-navigation--moderation,
+.thredded--moderation-history &--user-navigation--moderation {
   border-bottom: 1px solid $thredded-action-color;
   margin-bottom: -1px;
 
@@ -50,7 +51,8 @@
   }
 }
 
-&--user-navigation--private-topics--unread {
+&--user-navigation--private-topics--unread,
+&--user-navigation--moderation--pending-count {
   background: $thredded-badge-active-background;
   border-radius: 10px;
   color: $thredded-badge-active-color;