Commit Graph

5295 Commits

Author SHA1 Message Date
BertoCQ
fa8b9a69a3 Merge branch 'master' into polls-persist-officer-data 2017-09-11 00:11:36 +02:00
BertoCQ
1ced54f0e3 Merge pull request #1835 from consul/1677-poll_questions_documents
Poll questions document and video
2017-09-11 00:08:31 +02:00
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
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
rgarcia
47564a91a0 persist a shift's officer data 2017-09-08 20:08:45 +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
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
4527236284 adds searching for officers when creating shifts 2017-09-07 22:38:42 +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
12e6b9e681 Added video link to question public view 2017-09-06 19:11:28 +02:00
María Checa
9f2522c106 Merge branch 'master' into 1677-poll_questions_documents 2017-09-06 18:28:31 +02:00
decabeza
2a389dbb55 removes unnecessary html tag 2017-09-06 18:08:29 +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
f0667937fb Refactor and extract code to partials. 2017-09-06 14:48:41 +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
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
Raimond Garcia
2519f232ab Merge branch 'master' into user-recomendations 2017-09-05 17:15:42 +02:00
BertoCQ
c6f675ecf2 Merge pull request #1811 from consul/legislation-processes
Legislation processes
2017-09-05 17:06:53 +02:00
Bertocq
553348eaad Convert phase to symbol before comparision for active dates 2017-09-05 16:18:36 +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
eb4528eaa0 Merge branch 'master' into poll-shifts 2017-09-05 14:45:31 +02:00
decabeza
4b7200f49c fixes quotes on active class for key dates 2017-09-05 14:38:30 +02:00
rgarcia
5ddeff217a fixes css syntax error 2017-09-05 14:31:51 +02:00
decabeza
e20ac83cc9 fixes wrong close tag 2017-09-05 14:29:11 +02:00
taitus
d8e9aad331 Fix community access text. 2017-09-05 12:55:12 +02:00
taitus
62003b3000 Add back link on community show. Add styles on login to create topic. 2017-09-05 12:55:12 +02:00
taitus
47f897840a Refactor translates and indent. 2017-09-05 12:55:12 +02:00
Alessandro Cuoghi
f67f4c85c7 If there is no theme, add text and link. 2017-09-05 12:55:12 +02:00
taitus
8d0ba0bf5e Display tag author only proposal or budget investment author 2017-09-05 12:55:12 +02:00
Alessandro Cuoghi
3af5acefdc Added style to icons recommendations topic. 2017-09-05 12:55:12 +02:00
Alessandro Cuoghi
634d782c2c Fixed error label. 2017-09-05 12:54:32 +02:00
taitus
5d22558c2b Fix specs 2017-09-05 12:54:32 +02:00
taitus
e1a7f9c58c Add community to Global Settings 2017-09-05 12:54:32 +02:00
taitus
90518d4f99 Refactor participants. Add scopes on User. 2017-09-05 12:54:32 +02:00
taitus
8f7356f7a4 Add missing spec. Improve readability on topics files 2017-09-05 12:54:32 +02:00
taitus
ec309de273 Add partial with participants on community show page. 2017-09-05 12:54:32 +02:00