consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,139 Commits 1 Branch 0 Tags
242d028205f084be17cd83d710e9c0a51f435e4c
Commit Graph

8139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Angel Perez
5f6d218a15 Rename param in Admin::Poll::Questions::AnswersController 
'poll_question_id' attribute was renamed to 'question_id' on PR #1977,
commit 4aaf681
 2017-10-05 10:32:09 -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
iagirre
75d841e2fe Fixed the correct specs and views to make the test pass. 2017-10-05 15:31:21 +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
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
2e8922459d adds line break on css 2017-10-05 11:08:12 +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
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
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
Bertocq
895fc96bee Correct voter feature spec scenario name 2017-10-05 00:39:05 +02:00
rgarcia
52b68aa0df removes extra space 2017-10-04 23:58:36 +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
32f3b643b0 Create 'poll_question_answer_videos' table and model 2017-10-04 17:25:51 -04: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
BertoCQ
ababdd0368 Merge pull request #1979 from consul/fix/shift_creation_polls 
Fixes on Polls Shifts
 2017-10-04 22:40:53 +02:00
Angel Perez
a83c259a04 Remove 'description' attribute from Poll::Question 
This avoid an exception when seeding the database

See PR #1977
 2017-10-04 15:49:28 -04:00
Raimond Garcia
f9c35db983 Merge pull request #1982 from consul/polls-answer-polish 
Polls - create answer polish
 2017-10-04 20:28:33 +02:00
Raimond Garcia
1b58b7851b Merge branch 'master' into fix/shift_creation_polls 2017-10-04 20:14:08 +02:00
rgarcia
24fc7ab70a makes answer creation spec more robust 2017-10-04 20:10:49 +02:00
rgarcia
3ae539e8ab fixes relation between questions and answers 2017-10-04 20:10:31 +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
Alberto García
75538ed207 Merge pull request #1981 from consul/polls-callout 
Polls callout
 2017-10-04 19:49:31 +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
Bertocq
c62b573489 Fix poll Voter feature spec 2017-10-04 17:59:29 +02:00
rgarcia
007bcb7ec7 fixes specs 2017-10-04 17:46:25 +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
Bertocq
24ef7984a3 Include the answerable by user scope back on Poll list for officer voting panel 2017-10-04 17:05:25 +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
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
Bertocq
2900104a07 Show only active polls from the shifts assigned to officer on vote panel 2017-10-04 13:11:13 +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