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
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
decabeza
02ea701dd1
removes unused i18n keys
2017-10-04 19:01:51 +02:00
rgarcia
adda4f9d33
removes unused translation
2017-10-04 18:08:55 +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
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
BertoCQ
9ab22870cc
Merge pull request #1971 from consul/polls-show
...
Polls show
2017-10-04 14:20:50 +02:00
BertoCQ
4e99012f8b
Merge pull request #1978 from consul/officing_requested_changes
...
Officing requested changes
2017-10-04 14:20:36 +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
María Checa
85695d51bb
Changed translations "blank ballots" for "totally blank ballots"
2017-10-04 11:52:09 +02:00
decabeza
cfbc5db9af
adds zoom icons and texts
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
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
bdfe822ddf
Removed unused translations
2017-10-03 23:05:06 +02: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
ac1d2e3aec
Merge pull request #1960 from consul/polls_minor_changes
...
Requested polls admin section improvements
2017-10-03 21:36:08 +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
5bb831e959
Removed poll question show
2017-10-03 19:11:39 +02:00
Bertocq
825671ad9b
Fix polls answer this question show text
2017-10-03 18:53:44 +02:00
María Checa
05d40c0ede
Merge branch 'master' into polls_minor_changes
2017-10-03 16:22:33 +02:00
decabeza
367b43fd31
adds polls index orders on ignore i18n-tasks
2017-10-03 13:51:15 +02:00
María Checa
1afd97b687
Removed unnused translations
2017-10-03 12:09:02 +02:00
María Checa
e6b5de77fe
Removed files that are not being used
2017-10-03 10:50:18 +02:00
Bertocq
5c4fb1bef3
Merge branch 'master' into chore/update_secrets_example
2017-10-03 00:22:18 +02:00
BertoCQ
3835821871
Merge branch 'master' into iagirre-admin-polls-section
2017-10-02 22:25:09 +02:00
Bertocq
9260561332
Update deploy secrets example file
2017-10-02 17:55:59 +02:00
Bertocq
bc92b8d2cd
Update secrets.yml.example file
2017-10-02 17:52:13 +02:00
Raimond Garcia
a743b6b823
Merge branch 'master' into polls-voting
2017-10-02 17:11:21 +02:00
BertoCQ
7f936f440c
Merge branch 'master' into polls_minor_changes
2017-10-02 16:44:53 +02:00
rgarcia
085991c624
allows voting only in one origin: booth or web
2017-10-02 16:22:31 +02:00
María Checa
afbdd48891
Fixed tests
2017-10-02 16:11:17 +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
Bertocq
5c513d8051
Fix typo on general proposal share text
2017-10-02 12:30:31 +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
Raimond Garcia
f68d86a2e5
Merge pull request #1824 from rockandror/user-recomendations
...
User recomendations
2017-09-29 19:02:03 +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
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
Senén Rodero Rodríguez
92c774cdeb
Merge with master
2017-09-28 13:36:20 +02:00
BertoCQ
121109f967
Merge branch 'master' into feature/1924#poll_shifts_creation
2017-09-28 13:03:34 +02:00
Raimond Garcia
e590e31053
Merge pull request #1864 from rockandror/maps-frontend
...
Maps frontend
2017-09-28 12:53:17 +02:00
Bertocq
49b4af5e04
Add flash error for shift creation without date, increase spec
2017-09-28 10:53:15 +02:00
decabeza
c8341fc5f1
adds missing translation
2017-09-27 18:08:01 +02:00
