Commit 1da6547000e57e0498ebaa1797ff47bef473a6eb

Authored by Victor Costa
2 parents 87ccdfde c3d79cfa
Exists in staging

Merge branch 'staging' of softwarepublico.gov.br:noosferogov/noosfero into staging

Showing 4277 changed files with 147478 additions and 155 deletions   Show diff stats

Too many changes.

To preserve performance only 100 of 4277 files displayed.

.gitmodules
1 1 [submodule "plugins/pairwise"]
2 2 path = plugins/pairwise
3   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/pairwise.git
  3 + url = https://gitlab.com/noosfero-plugins/pairwise.git
4 4 [submodule "plugins/proposals_discussion"]
5 5 path = plugins/proposals_discussion
6   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/proposals_discussion.git
7   -[submodule "plugins/gamification"]
8   - path = plugins/gamification
9   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/gamification.git
  6 + url = https://gitlab.com/noosfero-plugins/proposals_discussion.git
10 7 [submodule "plugins/notification"]
11 8 path = plugins/notification
12   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/notification.git
  9 + url = https://gitlab.com/noosfero-plugins/notification.git
  10 +[submodule "plugins/gamification"]
  11 + path = plugins/gamification
  12 + url = https://gitlab.com/noosfero-plugins/gamification.git
13 13 [submodule "plugins/email_article"]
14 14 path = plugins/email_article
15   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/email_article.git
  15 + url = https://gitlab.com/noosfero-plugins/email_article.git
16 16 [submodule "plugins/gravatar_provider"]
17 17 path = plugins/gravatar_provider
18   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/gravatar-provider.git
  18 + url = https://gitlab.com/noosfero-plugins/gravatar-provider.git
19 19 [submodule "plugins/juventude"]
20 20 path = plugins/juventude
21   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/juventude.git
  21 + url = https://gitlab.com/noosfero-plugins/juventude.git
22 22 [submodule "plugins/dialoga"]
23 23 path = plugins/dialoga
24   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/dialoga-plugin.git
25   -[submodule "rest-clients/confjuvapp"]
26   - path = rest-clients/confjuvapp
27   - url = https://softwarepublico.gov.br/gitlab/noosfero-apps/confjuvapp.git
28   -[submodule "rest-clients/proposal-app"]
29   - path = rest-clients/proposal-app
30   - url = https://softwarepublico.gov.br/gitlab/noosfero-apps/proposal-app.git
  24 + url = https://gitlab.com/noosfero-plugins/dialoga-plugin.git
31 25 [submodule "plugins/serpro_captcha"]
32 26 path = plugins/serpro_captcha
33   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/serpro_captcha.git
  27 + url = https://gitlab.com/noosfero-plugins/serpro_captcha.git
34 28 [submodule "plugins/recaptcha"]
35 29 path = plugins/recaptcha
36   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/recaptcha.git
  30 + url = https://gitlab.com/noosfero-plugins/recaptcha.git
37 31 [submodule "plugins/insight"]
38 32 path = plugins/insight
39   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/insight.git
  33 + url = https://gitlab.com/noosfero-plugins/insight.git
40 34 [submodule "plugins/community_hub"]
41 35 path = plugins/community_hub
42   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/community_hub.git
43   -[submodule "plugins/inclusao_digital"]
44   - path = plugins/inclusao_digital
45   - url = http://softwarepublico.gov.br/gitlab/noosfero-plugins/inclusao_digital.git
  36 + url = https://gitlab.com/noosfero-plugins/community_hub.git
