Commit Graph

5295 Commits

Author SHA1 Message Date
decabeza
5540f130e1 removes unused partials 2017-10-13 14:16:33 +02:00
decabeza
386fe785c7 improves text and layouts for officing voters views 2017-10-13 14:16:21 +02:00
BertoCQ
29cac6b93b Merge pull request #2051 from consul/clean-folders
Clean folders
2017-10-13 13:42:05 +02:00
BertoCQ
df5934e0c2 Merge pull request #2026 from consul/polls-admin-polish
Polls admin polish
2017-10-13 12:59:27 +02:00
Bertocq
916f9ba40b Correctly query and order poll question answers for description block 2017-10-13 12:44:55 +02:00
rgarcia
cd6cf3bda1 uses default rails helper to disable submit button 2017-10-13 12:41:33 +02:00
rgarcia
560ff7c51d does not use custom implementation to disable submit button 2017-10-13 12:40:42 +02:00
decabeza
89553d346a removes unused old images and styles 2017-10-12 19:12:53 +02:00
decabeza
cdddddd972 removes example images 2017-10-12 19:10:12 +02:00
BertoCQ
1d59dcac7c Merge pull request #2049 from consul/booth-edit-button
Edit booth button
2017-10-11 20:32:55 +02:00
decabeza
3a20a6bc2a adds margin to read more answer description link 2017-10-11 20:16:38 +02:00
decabeza
811c348f0f hides edit booth button when available filter 2017-10-11 19:36:23 +02:00
decabeza
bdc3538100 Merge branch 'master' into polls-admin-polish 2017-10-11 19:12:34 +02:00
Bertocq
34c278db74 Small fixes for Poll Question Answer ordering 2017-10-11 12:05:20 +02:00
BertoCQ
5ff0047c9f Merge pull request #2037 from wairbut-m2c/iagirre-question-ansers-ordenable
Iagirre question ansers ordenable
2017-10-11 11:53:39 +02:00
iagirre
644d09ebd2 PR comments applied and poll_question_answer default name changed in factory. 2017-10-11 09:42:52 +02:00
iagirre
44474e7686 Deleted a forgotten comment 2017-10-10 16:39:19 +02:00
iagirre
943c1f23af Spects added to test the order of answers. Default order for question_answers set. 2017-10-10 16:38:55 +02:00
iagirre
2b10b59e2a Order in the admin page using jquery-ui sortable widget. 2017-10-10 16:38:29 +02:00
rgarcia
89f81bf7a4 fixes exception when sending email about comment reply 2017-10-10 16:01:20 +02:00
decabeza
b95dc572c5 improves answer description height to avoid texts cuts 2017-10-10 12:53:10 +02:00
rgarcia
ffdbdacc78 fixes specs 2017-10-10 12:47:09 +02:00
rgarcia
843048a861 cleans up 2017-10-10 12:14:04 +02:00
rgarcia
23397eecb3 increases consistency by moving comment's view to poll's folder 2017-10-10 12:06:50 +02:00
rgarcia
faa2f31b3a Adds comment's tab 2017-10-10 12:06:41 +02:00
decabeza
471860ea41 puts content on a table for polls questions answers show 2017-10-09 19:44:58 +02:00
decabeza
9dc8a0fb34 fixes questions table with long links on description 2017-10-09 19:44:12 +02:00
decabeza
36d39503e8 improves admin poll questions show 2017-10-09 19:42:53 +02:00
decabeza
80298a2746 improves admin poll header 2017-10-09 19:42:10 +02:00
decabeza
07f74cf6e5 improves layout for admin polls index 2017-10-09 19:40:16 +02:00
Raimond Garcia
2b588753ee Merge branch 'master' into mlucena-poll-comments 2017-10-09 17:59:12 +02:00
María Checa
3fc3f9e88e Fixed condition 2017-10-09 17:42:13 +02:00
María Checa
841ef2a3a2 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-10-09 17:19:07 +02:00
María Checa
f23073bb28 Fixed already voted message in poll show 2017-10-09 13:12:44 +02:00
Pedro Ríos Flores
87d4fa92b4 Wrapped the last link under the same if clause. 2017-10-09 13:09:09 +02:00
decabeza
ba9814cd85 shows videos on polls answers 2017-10-09 13:01:39 +02:00
Pedro Ríos Flores
693030ff17 Wrapped two links under the same if clause. 2017-10-09 12:26:34 +02:00
Alberto García
bd62af9eb7 Merge pull request #2014 from consul/poll_ui_fixes
Polls UI fixes
2017-10-07 21:18:48 +02:00
María Checa
316ba37d91 Requested changes 2017-10-07 20:27:44 +02:00
decabeza
63ffb1adca hides zoom icon on mobile version 2017-10-07 19:39:04 +02:00
decabeza
5b80d8893e shows always orbit next and previous arrows 2017-10-07 19:38:44 +02:00
decabeza
71d785ba78 improves polls index view on mobile version 2017-10-07 19:38:17 +02:00
decabeza
b06102fb79 adds image rendering on gallery images 2017-10-07 19:37:51 +02:00
María Checa
65f5c9efa9 Changed token message background color 2017-10-07 19:21:27 +02:00
Raimond Garcia
676f11dcfc Merge pull request #2012 from consul/fixed-poll-answer-document-upload-redirect
Fixed poll answer document upload redirect
2017-10-07 19:17:01 +02:00
María Checa
728edf64a5 Added "participate in other polls" link in poll show 2017-10-07 19:12:58 +02:00
María Checa
ca24be79e3 Moved token message below questions 2017-10-07 19:12:17 +02:00
Raimond Garcia
e9276037f9 Merge pull request #2009 from consul/votable_by_fix
Fixed already-answered logic
2017-10-07 18:21:05 +02:00
Raimond Garcia
689b6ecb9d Merge pull request #2011 from consul/show-poll-answers-after-booth-vote
Show poll answers in poll show view after voting on a booth
2017-10-07 18:20:29 +02:00
María Checa
65237db099 Fixed poll answer document upload redirect 2017-10-07 17:50:42 +02:00