consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,516 Commits 1 Branch 0 Tags
eec05219ccd0bfbf9b6022adf9645728f8ff89b6
Commit Graph

4670 Commits

Author SHA1 Message Date
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
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
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
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
08823153a9 Correct answer inclusion validation for no question scenario 2017-10-18 02:03:58 +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
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
04910fea5b Remove officing results date picker for current date 2017-10-17 21:00:19 +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
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
decabeza
46744d95ac fixes admin login items menu on mobile size for admin panel 2017-10-17 13:31:17 +02:00
decabeza
ea3187ff80 fixes header on management panel 2017-10-17 13:26:53 +02:00
decabeza
6c2384fd74 uses underscore for ids names 2017-10-17 13:26:27 +02:00
decabeza
a14d54d56e include text for notification menu on mobile size 2017-10-17 13:26:00 +02:00
decabeza
548fd03ac8 fixes admin login items menu on mobile size 2017-10-17 13:25:09 +02:00
María Checa
58f57bc15b Added poll method voted_in_web? 2017-10-17 13:16:46 +02:00
BertoCQ
78410242e9 Merge pull request #2064 from consul/admin-layout 
Admin layout
 2017-10-16 20:06:52 +02:00
BertoCQ
a476019c49 Merge pull request #2020 from consul/poll-videos 
Poll answer videos
 2017-10-16 20:03:34 +02:00
BertoCQ
72ab14a11a Merge pull request #2056 from consul/fix/shift_date_range_expired 
Fix Shift date ranges
 2017-10-16 20:02:32 +02:00
Bertocq
0b5eed090e Fix no-answer scenario for question valid answers 2017-10-16 19:54:07 +02:00
Bertocq
64db7e1dec Merge branch 'master' into fix/shift_date_range_expired 2017-10-16 19:43:00 +02:00
decabeza
92dbb4fb73 removes unnecessary close button for admin menu 2017-10-16 19:39:29 +02:00
decabeza
3ec12cfad7 removes box shadow for off canvas content 2017-10-16 19:39:06 +02:00
iagirre
78cc09cc5a Controllers and models to see the polls stats. Routes related also added. 2017-10-16 17:25:04 +02:00
María Checa
a6d533a767 Helper improvements 2017-10-16 13:47:10 +02:00
María Checa
45f73aa1ba Excluded officer shift dates from each task date range 2017-10-16 12:22:54 +02:00
Raimond Garcia
1c5a1d1677 Merge pull request #2054 from wairbut-m2c/iagirre-answer-resize-reorder 
Iagirre answer resize reorder
 2017-10-16 10:49:35 +02:00
Raimond Garcia
b75480a5c9 Merge pull request #2058 from consul/booth-shifts-back 
Booth shifts back link
 2017-10-16 10:48:56 +02:00
Raimond Garcia
ddbcdee105 Merge pull request #2060 from consul/consul-design 
Consul design
 2017-10-16 10:48:41 +02:00
Alberto García
9a47adb885 Merge pull request #2059 from consul/officer-search 
Searches for officers assigned to a poll
 2017-10-16 10:45:42 +02:00
decabeza
99e6097695 updates admin tags specs 2017-10-13 21:32:19 +02:00
decabeza
1da787e2ff fixes lint warnings using single quoted on icons.scss 2017-10-13 21:01:23 +02:00
decabeza
b52abfb922 uses correct i18n key 2017-10-13 21:00:45 +02:00
decabeza
d91388b2b3 improves layout and unifies design of admin moderated content 2017-10-13 20:57:19 +02:00
decabeza
ae74e1ba07 improves admin tags layout 2017-10-13 19:31:02 +02:00
decabeza
599c243f62 removes unnecessary helper for welcome page 2017-10-13 18:58:58 +02:00
decabeza
127ae893fc replaces polls and budgets help icons to add consistency 2017-10-13 18:55:14 +02:00
decabeza
2e6072ef19 adds missing icons on admin menu 2017-10-13 18:54:48 +02:00
decabeza
96bd8cec00 fixes styles on admin legislation processes subnav 2017-10-13 18:54:26 +02:00