46 37 [submodule "plugins/serpro_integration"]
47 38 path = plugins/serpro_integration
48   - url = https://softwarepublico.gov.br/gitlab/noosfero-plugins/serpro_integration.git
  39 + url = https://gitlab.com/noosfero-plugins/serpro_integration.git
  40 +[submodule "public/designs/themes/conference"]
  41 + path = public/designs/themes/conference
  42 + url = https://gitlab.com/noosfero-themes/conference.git
  43 +[submodule "public/designs/themes/participa-site"]
  44 + path = public/designs/themes/participa-site
  45 + url = https://gitlab.com/noosfero-themes/participa-site.git
  46 +[submodule "public/designs/themes/presidencia"]
  47 + path = public/designs/themes/presidencia
  48 + url = https://gitlab.com/noosfero-themes/presidencia.git
  49 +[submodule "public/designs/themes/planejamento-serpro"]
  50 + path = public/designs/themes/planejamento-serpro
  51 + url = https://gitlab.com/noosfero-themes/planejamento-serpro.git
  52 +[submodule "public/designs/themes/voce-serpro"]
  53 + path = public/designs/themes/voce-serpro
  54 + url = https://gitlab.com/noosfero-themes/voce-serpro.git
  55 +[submodule "public/designs/themes/softwarepublico"]
  56 + path = public/designs/themes/softwarepublico
  57 + url = https://gitlab.com/noosfero-themes/softwarepublico.git
  58 +[submodule "public/designs/themes/mrosc-theme"]
  59 + path = public/designs/themes/mrosc-theme
  60 + url = https://gitlab.com/noosfero-themes/mrosc-theme.git
  61 +[submodule "public/designs/themes/colabora"]
  62 + path = public/designs/themes/colabora
  63 + url = https://gitlab.com/noosfero-themes/colabora.git
  64 +[submodule "public/designs/themes/inclusao-digital"]
  65 + path = public/designs/themes/inclusao-digital
  66 + url = https://gitlab.com/noosfero-themes/inclusao-digital.git
  67 +[submodule "public/designs/themes/participa-consulta"]
  68 + path = public/designs/themes/participa-consulta
  69 + url = https://gitlab.com/noosfero-themes/participa-consulta.git
  70 +[submodule "public/designs/themes/participa-theme"]
  71 + path = public/designs/themes/participa-theme
  72 + url = https://gitlab.com/noosfero-themes/participa-theme.git
  73 +[submodule "public/designs/themes/serpro"]
  74 + path = public/designs/themes/serpro
  75 + url = https://gitlab.com/noosfero-themes/serpro.git
  76 +[submodule "public/designs/themes/voce-serpro-novo"]
  77 + path = public/designs/themes/voce-serpro-novo
  78 + url = https://gitlab.com/noosfero-themes/voce-serpro-novo.git
  79 +[submodule "public/designs/themes/juventude"]
  80 + path = public/designs/themes/juventude
  81 + url = https://gitlab.com/noosfero-themes/juventude.git
  82 +[submodule "public/designs/themes/new-participa-theme"]
  83 + path = public/designs/themes/new-participa-theme
  84 + url = https://gitlab.com/noosfero-themes/new-participa-theme.git
  85 +[submodule "public/designs/themes/participa-event"]
  86 + path = public/designs/themes/participa-event
  87 + url = https://gitlab.com/noosfero-themes/participa-event.git
  88 +[submodule "public/designs/themes/participatorio-theme"]
  89 + path = public/designs/themes/participatorio-theme
  90 + url = https://gitlab.com/noosfero-themes/participatorio-theme.git
  91 +[submodule "public/designs/themes/sinesp"]
  92 + path = public/designs/themes/sinesp
  93 + url = https://gitlab.com/noosfero-themes/sinesp.git
  94 +[submodule "public/designs/themes/maranhao"]
  95 + path = public/designs/themes/maranhao
  96 + url = https://gitlab.com/noosfero-themes/maranhao.git
  97 +[submodule "public/designs/themes/minjustica"]
  98 + path = public/designs/themes/minjustica
  99 + url = https://gitlab.com/noosfero-themes/minjustica.git
  100 +[submodule "rest-clients/confjuvapp"]
  101 + path = rest-clients/confjuvapp
  102 + url = https://gitlab.com/noosfero-apps/confjuvapp.git
  103 +[submodule "rest-clients/proposal-app"]
  104 + path = rest-clients/proposal-app
  105 + url = https://gitlab.com/noosfero-apps/proposal-app.git
... ...
Gemfile
... ... @@ -27,7 +27,7 @@ gem 'rest-client', '~> 1.6'
27 27 gem 'exception_notification', '~> 4.0.1'
28 28 gem 'gettext', '~> 3.1', :require => false
29 29 gem 'locale', '~> 2.1'
30   -gem 'whenever', '~> 0.9.4', :require => false
  30 +gem 'whenever', '0.9.4', :require => false
