consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,109 Commits 1 Branch 0 Tags
e6b5de77fe8889e9d8a9f18c6b1e55b0e4a58f95
Commit Graph

1449 Commits

Author SHA1 Message Date
BertoCQ
7f936f440c Merge branch 'master' into polls_minor_changes 2017-10-02 16:44:53 +02:00
María Checa
c0dcedcd0f Tests fix 2017-10-02 16:39:09 +02:00
María Checa
afbdd48891 Fixed tests 2017-10-02 16:11:17 +02:00
Bertocq
b5cf28cb35 Swap Poll White/Null/Total usage for Poll Recount 2017-10-02 15:46:49 +02:00
Raimond Garcia
f68d86a2e5 Merge pull request #1824 from rockandror/user-recomendations 
User recomendations
 2017-09-29 19:02:03 +02:00
Senén Rodero Rodríguez
92c774cdeb Merge with master 2017-09-28 13:36:20 +02:00
BertoCQ
121109f967 Merge branch 'master' into feature/1924#poll_shifts_creation 2017-09-28 13:03:34 +02:00
Bertocq
3da4ee4ee3 Check Poll Shift creation date ranges are correct 2017-09-28 12:18:47 +02:00
Bertocq
49b4af5e04 Add flash error for shift creation without date, increase spec 2017-09-28 10:53:15 +02:00
Bertocq
13aa5a3ba8 Increase Admin Shift creation scenarios for both tasks options 2017-09-27 18:47:06 +02:00
taitus
a0603985ef Refactor. 2017-09-27 14:51:35 +02:00
taitus
51c53b6f31 Add missing specs from Maps on New, Edit and Show. 2017-09-27 14:50:54 +02:00
taitus
7b54451491 Add missing specs on admin 2017-09-27 14:50:03 +02:00
Senén Rodero Rodríguez
6c1d1c2cde Add map settings to backend. Install leaflet assets to render maps. 2017-09-27 14:46:02 +02:00
Senén Rodero Rodríguez
1a8fda9352 Fix broken specs 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
ce29185b76 Fix documentable on admin poll questions. Adapt nested documentable shared specs to admin fetaure specs and include at admin poll questions specs. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
88a7a29d27 Remove new_nested action from documents controller. Use cocoon gem to manage new nested fields creation on documents. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
95016a1bf3 Some renaming and cleaning 2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
966ff4dc03 User new direct uploads controllers action on imageable. 2017-09-26 13:56:06 +02:00
Senén Rodero Rodríguez
826385f659 Extract ajax upload and destroy_upload actions from images and documents controllers and place them at new controllers to manage direct uploads 2017-09-26 13:55:28 +02:00
Senén Rodero Rodríguez
16692c933e Move specs from imageable shared feature spec to proposals and budget investments path. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
ceabd16d57 Refactor. Create index scope inside imageable shared examples to check index action of any imageable model. Add image to proposals index. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
3310089208 Add nested imageable shared spec to check nested images behavior at imageable any recipients. 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
6f71da07ee Duplicate documentable code and rename for imageable 2017-09-26 13:55:03 +02:00
Bertocq
614ff79ba1 WIP 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
e7ac27a2b8 Add missing specs to check validation errors on new investmentand edit image pages. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
c914c772c0 Add budget investment image dimmensions validator. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
1327b7276d Create investments helper. Fix indentation error and some specs names and structure. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
4469aa9b32 Allow to remove budget investment image from edit image page to authors and administrators. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
0925d33c5b Add dynamic texts to investment image button. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
ce0c0f7024 Allow administrators to edit and update images of any budget investment. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
acc79cbe31 Add edit_image and update_image action to budget/investments controller. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
515d6d7e70 Rename image_description column to image_title on budget investments. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
673fc66011 Add budget investements images specs 2017-09-26 13:53:42 +02:00
BertoCQ
f2e44f0730 Merge pull request #1919 from consul/chore/remove_booth_assignment_officer_totals 
Remove Officer recounts, add Final&Totals votes
 2017-09-26 10:19:57 +02:00
Bertocq
ca35c8b85c Fix Style/NestedParenthesizedCalls rubocop issues 2017-09-25 22:47:59 +02:00
Bertocq
22822aa173 Fix Style/RedundantParentheses rubocop issues 2017-09-25 22:44:58 +02:00
Bertocq
bf981ca828 Remove Booth Assignment officer totals and add final&system counts 2017-09-25 18:47:44 +02:00
BertoCQ
d449e8ee62 Merge pull request #1875 from consul/admin-design 
Admin design
 2017-09-25 17:23:17 +02:00
BertoCQ
34568567a3 Merge pull request #1885 from consul/chore/remove_final_recounts 
Remove Poll Final Recounts, replace with Total Results
 2017-09-20 23:00:03 +02:00
Raimond Garcia
b416d2846e Merge pull request #1883 from xarlybovi/switch-flags-ajax 
Switch flag/unflag buttons on use via ajax
 2017-09-20 12:21:56 +02:00
decabeza
1b3292690a updates spec of admin logo_header 2017-09-20 11:02:13 +02:00
Carlos Ruiz
61c9536697 Add flagging/unflagging rspec 2017-09-19 20:11:23 +02:00
BertoCQ
f67ba62c49 Merge branch 'master' into user-recomendations 2017-09-19 18:56:12 +02:00
Bertocq
9c6a974bec Fix wrong spectations after final result swap for total result 2017-09-19 18:54:37 +02:00
BertoCQ
5d6c4f0bbc Merge pull request #1868 from wairbut-m2c/aperez-validate-poll-question-is-selected 
Validate presence 'poll_id' attribute on Poll::Question model
 2017-09-19 18:15:32 +02:00
rgarcia
92333e530f fixes flaky spec 
Visits directly the page to avoid flakiness
 2017-09-19 17:30:40 +02:00
rgarcia
aee34e643c removes unused expectation 2017-09-19 17:30:40 +02:00
rgarcia
d1aa01b9fa fixes flaky spec 
Using correct resource in path
 2017-09-19 17:30:40 +02:00
rgarcia
c128a0f21d removes obsolete legislations specs 
Obsolete and flaky!
 2017-09-19 17:30:40 +02:00