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
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
Alberto García
806fd85246
Merge pull request #1990 from consul/polls-gallery
...
Polls Gallery
2017-10-05 21:44:38 +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
d069d903a1
fixes active classes on admin menu
2017-10-05 11:08:45 +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
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
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
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
a318b82159
fixes lint warnings
2017-10-04 11:47:31 +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
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
05d40c0ede
Merge branch 'master' into polls_minor_changes
2017-10-03 16:22:33 +02:00
María Checa
bf61dffd4b
Removed files that are not used
2017-10-03 10:47:48 +02:00
BertoCQ
3835821871
Merge branch 'master' into iagirre-admin-polls-section
2017-10-02 22:25:09 +02:00
BertoCQ
1b4f6d5cae
Merge pull request #1938 from consul/imageable-polish
...
Imageable polish
2017-10-02 21:42:15 +02:00
María Checa
e464985114
Minor fix
...
Removed unnecessary markdown
2017-10-02 20:34:38 +02:00
BertoCQ
7f936f440c
Merge branch 'master' into polls_minor_changes
2017-10-02 16:44:53 +02:00
Bertocq
b5cf28cb35
Swap Poll White/Null/Total usage for Poll Recount
2017-10-02 15:46:49 +02:00
iagirre
166caa3b4c
Deleted code in views and concerns that lets polls have more images and documentes attached, like it was at first.
...
Added missing text for english and new texts in english and spanish.
Cambios para hacer commit:
modificado: app/assets/stylesheets/participation.scss
modificado: app/models/concerns/imageable.rb
modificado: app/models/poll.rb
modificado: app/views/admin/poll/polls/_form.html.erb
modificado: app/views/images/_admin_image.html.erb
modificado: config/locales/en/images.yml
modificado: config/locales/es/admin.yml
modificado: config/locales/es/images.yml
modificado: spec/features/admin/poll/polls_spec.rb
2017-10-02 12:59:26 +02:00
María Checa
799e2475da
Polls booth assignments fixes
...
Poll booth preview now renders recounts tab by default instead of the officers one.
2017-10-02 11:08:18 +02:00
María Checa
2c72a054ac
Polls admin officer assignments fixes
...
Removed total results table from officer assignment as now there are only final results.
2017-10-02 11:04:37 +02:00
María Checa
2365ec96fa
Polls admin officers tab fixes
...
Removed actions offered in search results.
2017-10-02 10:41:48 +02:00
María Checa
adf18ee756
Polls admin fixes
...
Removed search from questions tab and unassign button.
2017-10-02 10:37:10 +02:00
María Checa
fd1d09c8c2
Booths and shifts index pages minor fixes
...
Showing only actions to assign and edit shifits in shifts index, and option to create a new booth in booths index.
2017-10-02 10:25:11 +02:00
iagirre
c67620fdef
Table for links added (links to add images/documents).
...
Custom partial for admins upload image created, so that it can be reused in upload images and documents.
2017-09-29 14:51:49 +02:00
María Checa
14fe771fa5
Fixed wrong officer action path
...
Before this change, when a user searched for an officer already assigned the ui was blocked because that path wasn't correct.
2017-09-28 17:47:50 +02:00
iagirre
77d0a551cf
Migration for adding summary and description to polls created. Both text_areas were added to polls form.
...
Imageable class included in polls model and the first aproach for adding images added to form.
2017-09-28 17:46:30 +02:00
María Checa
1e0aec37ab
Removed link to poll question in the web in admin section
2017-09-28 17:37:31 +02:00
decabeza
876a2b530b
fixes lint warnings
2017-09-28 16:03:08 +02:00
