Commit Graph

7983 Commits

Author SHA1 Message Date
Bertocq
90a5053ca8 Correct consul github url on how to use translations 2017-09-08 14:55:08 +02:00
Bertocq
da3ef02e2f Correctly indent admin login erb file 2017-09-08 12:45:20 +02:00
Bertocq
e8f95f4b5b Format link_to consistently 2017-09-08 12:39:23 +02:00
rgarcia
b1abb9dbb3 adds specs 2017-09-07 22:39:03 +02:00
rgarcia
d3890d1432 updates translations 2017-09-07 22:38:54 +02:00
rgarcia
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +02:00
Bertocq
2fafb067cc Include custom localization folders on i18n config by default 2017-09-07 19:12:42 +02:00
María Checa
fb5211f251 Fixed test 2017-09-07 17:51:55 +02:00
María Checa
27ac4c5815 Added poll questions documents and video specs
New tests to ensure video URL is shown in the admin preview. Also that the video URL and documents are correctly saved after creating a question.
2017-09-07 17:19:07 +02:00
María Checa
355d68c7f8 Added video URL and document to poll question preview 2017-09-07 17:15:20 +02:00
Raimond Garcia
d01b1476fd Merge pull request #1833 from rockandror/improve-community
Improve community
2017-09-07 11:11:55 +02:00
BertoCQ
f5f64f5a33 Merge pull request #1832 from consul/verification-consistency
SMS verification consistency
2017-09-06 21:46:11 +02:00
María Checa
3ff89b2476 CSS minor fix 2017-09-06 20:29:59 +02:00
María Checa
33f621850a Fixed schema 2017-09-06 20:20:01 +02:00
María Checa
12e6b9e681 Added video link to question public view 2017-09-06 19:11:28 +02:00
Raimond Garcia
3648b5d6eb Merge pull request #1834 from consul/specs
Specs
2017-09-06 18:52:48 +02:00
María Checa
9f2522c106 Merge branch 'master' into 1677-poll_questions_documents 2017-09-06 18:28:31 +02:00
María Checa
288cedc4c4 Poll questions documents tests added 2017-09-06 18:25:41 +02:00
decabeza
2a389dbb55 removes unnecessary html tag 2017-09-06 18:08:29 +02:00
decabeza
1de763a737 removes deprecated specs 2017-09-06 18:07:46 +02:00
María Checa
11ab061b9b Added documents to question view
Added same subnavigation as proposals for comments and documents in poll questions.
2017-09-06 17:27:05 +02:00
taitus
748a54934c Add missing specs on comments from topics 2017-09-06 15:01:39 +02:00
taitus
f0667937fb Refactor and extract code to partials. 2017-09-06 14:48:41 +02:00
taitus
79d4a82bfa Fix specs 2017-09-06 14:16:03 +02:00
taitus
9b6b57a24c Remove all white spaces 2017-09-06 14:12:32 +02:00
taitus
25560a27fc Refactor Community model. 2017-09-06 14:07:44 +02:00
taitus
c5cb463a2e Refactor helpers. 2017-09-06 13:47:29 +02:00
taitus
64774b0d2d Refactor topics controller. Add Common abilities. Add destroy action. 2017-09-06 13:30:12 +02:00
taitus
5ea16976f7 Refactor communities controller. Add missing specs on topics order. 2017-09-06 12:34:38 +02:00
rgarcia
618c6f8f36 uses method instead of db attribute to check for sms verification 2017-09-06 12:25:55 +02:00
María Checa
4af44a45a1 Documents upload for questions working 2017-09-06 12:00:46 +02:00
taitus
ea4d46f786 Fix specs 2017-09-06 11:28:27 +02:00
taitus
b4a6f664bb Remove image by default on carousel. Remove duplicate code. Add background when user recomendations is actived 2017-09-05 19:11:32 +02:00
María Checa
39a2d25921 Created migration to add video_url to poll questions 2017-09-05 18:32:33 +02:00
Raimond Garcia
65e1867af8 Merge pull request #1821 from consul/depfu/upgrade/database_cleaner-1.6.1
Upgrade database_cleaner to version 1.6.1
2017-09-05 18:18:16 +02:00
Raimond Garcia
ac5933f4c2 Merge pull request #1820 from consul/depfu/upgrade/pg-0.21.0
Upgrade pg to version 0.21.0
2017-09-05 18:18:06 +02:00
Raimond Garcia
bbd82fcade Merge pull request #1819 from consul/depfu/upgrade/scss_lint-0.54.0
Upgrade scss_lint to version 0.54.0
2017-09-05 18:17:57 +02:00
Raimond Garcia
4d6cb2df34 Merge pull request #1818 from consul/depfu/update/rinku-2.0.3
Update rinku to version 2.0.3
2017-09-05 18:17:46 +02:00
Raimond Garcia
0de56e864a Merge pull request #1817 from consul/depfu/update/i18n-tasks-0.9.18
Update i18n-tasks to version 0.9.18
2017-09-05 18:17:37 +02:00
depfu[bot]
5923ca38fd Upgrade database_cleaner to version 1.6.1 2017-09-05 16:00:28 +00:00
depfu[bot]
7a0a91f647 Upgrade pg to version 0.21.0 2017-09-05 15:35:25 +00:00
Raimond Garcia
2519f232ab Merge branch 'master' into user-recomendations 2017-09-05 17:15:42 +02:00
depfu[bot]
4ec40f54fb Upgrade scss_lint to version 0.54.0 2017-09-05 15:15:22 +00:00
BertoCQ
c6f675ecf2 Merge pull request #1811 from consul/legislation-processes
Legislation processes
2017-09-05 17:06:53 +02:00
depfu[bot]
fb2d5351a5 Update rinku to version 2.0.3 2017-09-05 14:25:30 +00:00
Bertocq
553348eaad Convert phase to symbol before comparision for active dates 2017-09-05 16:18:36 +02:00
depfu[bot]
7f2c1929ad Update i18n-tasks to version 0.9.18 2017-09-05 13:45:42 +00:00
Raimond Garcia
36f1992c31 Merge pull request #1815 from rockandror/community
Community
2017-09-05 15:42:13 +02:00
Raimond Garcia
6f9d48f0eb Merge branch 'master' into community 2017-09-05 15:40:03 +02:00
Raimond Garcia
c0238c9265 Merge pull request #1777 from consul/poll-shifts
Poll shifts
2017-09-05 15:14:46 +02:00