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

7190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
decabeza
e404d149ce fixes some lint errors on legislation_process.scss 2017-09-22 19:10:39 +02:00
decabeza
ad63b0a7d7 makes filter subnav same style than order links 2017-09-22 18:20:21 +02:00
Bertocq
3c2b5281e8 Fix Admin Polls menu active flags 2017-09-22 18:05:53 +02:00
iagirre
0948959a65 Run scss-lint to fix some errors in autocomplete_overrides.scss 2017-09-22 08:09:03 +02:00
iagirre
c01208b203 Autocomplete tags for investments projects 2017-09-21 18:27:52 +02:00
iagirre
4db2584f87 The tags are suggested based on the entries the user makes. 
Cambios para hacer commit:
	modificado:    app/assets/javascripts/tag_autocomplete.js.coffee
	modificado:    app/assets/stylesheets/autocomplete_overrides.scss
	nuevo archivo: app/controllers/tags_controller.rb
	modificado:    app/models/abilities/common.rb
	modificado:    app/views/debates/_form.html.erb
	modificado:    app/views/proposals/_form.html.erb
	modificado:    config/initializers/acts_as_taggable_on.rb
	modificado:    config/routes.rb
	modificado:    spec/lib/acts_as_taggable_on_spec.rb
 2017-09-21 18:21:45 +02:00
BertoCQ
7fa21afa56 Merge pull request #1902 from consul/travis-matrix 
Build matrix
 2017-09-21 15:47:51 +02:00
rgarcia
3ce72b6e40 regenerates knapsack report 2017-09-21 14:42:55 +02:00
BertoCQ
d58d71b98d Merge pull request #1898 from consul/clean-css 
Clean CSS
 2017-09-21 10:24:03 +02:00
BertoCQ
52954a480e Merge pull request #1892 from consul/subnavigation 
Active class on subnavigation
 2017-09-21 10:22:45 +02:00
decabeza
80e24d6c13 changes h2 titles upcase to prevent broke specs 2017-09-21 00:58:39 +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
decabeza
b43e464292 renames js class 2017-09-20 19:27:11 +02:00
decabeza
6642d47f4c fixes scss lint errors 2017-09-20 19:26:43 +02:00
decabeza
b291547bae replaces unnecessary css class 2017-09-20 19:07:08 +02:00
Bertocq
6aba5de801 Make rubocop display cop name and style guide link to improve output 2017-09-20 16:13:08 +02:00
Bertocq
c2d154b1ac Comply with Style/PredicateName rule for ? method names 2017-09-20 16:12:28 +02:00
Bertocq
03ee43bfee Use weeks instead of week for more than one 2017-09-20 16:07:53 +02:00
Bertocq
12658e33a9 Use %w string array syntax to comply with the 140 char line limit 2017-09-20 16:07:19 +02:00
BertoCQ
33c687ffec Merge pull request #1878 from deivid-rodriguez/chore/improve_dev_seeds 
Minor improvements in dev seeds
 2017-09-20 13:27:55 +02:00
decabeza
3e85961657 fixes duplicated active class on subnavigation 2017-09-20 12:55:34 +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
decabeza
5ffac1d1fb remove extra line break 😅 2017-09-20 01:38:32 +02:00
decabeza
3fe1c21d7f includes new css styles 2017-09-20 01:38:32 +02:00
decabeza
3e5b4f2e44 removes important declaration on layout.scss 2017-09-20 01:38:32 +02:00
decabeza
3e2c639137 moves stats and setting links to header into a partial 2017-09-20 01:38:32 +02:00
decabeza
90f2b84856 improves admin header layout 2017-09-20 01:38:32 +02:00
decabeza
8ed791e860 includes description text on admin dashboard index 2017-09-20 01:38:32 +02:00
decabeza
28a6583199 removes untranslated texts on admin dashboard index 2017-09-20 01:38:32 +02:00
BertoCQ
69b7608c74 Merge pull request #1890 from consul/comment-reply-link 
Comment reply link
 2017-09-19 23:41:54 +02:00
BertoCQ
9b0732b8d9 Merge pull request #1863 from wairbut-m2c/aperez-fix-for-issue-1848 
Add base controller for Admin:Poll controller
 2017-09-19 22:54:14 +02:00
BertoCQ
d0528acb85 Merge branch 'master' into aperez-fix-for-issue-1848 2017-09-19 22:54:06 +02:00
David Rodríguez
69aaa7de12 Fixes unintended new line 2017-09-19 22:01:47 +02:00
David Rodríguez
e2c311a624 Adds an unverified user to dev seeds 
Useful if you want to test the verification process.
 2017-09-19 22:01:47 +02:00
decabeza
73b61e8596 adds and removes spaces :neckbeard: 2017-09-19 20:38:08 +02:00
decabeza
1f58dd7545 removes hash comment id on comment replies link 2017-09-19 20:36:57 +02:00
Carlos Ruiz
61c9536697 Add flagging/unflagging rspec 2017-09-19 20:11:23 +02:00
Carlos Ruiz
cf2dff1013 Small class names and html refactor 2017-09-19 20:11:06 +02:00
BertoCQ
033df1192f Merge pull request #1889 from consul/dev_seeds 
Fixes dev seeds
 2017-09-19 19:46:47 +02:00
rgarcia
37be890fbe Fixes dev seeds 
Poll::Questions now have a validation for a `poll_id`
 2017-09-19 19:39:47 +02:00
BertoCQ
f67ba62c49 Merge branch 'master' into user-recomendations 2017-09-19 18:56:12 +02:00
BertoCQ
f99612d619 Merge pull request #1869 from wairbut-m2c/iagirre-display-datepicker-arrows 
Iagirre display datepicker arrows
 2017-09-19 18:55:10 +02:00
Bertocq
9c6a974bec Fix wrong spectations after final result swap for total result 2017-09-19 18:54:37 +02:00
BertoCQ
8cbdc5a6fd Merge pull request #1874 from wairbut-m2c/iagirre-admin-menu-wrongful-active-items 
When "Profiles" submenus are selected, the "Site custom" menu doesn't…
 2017-09-19 18:52:44 +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
iagirre
049967649e Selection of multiple tags separated by ',' works for hardcoded array of tags. 2017-09-19 17:37:31 +02:00
rgarcia
3105bd9ee1 precompile assets in test environment 
Usually the first spec that visits a page fails with a timeout.
Hopefully it was due to having to compile assets at runtime and this helps to fix it
 2017-09-19 17:30:40 +02:00