31 31 gem 'eita-jrails', '~> 0.10.0', require: 'jrails'
32 32 gem 'diffy', '~> 3.0'
33 33 gem 'slim'
... ...
Gemfile.lock
... ... @@ -108,15 +108,15 @@ GEM
108 108 remote: https://rubygems.org/
109 109 specs:
110 110 RedCloth (4.2.9)
111   - actionmailer (4.2.5)
112   - actionpack (= 4.2.5)
113   - actionview (= 4.2.5)
114   - activejob (= 4.2.5)
  111 + actionmailer (4.2.6)
  112 + actionpack (= 4.2.6)
  113 + actionview (= 4.2.6)
  114 + activejob (= 4.2.6)
115 115 mail (~> 2.5, >= 2.5.4)
116 116 rails-dom-testing (~> 1.0, >= 1.0.5)
117   - actionpack (4.2.5)
118   - actionview (= 4.2.5)
119   - activesupport (= 4.2.5)
  117 + actionpack (4.2.6)
  118 + actionview (= 4.2.6)
  119 + activesupport (= 4.2.6)
120 120 rack (~> 1.6)
121 121 rack-test (~> 0.6.2)
122 122 rails-dom-testing (~> 1.0, >= 1.0.5)
... ... @@ -125,27 +125,27 @@ GEM
125 125 actionpack (>= 4.0.0, < 5.0)
126 126 actionpack-page_caching (1.0.2)
127 127 actionpack (>= 4.0.0, < 5)
128   - actionview (4.2.5)
129   - activesupport (= 4.2.5)
  128 + actionview (4.2.6)
  129 + activesupport (= 4.2.6)
130 130 builder (~> 3.1)
131 131 erubis (~> 2.7.0)
132 132 rails-dom-testing (~> 1.0, >= 1.0.5)
133 133 rails-html-sanitizer (~> 1.0, >= 1.0.2)
134   - activejob (4.2.5)
135   - activesupport (= 4.2.5)
  134 + activejob (4.2.6)
  135 + activesupport (= 4.2.6)
136 136 globalid (>= 0.3.0)
137   - activemodel (4.2.5)
138   - activesupport (= 4.2.5)
  137 + activemodel (4.2.6)
  138 + activesupport (= 4.2.6)
139 139 builder (~> 3.1)
140   - activerecord (4.2.5)
141   - activemodel (= 4.2.5)
142   - activesupport (= 4.2.5)
  140 + activerecord (4.2.6)
  141 + activemodel (= 4.2.6)
  142 + activesupport (= 4.2.6)
143 143 arel (~> 6.0)
144 144 activerecord-session_store (0.1.2)
145 145 actionpack (>= 4.0.0, < 5)
146 146 activerecord (>= 4.0.0, < 5)
147 147 railties (>= 4.0.0, < 5)
148   - activesupport (4.2.5)
  148 + activesupport (4.2.6)
149 149 i18n (~> 0.7)
150 150 json (~> 1.7, >= 1.7.7)
151 151 minitest (~> 5.1)
... ... @@ -158,14 +158,15 @@ GEM
158 158 builder
159 159 multi_json
160 160 ansi (1.5.0)
161   - api-pagination (4.1.1)
  161 + api-pagination (4.3.0)
162 162 arel (6.0.3)
163 163 axiom-types (0.1.1)
164 164 descendants_tracker (~> 0.0.4)
165 165 ice_nine (~> 0.11.0)
166 166 thread_safe (~> 0.3, >= 0.3.1)
167 167 builder (3.2.2)
168   - capybara (2.5.0)
  168 + capybara (2.6.2)
  169 + addressable
169 170 mime-types (>= 1.16)
170 171 nokogiri (>= 1.3.3)
171 172 rack (>= 1.0.0)
... ... @@ -176,21 +177,26 @@ GEM
176 177 chronic (0.10.2)
177 178 coercible (1.0.0)
178 179 descendants_tracker (~> 0.0.1)
179   - concurrent-ruby (1.0.0)
180   - cucumber (1.3.20)
  180 + concurrent-ruby (1.0.1)
  181 + cucumber (2.3.3)
181 182 builder (>= 2.1.2)
  183 + cucumber-core (~> 1.4.0)
  184 + cucumber-wire (~> 0.0.1)
182 185 diff-lcs (>= 1.1.3)
183   - gherkin (~> 2.12)
  186 + gherkin (~> 3.2.0)
