decabeza
|
f6ee472a66
|
Improve styles for users interest list
|
2017-10-18 18:55:55 +02:00 |
|
decabeza
|
c5aeaa26ae
|
fixes user show tabs styles
|
2017-10-18 18:55:07 +02:00 |
|
decabeza
|
eec05219cc
|
improves html markup on activity tables
|
2017-10-18 18:54:43 +02:00 |
|
decabeza
|
05a713790f
|
improves edit debate button on debate show
|
2017-10-18 18:54:01 +02:00 |
|
María Checa
|
68341e5a76
|
Added translations
|
2017-10-18 18:36:02 +02:00 |
|
María Checa
|
70a35fbe58
|
Poll views improvements
Reorganized poll `#show`, `#stats` and `#results` views. Gave stats section its own route.
|
2017-10-18 18:35:53 +02:00 |
|
María Checa
|
35f24b519d
|
Merge branch 'master' into 1786-poll_results
|
2017-10-18 17:33:16 +02:00 |
|
María Checa
|
86da0e5154
|
Merge pull request #2071 from consul/officing-tests-improvements
Officing tests improvements
|
2017-10-18 17:26:06 +02:00 |
|
Alberto García
|
91b8ed67f6
|
Merge pull request #2075 from wairbut-m2c/iagirre-poll-stats
Iagirre poll stats
|
2017-10-18 17:25:02 +02:00 |
|
María Checa
|
5589c2d8a0
|
Tests improvements
|
2017-10-18 13:40:04 +02:00 |
|
María Checa
|
fb1a0904cb
|
Tests improvements
|
2017-10-18 13:17:50 +02:00 |
|
María Checa
|
6c5ad49a3c
|
Tests improvements
|
2017-10-18 11:52:42 +02:00 |
|
BertoCQ
|
c6d683083f
|
Merge pull request #2073 from consul/feature/2072#remove_question_valid_answers
Remove valid answers usage
|
2017-10-18 11:52:14 +02:00 |
|
BertoCQ
|
98ba367dfd
|
Merge pull request #2069 from consul/chore/fix_officing_final_result_date
Force Officer results to current date instead of datepicker
|
2017-10-18 10:59:07 +02:00 |
|
iagirre
|
81b1fb1a72
|
Fixed some conflicts automatically merged that didn't realised before they were there
|
2017-10-18 10:27:41 +02:00 |
|
iagirre
|
c896800325
|
Removed added and unused route
|
2017-10-18 09:53:03 +02:00 |
|
iagirre
|
f7bb3ec8b7
|
Merge remote-tracking branch 'consul/master' into iagirre-poll-stats
|
2017-10-18 09:48:02 +02:00 |
|
iagirre
|
73365ad9d2
|
Added spects to check de stats model and view
|
2017-10-18 09:34:17 +02:00 |
|
Bertocq
|
36610f0c1a
|
Use poll question trait with_answers to generate yes/no answers
|
2017-10-18 02:06:34 +02:00 |
|
Bertocq
|
08823153a9
|
Correct answer inclusion validation for no question scenario
|
2017-10-18 02:03:58 +02:00 |
|
Bertocq
|
c044fb293c
|
Create poll_question trait with answers
|
2017-10-18 01:59:30 +02:00 |
|
Bertocq
|
e9294f2a22
|
Switch from valid_answers to question_answers usage for Poll Questions
|
2017-10-18 01:32:15 +02:00 |
|
Bertocq
|
8d2945e8a2
|
Fix answer attribute validation to check question's question_answers inclusion
|
2017-10-18 01:31:34 +02:00 |
|
Bertocq
|
0a5ee3f861
|
Remove valid_answers usage on Poll Question model
|
2017-10-18 01:30:21 +02:00 |
|
Bertocq
|
c6d1f727af
|
Correct dev_seeds to correctly create Poll::Question::Answers instead of valid_answers, plus style fixes
|
2017-10-18 01:29:40 +02:00 |
|
Bertocq
|
fbcf8678c3
|
Remove no longer needed question model tests for valid_answers
|
2017-10-18 01:28:59 +02:00 |
|
Bertocq
|
39f23d3b7b
|
Switch from valid_answers to question_answers on specs
|
2017-10-18 01:28:38 +02:00 |
|
Bertocq
|
60f2815010
|
Add missing total_results check on poll result specs
|
2017-10-18 01:27:39 +02:00 |
|
Bertocq
|
9e22a1812f
|
Remove no longer needed valid_answers attribute from poll_question factory
|
2017-10-18 01:22:15 +02:00 |
|
Bertocq
|
f05e5291b2
|
Replace valid_answers usage for question_answers on factories
|
2017-10-18 01:21:40 +02:00 |
|
Bertocq
|
b5255afb2d
|
Remove deprecated Poll::Question valid_answers attribute
|
2017-10-18 00:17:01 +02:00 |
|
Bertocq
|
ce03251c72
|
Filter officing results officer assigments to current date
|
2017-10-17 23:15:26 +02:00 |
|
Bertocq
|
7b40c84166
|
Rubocop fixes and rubocop todo update for those that can't be done right now
|
2017-10-17 22:23:53 +02:00 |
|
Bertocq
|
ce0a7f6fad
|
Rubocop autocorrections
|
2017-10-17 22:00:00 +02:00 |
|
Bertocq
|
ceec71e558
|
Remove no actions message for citizen that already voted at officing panel
|
2017-10-17 21:42:03 +02:00 |
|
BertoCQ
|
d3fb4e2615
|
Merge pull request #2066 from consul/poll-voting
Adds spec for user voting in booth and then verifying account
|
2017-10-17 21:21:12 +02:00 |
|
Bertocq
|
04910fea5b
|
Remove officing results date picker for current date
|
2017-10-17 21:00:19 +02:00 |
|
María Checa
|
e2b06ef259
|
Minor change
|
2017-10-17 20:43:42 +02:00 |
|
María Checa
|
20fd8c0515
|
Officing tests improvements
|
2017-10-17 20:41:48 +02:00 |
|
María Checa
|
610aea2c72
|
Added new methods to Poll question and Poll answers
|
2017-10-17 18:30:20 +02:00 |
|
María Checa
|
bfe0addf3b
|
Added poll results view
|
2017-10-17 18:29:53 +02:00 |
|
María Checa
|
49118ea312
|
Gave permission to everyone to access poll results
|
2017-10-17 18:29:32 +02:00 |
|
María Checa
|
55c15bca86
|
Added poll results route
|
2017-10-17 18:29:14 +02:00 |
|
Manuel Ortega
|
12ac758e8e
|
Added investment's user generated tags to admin interface form
|
2017-10-17 18:11:29 +02:00 |
|
iagirre
|
0f73b787b2
|
Fixed views and Poll::Stats model to pass the specs
|
2017-10-17 16:07:44 +02:00 |
|
iagirre
|
6a292daf42
|
Partial to render the polls stats and model methods to get the information from DB
|
2017-10-17 15:04:29 +02:00 |
|
rgarcia
|
6b7d38c27a
|
adds spec for user voting in poll and then verifying account
|
2017-10-17 15:00:34 +02:00 |
|
BertoCQ
|
da95d298b7
|
Merge pull request #2063 from consul/2032-officing_multiple_sessions
Added officing tests for officers logged in at the same time
|
2017-10-17 14:47:52 +02:00 |
|
BertoCQ
|
db7c80ef13
|
Merge pull request #2021 from consul/fixed-already-voted-message
Fixed already voted message in poll show
|
2017-10-17 14:42:46 +02:00 |
|
BertoCQ
|
d1c67212b0
|
Merge pull request #1964 from consul/chore/remove_results
Remove deprecated Poll results models
|
2017-10-17 14:39:42 +02:00 |
|