Angel Perez
63eaa0bef6
Allow Poll::Question::Answer edit
...
As requested by #1992
2017-10-06 09:48:17 -04:00
Alberto García
806fd85246
Merge pull request #1990 from consul/polls-gallery
...
Polls Gallery
2017-10-05 21:44:38 +02:00
rgarcia
127ab222eb
removes rendering of local variable
2017-10-05 19:37:44 +02:00
rgarcia
6327bcb343
adds specs for answer's gallery
2017-10-05 19:15:17 +02:00
decabeza
ad8f58993f
checks already answered polls only for users logged
2017-10-05 17:48:52 +02:00
decabeza
5fdbc7b8a6
removes icons on polls index view
2017-10-05 16:29:57 +02:00
decabeza
de27530621
improves polls gallery partial
2017-10-05 11:46:21 +02:00
decabeza
0ba2dbd4f3
replaces lorem content on polls show
2017-10-05 11:45:51 +02:00
decabeza
d069d903a1
fixes active classes on admin menu
2017-10-05 11:08:45 +02:00
decabeza
25de95cdb4
removes blank space
2017-10-05 11:07:41 +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
BertoCQ
1e22108431
Merge pull request #1980 from wairbut-m2c/iagirre-polls-show
...
Specs added for branch polls-show in consul and thumbnail for poll im…
2017-10-05 00:52:08 +02:00
rgarcia
bba8cac262
displays images for an answer
2017-10-04 23:56:23 +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
Raimond Garcia
1b58b7851b
Merge branch 'master' into fix/shift_creation_polls
2017-10-04 20:14:08 +02:00
Raimond Garcia
861b583b02
Merge pull request #1977 from wairbut-m2c/aperez-admin-questions-section
...
Admin::Poll questions UI refactor
2017-10-04 19:52:45 +02:00
rgarcia
4aaf681d2d
uses new answer model in user facing interface
2017-10-04 17:45:51 +02:00
decabeza
6bea0f27e7
removes unnecessary polls partial
2017-10-04 17:18:19 +02:00
decabeza
f2220c6a06
adds missing condition on polls callout partial
2017-10-04 17:18:01 +02:00
rgarcia
461410a79d
adds consistency to answer's namespace
2017-10-04 17:06:29 +02:00
iagirre
4035097c60
Specs added for branch polls-show in consul and thumbnail for poll images in admins views.
...
Cambios para hacer commit:
modificado: app/views/images/_admin_image.html.erb
modificado: spec/features/admin/poll/polls_spec.rb
modificado: spec/features/polls/polls_spec.rb
2017-10-04 16:43:35 +02:00
rgarcia
1f2aa301d4
adds specs for answer's index and create
2017-10-04 16:33:52 +02:00
Bertocq
e1a7fc5dfa
Merge branch 'master' into fix/shift_creation_polls
2017-10-04 15:27:54 +02:00
rgarcia
bf7cab29cf
fixes specs
2017-10-04 15:15:20 +02:00
BertoCQ
9ab22870cc
Merge pull request #1971 from consul/polls-show
...
Polls show
2017-10-04 14:20:50 +02:00
Raimond Garcia
44d0c04e38
Merge branch 'master' into aperez-admin-questions-section
2017-10-04 14:13:20 +02:00
decabeza
4a6e557d83
adds missing i18n
2017-10-04 13:06:04 +02:00
BertoCQ
05df996078
Merge pull request #1970 from consul/minor-fixes
...
Minor fixes
2017-10-04 12:55:08 +02:00
decabeza
a318b82159
fixes lint warnings
2017-10-04 11:47:31 +02:00
decabeza
e4205dc22a
includes poll image on polls index
2017-10-04 11:40:20 +02:00
Bertocq
15039b6c5d
Load the Booth polls instead of all current/incoming on Shift creation for date ranges
2017-10-04 11:02:09 +02:00
decabeza
3edd59c8d6
replaces lorem with poll summary and description
2017-10-04 10:54:59 +02:00
decabeza
c9e8152ead
includes lorem content and images to answers
2017-10-04 10:12:54 +02:00
decabeza
87676f5296
include lorem ipsum content on polls show
2017-10-04 10:12:54 +02:00
decabeza
ad08303dfd
removes question link on polls index
2017-10-04 10:12:54 +02:00
decabeza
1b3cdc181d
improves polls show layout
2017-10-04 10:12:54 +02:00
Angel Perez
1cc0816dcd
Create 'poll_question_answers' controller and views
2017-10-03 23:23:50 -04:00
María Checa
80c8fa308f
Merge branch 'master' into 1954-remove_question_show_and_description
2017-10-03 22:33:08 +02:00
Raimond Garcia
c7f576aa4f
Merge pull request #1962 from wairbut-m2c/iagirre-admin-polls-section
...
Iagirre admin polls section
2017-10-03 22:23:53 +02: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
María Checa
5bb831e959
Removed poll question show
2017-10-03 19:11:39 +02:00
María Checa
05d40c0ede
Merge branch 'master' into polls_minor_changes
2017-10-03 16:22:33 +02:00
decabeza
c32a70d2a9
improves css for items on list with images
2017-10-03 13:57:01 +02:00
decabeza
5e9a452e55
removes unnecessary blank space
2017-10-03 13:56:16 +02:00
María Checa
bf61dffd4b
Removed files that are not used
2017-10-03 10:47:48 +02:00