184 187 multi_json (>= 1.7.5, < 2.0)
185 188 multi_test (>= 0.1.2)
186   - cucumber-rails (1.4.2)
  189 + cucumber-core (1.4.0)
  190 + gherkin (~> 3.2.0)
  191 + cucumber-rails (1.4.3)
187 192 capybara (>= 1.1.2, < 3)
188   - cucumber (>= 1.3.8, < 2)
189   - mime-types (>= 1.16, < 3)
  193 + cucumber (>= 1.3.8, < 3)
  194 + mime-types (>= 1.16, < 4)
190 195 nokogiri (~> 1.5)
191   - rails (>= 3, < 5)
  196 + railties (>= 3, < 5)
  197 + cucumber-wire (0.0.1)
192 198 daemons (1.2.3)
193   - dalli (2.7.5)
  199 + dalli (2.7.6)
194 200 database_cleaner (1.5.1)
195 201 delayed_job (4.1.1)
196 202 activesupport (>= 3.0, < 5.0)
... ... @@ -201,9 +207,9 @@ GEM
201 207 thread_safe (~> 0.3, >= 0.3.1)
202 208 diff-lcs (1.2.5)
203 209 diffy (3.1.0)
204   - domain_name (0.5.25)
  210 + domain_name (0.5.20160310)
205 211 unf (>= 0.0.5, < 1.0.0)
206   - eita-jrails (0.10.0)
  212 + eita-jrails (0.10.1)
207 213 actionpack (>= 3.1.0)
208 214 activesupport (>= 3.0.0)
209 215 equalizer (0.0.11)
... ... @@ -214,15 +220,14 @@ GEM
214 220 execjs (2.6.0)
215 221 fast_gettext (0.9.2)
216 222 ffi (1.9.10)
217   - gettext (3.1.9)
  223 + gettext (3.2.1)
218 224 locale (>= 2.0.5)
219 225 text (>= 1.3.0)
220   - gherkin (2.12.2)
221   - multi_json (~> 1.3)
  226 + gherkin (3.2.0)
222 227 git-version-bump (0.15.1)
223 228 globalid (0.3.6)
224 229 activesupport (>= 4.1.0)
225   - grape (0.14.0)
  230 + grape (0.15.0)
226 231 activesupport
227 232 builder
228 233 hashie (>= 2.1.0)
... ... @@ -238,13 +243,13 @@ GEM
238 243 grape-swagger (0.10.2)
239 244 grape (>= 0.8.0)
240 245 grape-entity
241   - grape_logging (1.1.2)
  246 + grape_logging (1.2.1)
242 247 grape
243 248 hashie (3.4.3)
244 249 http-cookie (1.0.2)
245 250 domain_name (~> 0.5)
246 251 i18n (0.7.0)
247   - ice_nine (0.11.1)
  252 + ice_nine (0.11.2)
248 253 json (1.8.3)
249 254 kgio (2.10.0)
250 255 kramdown (1.9.0)
... ... @@ -256,13 +261,13 @@ GEM
256 261 nokogiri (>= 1.5.9)
257 262 magic (0.2.9)
258 263 ffi (>= 0.6.3)
259   - mail (2.6.3)
260   - mime-types (>= 1.16, < 3)
  264 + mail (2.6.4)
  265 + mime-types (>= 1.16, < 4)
261 266 metaclass (0.0.4)
262   - mime-types (2.99)
  267 + mime-types (2.99.1)
263 268 mini_portile2 (2.0.0)
264   - minitest (5.8.3)
265   - minitest-reporters (1.1.7)
  269 + minitest (5.8.4)
  270 + minitest-reporters (1.1.8)
266 271 ansi
267 272 builder
268 273 minitest (>= 5.0)
... ... @@ -273,11 +278,11 @@ GEM
273 278 multi_test (0.1.2)
274 279 multi_xml (0.5.5)
275 280 netrc (0.11.0)
276   - nokogiri (1.6.7.1)
  281 + nokogiri (1.6.7.2)
277 282 mini_portile2 (~> 2.0.0.rc2)
278 283 pg (0.18.4)
279 284 pothoven-attachment_fu (3.2.16)
280   - power_assert (0.2.6)
  285 + power_assert (0.2.7)
