Commit Graph

13 Commits

Author SHA1 Message Date
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
iagirre
943c1f23af Spects added to test the order of answers. Default order for question_answers set. 2017-10-10 16:38:55 +02:00
decabeza
090ff83cc1 updates edit texts on specs 2017-10-09 20:09:56 +02:00
Raimond Garcia
a585f79351 Merge pull request #2008 from consul/polls-gallery-polish
Polls gallery polish
2017-10-07 15:44:37 +02:00
decabeza
953a6e7573 updates videos link spec 2017-10-07 15:23:31 +02:00
rgarcia
1ec2455134 fixes spec
this one seems unrelated, probably got pushed in another PR
2017-10-07 14:30:10 +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
Raimond Garcia
c72f95c72b Merge branch 'master' into aperez-admin-question-videos 2017-10-06 01:12:22 +02:00
rgarcia
1922bc55a0 adds pending specs 2017-10-05 19:27:04 +02:00
Angel Perez
5862eea516 Add controllers/views for Poll::Question::Answer::Video 2017-10-05 12:34:20 -04:00
rgarcia
1cf9bc4ad1 adds images to anwers 2017-10-04 23:56:09 +02:00