Commit Graph

68 Commits

Author SHA1 Message Date
decabeza
bdc3538100 Merge branch 'master' into polls-admin-polish 2017-10-11 19:12:34 +02:00
iagirre
2b10b59e2a Order in the admin page using jquery-ui sortable widget. 2017-10-10 16:38:29 +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
9ec57f68c2 changes list of videos links on polls question admin 2017-10-07 14:49:36 +02:00
Raimond Garcia
bad58eaa7b Merge pull request #2006 from wairbut-m2c/aperez-admin-polls-adjustments
Adjuments for Poll-related features
2017-10-07 13:10:58 +02:00
Angel Perez
d62c0d5d05 Remove Poll::Question title length limit
As requested by #1997
2017-10-06 14:11:08 -04:00
Raimond Garcia
23ef9ded1d Merge branch 'master' into aperez-edit-poll-question-answers 2017-10-06 18:47:04 +02:00
Raimond Garcia
8576f59af1 Merge branch 'master' into aperez-edit-poll-question-answers 2017-10-06 18:14:00 +02:00
Angel Perez
63eaa0bef6 Allow Poll::Question::Answer edit
As requested by #1992
2017-10-06 09:48:17 -04:00
decabeza
dd69401477 Merge branch 'master' into question-answer-documents 2017-10-06 15:18:42 +02:00
Raimond Garcia
108d4104e8 Merge pull request #1986 from wairbut-m2c/iagirre-remove-documents-questions
Iagirre remove documents questions
2017-10-06 14:07:21 +02:00
decabeza
de9b599578 Merge branch 'master' into question-answer-documents 2017-10-06 13:55:49 +02:00
María Checa
c5c1ea7251 Fixed answer documents form 2017-10-06 12:02:24 +02:00
decabeza
7856915203 removes @question on questions answers 2017-10-06 02:38:43 +02:00
decabeza
3ce98b6cdf fixes answer documents path on polls questions show 2017-10-06 02:09:01 +02:00
María Checa
b8f2fd1c54 Markup fixes 2017-10-06 01:32:00 +02:00
María Checa
1225fc9009 Minor fix 2017-10-06 01:28:38 +02:00
María Checa
d20a4909d6 Minor fix
Removed left margin from submit button
2017-10-06 01:27:14 +02:00
María Checa
284fdea2e6 Improved answer documents and question summary views 2017-10-06 01:23:41 +02:00
María Checa
590344a576 Added view to upload documents to poll answers 2017-10-06 01:18:53 +02:00
Raimond Garcia
c72f95c72b Merge branch 'master' into aperez-admin-question-videos 2017-10-06 01:12:22 +02:00
Raimond Garcia
3d100d1e93 Merge branch 'master' into iagirre-remove-documents-questions 2017-10-06 01:02:56 +02:00
rgarcia
6327bcb343 adds specs for answer's gallery 2017-10-05 19:15:17 +02:00
Angel Perez
5862eea516 Add controllers/views for Poll::Question::Answer::Video 2017-10-05 12:34:20 -04:00
iagirre
75d841e2fe Fixed the correct specs and views to make the test pass. 2017-10-05 15:31:21 +02:00
iagirre
5b129b933f Removed documents from questions (documentable from model and uploader from _form in views) 2017-10-05 13:38:19 +02:00
decabeza
acea19dca3 improves layout for poll questions answers views 2017-10-05 11:07:26 +02:00
decabeza
ea4b534ee9 improves layout for poll questions views 2017-10-05 11:06:00 +02:00
rgarcia
06a1b96fcd clean up 2017-10-04 23:56:23 +02:00
rgarcia
30a2db635d displays upload link for second image
To infinity and beyond
2017-10-04 23:56:23 +02:00
rgarcia
1cf9bc4ad1 adds images to anwers 2017-10-04 23:56:09 +02:00
Angel Perez
f4774894e7 Adapt Admin::Poll::Question 'show' action to new design
Changes required as per issues #1855 and #1951

Fixes PR #1977, note n° 2
2017-10-04 16:59:23 -04:00
rgarcia
4aaf681d2d uses new answer model in user facing interface 2017-10-04 17:45:51 +02:00
rgarcia
461410a79d adds consistency to answer's namespace 2017-10-04 17:06:29 +02:00
rgarcia
1f2aa301d4 adds specs for answer's index and create 2017-10-04 16:33:52 +02:00
rgarcia
bf7cab29cf fixes specs 2017-10-04 15:15:20 +02:00
Raimond Garcia
44d0c04e38 Merge branch 'master' into aperez-admin-questions-section 2017-10-04 14:13:20 +02:00
Angel Perez
1cc0816dcd Create 'poll_question_answers' controller and views 2017-10-03 23:23:50 -04:00
María Checa
9871503c5e Restored views 2017-10-03 21:00:40 +02:00
Angel Perez
d9d03079e1 Adapt Poll::Question 'show' action to mockup 2017-10-03 13:29:07 -04:00
María Checa
348e4e54f3 Removed question description 2017-10-03 19:11:54 +02:00
decabeza
876a2b530b fixes lint warnings 2017-09-28 16:03:08 +02:00
Senén Rodero Rodríguez
77f63a4c44 Add _destroy parameter to nested documents 2017-09-26 13:57:13 +02:00
María Checa
355d68c7f8 Added video URL and document to poll question preview 2017-09-07 17:15:20 +02:00
María Checa
4af44a45a1 Documents upload for questions working 2017-09-06 12:00:46 +02:00
decabeza
6c5513ab38 replaces back_link partial to back_link_to helper 2017-07-26 18:22:45 +02:00
decabeza
af7807ce9f Updates custom note class to foundation help-text 2017-06-27 10:29:36 +02:00
Alberto Garcia Cabeza
ff0013e60c improves table layout on admin poll questions 2017-02-09 18:48:06 +01:00