Commit Graph

6738 Commits

Author SHA1 Message Date
BertoCQ
dd02c83fa3 Merge branch 'master' into poll-shifts-search-officers 2017-09-11 00:07:12 +02:00
BertoCQ
4ba232a165 Merge pull request #1842 from consul/poll-subnavigation
Polls subnavigation
2017-09-10 20:46:34 +02:00
BertoCQ
4f26542f6c Merge pull request #1845 from consul/polls-available-booths
Available booths to assign shifts
2017-09-10 20:45:46 +02:00
rgarcia
4d1f61a87e adds specs 2017-09-08 22:00:50 +02:00
rgarcia
0ad24c1080 highlights correct item in admin menu 2017-09-08 22:00:45 +02:00
rgarcia
45d2fdd201 adds available booths 2017-09-08 21:59:54 +02:00
decabeza
503a375b2f includes question controller name on polls subnavigation 2017-09-08 18:41:46 +02:00
decabeza
3b4e80a34d improves layout and tables for polls shifts 2017-09-08 16:50:53 +02:00
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
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
Raimond Garcia
3648b5d6eb Merge pull request #1834 from consul/specs
Specs
2017-09-06 18:52:48 +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
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
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
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
Raimond Garcia
40114cf1e5 Merge pull request #1813 from consul/headers
Section header
2017-09-05 14:58:32 +02:00
Raimond Garcia
eb4528eaa0 Merge branch 'master' into poll-shifts 2017-09-05 14:45:31 +02:00
Raimond Garcia
734a8c216b Merge pull request #1812 from consul/depfu/update/invisible_captcha-0.9.3
Update invisible_captcha to version 0.9.3
2017-09-05 14:44:20 +02:00
Raimond Garcia
ab90ec54c8 Merge pull request #1814 from consul/depfu/update/savon-2.11.2
Update savon to version 2.11.2
2017-09-05 14:43:41 +02:00
Raimond Garcia
879bfa8370 Merge pull request #1816 from consul/depfu/update/rspec-rails-3.6.1
Update rspec-rails to version 3.6.1
2017-09-05 14:43:30 +02:00
decabeza
4b7200f49c fixes quotes on active class for key dates 2017-09-05 14:38:30 +02:00