Raimond Garcia
5d39ce2f03
Merge pull request #2053 from consul/officing-voter-message
...
Officing voter message
2017-10-13 15:30:49 +02:00
decabeza
386fe785c7
improves text and layouts for officing voters views
2017-10-13 14:16:21 +02:00
BertoCQ
df5934e0c2
Merge pull request #2026 from consul/polls-admin-polish
...
Polls admin polish
2017-10-13 12:59:27 +02:00
rgarcia
cd6cf3bda1
uses default rails helper to disable submit button
2017-10-13 12:41:33 +02:00
decabeza
811c348f0f
hides edit booth button when available filter
2017-10-11 19:36:23 +02:00
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
rgarcia
d405d70f4c
add translations
2017-10-10 12:06:58 +02:00
decabeza
471860ea41
puts content on a table for polls questions answers show
2017-10-09 19:44:58 +02:00
decabeza
36d39503e8
improves admin poll questions show
2017-10-09 19:42:53 +02:00
decabeza
80298a2746
improves admin poll header
2017-10-09 19:42:10 +02:00
María Checa
728edf64a5
Added "participate in other polls" link in poll show
2017-10-07 19:12:58 +02:00
Raimond Garcia
2e4ce39722
Merge pull request #1994 from consul/feature/1985#voting_token
...
Voter Answer unique Token
2017-10-07 16:54:01 +02:00
decabeza
9ec57f68c2
changes list of videos links on polls question admin
2017-10-07 14:49:36 +02:00
decabeza
a5d3d5d239
adds links to read more and less for answer description
2017-10-07 11:53:34 +02:00
BertoCQ
6a0197a61b
Merge branch 'master' into feature/1985#voting_token
2017-10-07 10:46:13 +02:00
María Checa
bcfd1a844a
Poll voter token
2017-10-06 20:44:47 +02:00
rgarcia
cf3a62b126
fixes specs
2017-10-06 20:32:06 +02:00
Raimond Garcia
23ef9ded1d
Merge branch 'master' into aperez-edit-poll-question-answers
2017-10-06 18:47:04 +02:00
Raimond Garcia
c04e2889c5
Merge pull request #1991 from consul/question-answer-documents
...
Admin question answer documents
2017-10-06 18:25:25 +02:00
Raimond Garcia
8576f59af1
Merge branch 'master' into aperez-edit-poll-question-answers
2017-10-06 18:14:00 +02:00
Raimond Garcia
936ffa1fb6
Merge pull request #1993 from consul/1984-voting_messages
...
Voting messages
2017-10-06 17:57:17 +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
Bertocq
d4408efda6
Generate a unique token for a Poll Ballot and use it on answer buttons
2017-10-06 14:36:21 +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
1225fc9009
Minor fix
2017-10-06 01:28:38 +02:00
María Checa
a655466dbf
Added new translations
2017-10-06 01:28:15 +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
María Checa
0cf5299846
Set voting messages
2017-10-06 00:04:25 +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
decabeza
5fdbc7b8a6
removes icons on polls index view
2017-10-05 16:29:57 +02:00
iagirre
82cf1fc285
Remove unused i18n-keys: admin.questions.show.documents, value: Documents(1) (en and es)
2017-10-05 15:55:37 +02:00
Angel Perez
ab09bde7dd
Fix broken translations for Poll::Question::Answer model
...
Poll::QuestionAnswer model was renamed to Poll::Question::Answer
which made the previous I18n keys unavailable for the views
See PR #1977 , commit 461410a
2017-10-05 08:11:15 -04: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
6084899a74
Merge pull request #1966 from consul/chore/update_secrets_example
...
Update secrets and deploy secrets example files
2017-10-05 00:52: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
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
