thredded 0.13.5 → 0.13.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: cd0d58c2a26339dd5988d86b1d55297db8d3cace
4
- data.tar.gz: 77fbbf2c0e238e565c0d48156b7473fc7617e716
3
+ metadata.gz: 3c864a4b1ed0b4d38726be7df8dcdefdb99d14ab
4
+ data.tar.gz: 1310af3413e71199ec94f2ef69b23c01fd1c572c
5
5
  SHA512:
6
- metadata.gz: f1e60000d6f6905352e132302b24bb7a48cf2f9c63c8093da98b6486779c4493bd085ad79a2716c89dd414d72e1088b52f3d46ffc2347aedec08226c5a5591fb
7
- data.tar.gz: c2f0928832d74cde99927f7f60aa28d131d75904c86e8eaf8a8e33d95364c9717b8f4e0e59b4e752bf955cec4a4c33a3f8c018ec03ea6e969a5fad9fba573909
6
+ metadata.gz: 4840d80355f2e8560833aca29d2ee25cea89e6621ec0035a584044998e64a8b968f179d8bcc26e4bbe9403278694a7f392efca234e1209337cc0ca31c29e84db
7
+ data.tar.gz: 06cc507e88323255fb3e0c07e75559bd0158e9759309ea3e99df36b5a706841ed54b5ee0f625f899004254fff0eb1aa2cd081774d30bc1a5ae9c0dc62edb0be0
data/README.md CHANGED
@@ -98,7 +98,7 @@ Then, see the rest of this Readme for more information about using and customizi
98
98
  Add the gem to your Gemfile:
99
99
 
100
100
  ```ruby
101
- gem 'thredded', '~> 0.13.5'
101
+ gem 'thredded', '~> 0.13.6'
102
102
  ```
103
103
 
104
104
  Add the Thredded [initializer] to your parent app by running the install generator.
@@ -91,6 +91,10 @@ $thredded-badge-active-background: $thredded-action-color !default;
91
91
  $thredded-badge-inactive-color: $thredded-button-color !default;
92
92
  $thredded-badge-inactive-background: rgba($thredded-text-color, 0.3) !default;
93
93
 
94
+ // Locked topics
95
+ $thredded-badge-locked-color: $thredded-alert-warning-background;
96
+ $thredded-badge-locked-background: $thredded-alert-warning-color;
97
+
94
98
  // Onebox
95
99
  $thredded-onebox-favicons: (
96
100
  'amazon': 'favicons/amazon.png',
@@ -172,3 +172,15 @@
172
172
  display: none;
173
173
  }
174
174
  }
175
+
176
+ .thredded--topic-locked {
177
+ .thredded--topics--posts-count {
178
+ color: $thredded-badge-locked-color;
179
+ background-color: $thredded-badge-locked-background;
180
+ }
181
+ }
182
+
183
+ .thredded--topic--locked-notice {
184
+ @extend %thredded--alert;
185
+ @extend %thredded--alert--warning;
186
+ }
@@ -40,7 +40,7 @@ module Thredded
40
40
 
41
41
  def update
42
42
  authorize post, :update?
43
- post.update_attributes(new_post_params)
43
+ post.update(new_post_params)
44
44
 
45
45
  redirect_to post_path(post, user: thredded_current_user)
46
46
  end
@@ -39,7 +39,7 @@ module Thredded
39
39
 
40
40
  def update
41
41
  authorize post, :update?
42
- post.update_attributes(post_params.except(:user, :ip))
42
+ post.update(new_private_post_params)
43
43
 
44
44
  redirect_to post_path(post, user: thredded_current_user)
45
45
  end
@@ -20,6 +20,10 @@
20
20
  <footer class="thredded--pagination-bottom"><%= paginate @posts %></footer>
21
21
  <% end %>
22
22
 
23
+ <% if topic.locked? %>
24
+ <p class="thredded--topic--locked-notice"><%= t 'thredded.topics.locked.message'%></p>
25
+ <% end %>
26
+
23
27
  <% if policy(@new_post.post).create? %>
24
28
  <div class="thredded--post-form--wrapper">
25
29
  <h3 class="thredded--post-form--title"><%= t('thredded.posts.form.title_label') %></h3>
@@ -210,6 +210,7 @@ en:
210
210
  update_btn: Update Topic
211
211
  locked:
212
212
  label: Locked
213
+ message: This topic has been locked by a moderator.
213
214
  mark_as_unread: Mark unread from here
214
215
  not_following: You are not following this topic.
215
216
  search:
@@ -214,6 +214,7 @@ es:
214
214
  update_btn: Actualizar Tema
215
215
  locked:
216
216
  label: Bloqueado
217
+ message: Este tema ha sido bloqueado por un moderador.
217
218
  mark_as_unread: Marcar sin leer desde aquí
218
219
  not_following: No estás siguiendo este tema.
219
220
  search:
@@ -211,6 +211,7 @@ fr:
211
211
  update_btn: Mettre à jour le Sujet
212
212
  locked:
213
213
  label: Verrouillé
214
+ message: Ce sujet a été verrouillé par un modérateur.
214
215
  mark_as_unread: Marquer comme non lu à partir d'ici
215
216
  not_following: Vous ne suivez pas ce sujet.
216
217
  search:
@@ -210,6 +210,7 @@ pl:
210
210
  update_btn: Zaktualizuj temat
211
211
  locked:
212
212
  label: Zablokowany
213
+ message: Ten temat został zablokowany przez moderatora.
213
214
  mark_as_unread: Oznacz jako nieprzeczytane stąd
214
215
  not_following: Nie obserwujesz tego tematu.
215
216
  search:
@@ -214,6 +214,7 @@ pt-BR:
214
214
  update_btn: Atualizar Tópico
215
215
  locked:
216
216
  label: Trancado
217
+ message: Este tópico foi bloqueado por um moderador.
217
218
  mark_as_unread: Marca não lida a partir daqui
218
219
  not_following: Você não está seguindo este tema.
219
220
  search:
@@ -208,6 +208,7 @@ ru:
208
208
  update_btn: Обновление темы
209
209
  locked:
210
210
  label: Заблокировать тему
211
+ message: Эта тема закрыта модератором.
211
212
  mark_as_unread: Пометить как непрочитанное
212
213
  not_following: не отслеживаю
213
214
  search:
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Thredded
4
- VERSION = '0.13.5'
4
+ VERSION = '0.13.6'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thredded
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.13.5
4
+ version: 0.13.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2017-10-11 00:00:00.000000000 Z
12
+ date: 2017-10-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: pundit