281 286 protected_attributes (1.1.3)
282 287 activemodel (>= 4.0.1, < 5.0)
283 288 rack (1.6.4)
... ... @@ -291,16 +296,16 @@ GEM
291 296 rack (>= 1.0.0)
292 297 rack-test (0.6.3)
293 298 rack (>= 1.0)
294   - rails (4.2.5)
295   - actionmailer (= 4.2.5)
296   - actionpack (= 4.2.5)
297   - actionview (= 4.2.5)
298   - activejob (= 4.2.5)
299   - activemodel (= 4.2.5)
300   - activerecord (= 4.2.5)
301   - activesupport (= 4.2.5)
  299 + rails (4.2.6)
  300 + actionmailer (= 4.2.6)
  301 + actionpack (= 4.2.6)
  302 + actionview (= 4.2.6)
  303 + activejob (= 4.2.6)
  304 + activemodel (= 4.2.6)
  305 + activerecord (= 4.2.6)
  306 + activesupport (= 4.2.6)
302 307 bundler (>= 1.3.0, < 2.0)
303   - railties (= 4.2.5)
  308 + railties (= 4.2.6)
304 309 sprockets-rails
305 310 rails-deprecated_sanitizer (1.0.3)
306 311 activesupport (>= 4.2.0.alpha)
... ... @@ -308,19 +313,19 @@ GEM
308 313 activesupport (>= 4.2.0.beta, < 5.0)
309 314 nokogiri (~> 1.6.0)
310 315 rails-deprecated_sanitizer (>= 1.0.1)
311   - rails-html-sanitizer (1.0.2)
  316 + rails-html-sanitizer (1.0.3)
312 317 loofah (~> 2.0)
313 318 rails-observers (0.1.2)
314 319 activemodel (~> 4.0)
315 320 rails_autolink (1.1.6)
316 321 rails (> 3.1)
317   - railties (4.2.5)
318   - actionpack (= 4.2.5)
319   - activesupport (= 4.2.5)
  322 + railties (4.2.6)
  323 + actionpack (= 4.2.6)
  324 + activesupport (= 4.2.6)
320 325 rake (>= 0.8.7)
321 326 thor (>= 0.18.1, < 2.0)
322   - raindrops (0.15.0)
323   - rake (10.4.2)
  327 + raindrops (0.16.0)
  328 + rake (11.1.1)
324 329 rest-client (1.8.0)
325 330 http-cookie (>= 1.0.2, < 2.0)
326 331 mime-types (>= 1.16, < 3.0)
... ... @@ -330,15 +335,15 @@ GEM
330 335 rspec-core (~> 3.4.0)
331 336 rspec-expectations (~> 3.4.0)
332 337 rspec-mocks (~> 3.4.0)
333   - rspec-core (3.4.1)
  338 + rspec-core (3.4.4)
334 339 rspec-support (~> 3.4.0)
335 340 rspec-expectations (3.4.0)
336 341 diff-lcs (>= 1.2.0, < 2.0)
337 342 rspec-support (~> 3.4.0)
338   - rspec-mocks (3.4.0)
  343 + rspec-mocks (3.4.1)
339 344 diff-lcs (>= 1.2.0, < 2.0)
340 345 rspec-support (~> 3.4.0)
341   - rspec-rails (3.4.0)
  346 + rspec-rails (3.4.2)
342 347 actionpack (>= 3.0, < 4.3)
343 348 activesupport (>= 3.0, < 4.3)
344 349 railties (>= 3.0, < 4.3)
... ... @@ -351,22 +356,21 @@ GEM
351 356 magic
352 357 ruby-progressbar (1.7.5)
353 358 rubyzip (1.2.0)
354   - sass (3.4.20)
  359 + sass (3.4.21)
355 360 sass-rails (5.0.4)
356 361 railties (>= 4.0.0, < 5.0)
357 362 sass (~> 3.1)
358 363 sprockets (>= 2.8, < 4.0)
359 364 sprockets-rails (>= 2.0, < 4.0)
360 365 tilt (>= 1.1, < 3)
361   - selenium-webdriver (2.52.0)
  366 + selenium-webdriver (2.53.0)
362 367 childprocess (~> 0.5)
363   - multi_json (~> 1.0)
364 368 rubyzip (~> 1.0)
365 369 websocket (~> 1.0)
366 370 slim (3.0.6)
367 371 temple (~> 0.7.3)
368 372 tilt (>= 1.3.3, < 2.1)
369   - spring (1.6.1)
  373 + spring (1.6.4)
