Raimond Garcia
|
23ef9ded1d
|
Merge branch 'master' into aperez-edit-poll-question-answers
|
2017-10-06 18:47:04 +02:00 |
|
Bertocq
|
59175ff039
|
Add date on officer assignment list for final shifts
|
2017-10-06 18:36:25 +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 |
|
decabeza
|
225ede4a42
|
hides temporally documents sidebar on polls show
|
2017-10-06 16:58:49 +02:00 |
|
decabeza
|
1933cf62fa
|
changes gallery order images
|
2017-10-06 16:44:26 +02:00 |
|
decabeza
|
47ee8a2f79
|
shows answer title on polls show only if description is present
|
2017-10-06 16:19:55 +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 |
|
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
|
c5c1ea7251
|
Fixed answer documents form
|
2017-10-06 12:02:24 +02:00 |
|
decabeza
|
7856915203
|
removes @question on questions answers
|
2017-10-06 02:38:43 +02:00 |
|
decabeza
|
3ce98b6cdf
|
fixes answer documents path on polls questions show
|
2017-10-06 02:09:01 +02:00 |
|
María Checa
|
b8f2fd1c54
|
Markup fixes
|
2017-10-06 01:32:00 +02:00 |
|
María Checa
|
1225fc9009
|
Minor fix
|
2017-10-06 01:28:38 +02:00 |
|
María Checa
|
d20a4909d6
|
Minor fix
Removed left margin from submit button
|
2017-10-06 01:27:14 +02:00 |
|
María Checa
|
37c9ca0973
|
Fixed admin menu
|
2017-10-06 01:25:41 +02:00 |
|
María Checa
|
284fdea2e6
|
Improved answer documents and question summary views
|
2017-10-06 01:23:41 +02:00 |
|
María Checa
|
c3f778bbdd
|
Check if user has voted before sign in
|
2017-10-06 01:18:56 +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
|
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 |
|
Angel Perez
|
5862eea516
|
Add controllers/views for Poll::Question::Answer::Video
|
2017-10-05 12:34:20 -04: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 |
|
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
|
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 |
|
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 |
|
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 |
|