Download as
Browse Code »

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.
Reload with full diff Plain diff Email patch

To preserve performance only 100 of 4277 files displayed.

.gitmodules
  Diff comments   View file @1da6547
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
  Diff comments   View file @1da6547
... ... @@ -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
  Diff comments   View file @1da6547
... ... @@ -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