370 374 sprockets (3.5.2)
371 375 concurrent-ruby (~> 1.0)
372 376 rack (> 1, < 3)
... ... @@ -376,20 +380,19 @@ GEM
376 380 sprockets (>= 2.8, < 4.0)
377 381 swagger-ui_rails (0.1.7)
378 382 temple (0.7.6)
379   - test-unit (3.1.5)
  383 + test-unit (3.1.8)
380 384 power_assert
381 385 text (1.3.1)
382 386 thor (0.19.1)
383 387 thread_safe (0.3.5)
384   - tilt (2.0.1)
  388 + tilt (2.0.2)
385 389 tzinfo (1.2.2)
386 390 thread_safe (~> 0.1)
387   - uglifier (2.7.2)
388   - execjs (>= 0.3.0)
389   - json (>= 1.8.0)
  391 + uglifier (3.0.0)
  392 + execjs (>= 0.3.0, < 3)
390 393 unf (0.1.4)
391 394 unf_ext
392   - unf_ext (0.0.7.1)
  395 + unf_ext (0.0.7.2)
393 396 unicorn (4.9.0)
394 397 kgio (~> 2.6)
395 398 rack
... ... @@ -441,7 +444,7 @@ DEPENDENCIES
441 444 gdata (> 0.0.0)!
442 445 gettext (~> 3.1)
443 446 grape (~> 0.12)
444   - grape-entity (= 0.4.8)
  447 + grape-entity (~> 0.4.8)
445 448 grape-swagger
446 449 grape_logging
447 450 honeypot (= 0.0.0)!
... ... @@ -449,7 +452,7 @@ DEPENDENCIES
449 452 kandadaboggu-vote_fu (> 0.0.0)!
450 453 kramdown
451 454 launchy
452   - liquid (~> 3.0.3)
  455 + liquid (>= 3.0.3)
453 456 locale (~> 2.1)
454 457 minitest
455 458 minitest-reporters
... ... @@ -476,7 +479,7 @@ DEPENDENCIES
476 479 ruby-feedparser (~> 0.7)
477 480 ruby_bosh (> 0.0.0)!
478 481 sass-rails
479   - selenium-webdriver (>= 2.50)
  482 + selenium-webdriver (>= 2.53)
480 483 slim
481 484 spring
482 485 sprockets-rails (~> 2.1)
... ... @@ -486,7 +489,7 @@ DEPENDENCIES
486 489 unicorn (~> 4.8)
487 490 validates_as_cnpj (= 0.0.0)!
488 491 validates_multiparameter_assignments (= 0.0.0)!
489   - whenever
  492 + whenever (= 0.9.4)
490 493 will_paginate (~> 3.0.7)
491 494 xss_terminate (= 0.0.0)!
492 495  
... ...
app/controllers/admin/features_controller.rb
... ... @@ -20,16 +20,11 @@ class FeaturesController &lt; AdminController
20 20 SlideshowBlock,
21 21 ProfileSearchBlock,
22 22 HighlightsBlock,
23   - FriendsBlock,
24 23 FavoriteEnterprisesBlock,
25 24 CommunitiesBlock,
26 25 EnterprisesBlock,
27   - MembersBlock,
28 26 DisabledEnterpriseMessageBlock,
29   - ProductCategoriesBlock,
30   - FeaturedProductsBlock,
31   - FansBlock,
32   - ProductsBlock ]
  27 + FansBlock ]
33 28  
34 29 @blocks += plugins.dispatch(:extra_blocks)
35 30 @blocks.sort_by! { |block| block.name }
... ...
app/controllers/my_profile/tasks_controller.rb
... ... @@ -55,11 +55,11 @@ class TasksController &lt; MyProfileController
55 55  
56 56 def close
57 57 failed = {}
58   - save = false
59 58  
60 59 if params[:tasks]
61 60 params[:tasks].each do |id, value|
62 61 decision = value[:decision]
  62 + save = false
63 63  
64 64 if value[:task].is_a?(Hash) && value[:task][:tag_list]
65 65  
... ...
app/models/environment.rb
... ... @@ -15,7 +15,7 @@ class Environment &lt; ApplicationRecord
15 15 :members_whitelist, :highlighted_news_amount,
16 16 :portal_news_amount, :date_format, :signup_intro,
17 17 :enable_feed_proxy, :http_feed_proxy, :https_feed_proxy,
18   - :disable_feed_ssl
  18 + :disable_feed_ssl, :disabled_blocks
19 19  
20 20 has_many :users
21 21  
... ... @@ -338,6 +338,8 @@ class Environment &lt; ApplicationRecord
338 338  
339 339 settings_items :enabled_plugins, :type => Array, :default => Noosfero::Plugin.available_plugin_names
340 340  
  341 + settings_items :disabled_blocks, :type => Array, :default => []
  342 +
341 343 settings_items :search_hints, :type => Hash, :default => {}
342 344  
343 345 # Set to return http forbidden to host not on the allow origin list bellow
... ... @@ -413,6 +415,10 @@ class Environment &lt; ApplicationRecord
413 415 enabled_plugins.include?(plugin.to_s)
414 416 end
415 417  
  418 + def block_disabled?(block)
  419 + disabled_blocks.include?(block.to_s)
  420 + end
  421 +
416 422 # enables the features identified by <tt>features</tt>, which is expected to
417 423 # be an Enumarable object containing the identifiers of the desired features.
418 424 # Passing <tt>nil</tt> is the same as passing an empty Array.
... ...
app/views/features/manage_blocks.html.erb
... ... @@ -62,7 +62,7 @@
62 62 </script>
63 63  
64 64 <div>
65   - <% button_bar do %>
  65 + <%= button_bar do %>
66 66 <%= submit_button('save', _('Save changes'), :id=>"save_blocks") %>
67 67 <%= button :back, _('Back to admin panel'), :controller => 'admin_panel', :action => 'index' %>
68 68 <% end %>
... ...
plugins/community_track/lib/community_track_plugin/step.rb
... ... @@ -61,7 +61,7 @@ class CommunityTrackPlugin::Step &lt; Folder
61 61 end
62 62  
63 63 def enabled_tools
64   - tools = [TinyMceArticle, Forum]
  64 + tools = [TextArticle, Forum]
65 65 tools << CommunityHubPlugin::Hub if environment.plugin_enabled?('CommunityHubPlugin')
66 66 tools << ProposalsDiscussionPlugin::Discussion if environment.plugin_enabled?('ProposalsDiscussionPlugin')
67 67 tools << PairwisePlugin::PairwiseContent if environment.plugin_enabled?('PairwisePlugin')
... ...
plugins/dialoga
1   -Subproject commit b31d1bc6fdaf41958b1302163efc96fea54747fb
  1 +Subproject commit 6452270ef6c21d5eb156f55672aa08ed14f24e52
... ...
plugins/gamification
1   -Subproject commit ed7b39f6dfcbb9f0ab27c4b7336f2870c2f6c3da
  1 +Subproject commit aac3cd727d59facddad06b0bbbf8284d3a0eda70
... ...
plugins/notification
1   -Subproject commit f96d1d7634049d5a840888f385922d044aa3f3a0
  1 +Subproject commit d987f54d627e733c97bf85b80bbe8edd5da67dbe
... ...
plugins/pairwise
1   -Subproject commit 3b53cb452812f0dc807a9543dd1520b2d80c675c
  1 +Subproject commit 6450a3c2107025c6543b334a736685e3396d515e
... ...
plugins/proposals_discussion
1   -Subproject commit 3d50338b0fee72107cb18b5a93f3c051c4ff31d9
  1 +Subproject commit 3cfaafee0181a641725491df45dc22929a6066db
... ...
public/designs/icons/tango/Tango
... ... @@ -1 +0,0 @@
1   -/usr/share/icons/Tango
2 0 \ No newline at end of file
public/designs/icons/tango/Tango/16x16/actions/add.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +list-add.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/address-book-new.png 0 → 100644

656 Bytes

public/designs/icons/tango/Tango/16x16/actions/appointment-new.png 0 → 100644

750 Bytes

public/designs/icons/tango/Tango/16x16/actions/appointment.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +appointment-new.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/back.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +go-previous.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/bookmark-new.png 0 → 100644

590 Bytes

public/designs/icons/tango/Tango/16x16/actions/bookmark_add.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +bookmark-new.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/bookmarks_list_add.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +bookmark-new.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/bottom.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +go-bottom.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/centrejust.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +format-justify-center.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/contact-new.png 0 → 100644

563 Bytes

public/designs/icons/tango/Tango/16x16/actions/document-new.png 0 → 100644

404 Bytes

public/designs/icons/tango/Tango/16x16/actions/document-open.png 0 → 100644

672 Bytes

public/designs/icons/tango/Tango/16x16/actions/document-print-preview.png 0 → 100644

703 Bytes

public/designs/icons/tango/Tango/16x16/actions/document-print.png 0 → 100644

462 Bytes

public/designs/icons/tango/Tango/16x16/actions/document-properties.png 0 → 100644

346 Bytes

public/designs/icons/tango/Tango/16x16/actions/document-save-as.png 0 → 100644

621 Bytes

public/designs/icons/tango/Tango/16x16/actions/document-save.png 0 → 100644

667 Bytes

public/designs/icons/tango/Tango/16x16/actions/down.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +go-down.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/edit-clear.png 0 → 100644

682 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-copy.png 0 → 100644

408 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-cut.png 0 → 100644

625 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-delete.png 0 → 100644

531 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-find-replace.png 0 → 100644

637 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-find.png 0 → 100644

507 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-paste.png 0 → 100644

473 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-redo.png 0 → 100644

502 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-select-all.png 0 → 100644

346 Bytes

public/designs/icons/tango/Tango/16x16/actions/edit-undo.png 0 → 100644

512 Bytes

public/designs/icons/tango/Tango/16x16/actions/editclear.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-clear.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/editcopy.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-copy.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/editcut.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-cut.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/editdelete.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-delete.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/editpaste.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-paste.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/exit.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +system-log-out.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/filefind.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-find.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/filenew.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +document-new.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/fileopen.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +document-open.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/fileprint.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +document-print.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/filequickprint.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +document-print-preview.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/filesave.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +document-save.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/filesaveas.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +document-save-as.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/find.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-find.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/finish.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +go-last.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/folder-new.png 0 → 100644

569 Bytes

public/designs/icons/tango/Tango/16x16/actions/folder_new.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +folder-new.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/format-indent-less.png 0 → 100644

352 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-indent-more.png 0 → 100644

355 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-justify-center.png 0 → 100644

250 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-justify-fill.png 0 → 100644

242 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-justify-left.png 0 → 100644

270 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-justify-right.png 0 → 100644

283 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-text-bold.png 0 → 100644

604 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-text-italic.png 0 → 100644

554 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-text-strikethrough.png 0 → 100644

487 Bytes

public/designs/icons/tango/Tango/16x16/actions/format-text-underline.png 0 → 100644

582 Bytes

public/designs/icons/tango/Tango/16x16/actions/forward.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +go-next.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-lockscreen.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +system-lock-screen.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-logout.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +system-log-out.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-searchtool.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +system-search.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-session-logout.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +system-log-out.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-shutdown.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +system-shutdown.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-stock-mail-fwd.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +mail-forward.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-stock-mail-new.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +mail-message-new.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-stock-mail-rpl.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +mail-reply-sender.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-stock-text-indent.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +format-indent-more.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gnome-stock-text-unindent.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +format-indent-less.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/go-bottom.png 0 → 100644

606 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-down.png 0 → 100644

600 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-first.png 0 → 100644

607 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-home.png 0 → 100644

529 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-jump.png 0 → 100644

591 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-last.png 0 → 100644

609 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-next.png 0 → 100644

613 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-previous.png 0 → 100644

562 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-top.png 0 → 100644

580 Bytes

public/designs/icons/tango/Tango/16x16/actions/go-up.png 0 → 100644

596 Bytes

public/designs/icons/tango/Tango/16x16/actions/gohome.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +go-home.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gtk-add.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +list-add.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gtk-bold.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +format-text-bold.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gtk-cancel.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +process-stop.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gtk-clear.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-clear.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gtk-copy.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-copy.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gtk-cut.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-cut.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gtk-delete.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-delete.png
0 2 \ No newline at end of file
... ...
public/designs/icons/tango/Tango/16x16/actions/gtk-find-and-replace.png 0 → 120000
... ... @@ -0,0 +1 @@
  1 +edit-find-replace.png
0 2 \ No newline at end of file
... ...