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

8099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Senén Rodero Rodríguez
00a8f42797 Added image content type validation to only allowing jpg images. 2017-09-26 13:53:42 +02:00
taitus
c5bb6dca65 Add image to budget investments. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
534aa4146e Add optional image_url parameter to social sharing partial. 2017-09-26 13:53:42 +02:00
Senén Rodero Rodríguez
4f5a552486 Added image content type validation to only allowing jpg images. 2017-09-26 13:53:42 +02:00
taitus
7b88e63136 Add image to budget investments. 2017-09-26 13:53:42 +02:00
iagirre
e90ac7e72d Admins can see the preview of the budgets' results before the balloting phase is finished. 
Cambios para hacer commit:
	modificado:    app/models/abilities/administrator.rb
	modificado:    app/views/budgets/show.html.erb
	modificado:    spec/models/abilities/administrator_spec.rb
	modificado:    spec/models/abilities/everyone_spec.rb
 2017-09-26 11:16:32 +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
feddc44267 Merge pull request #1922 from consul/rubocop 
Rubocop 🤖  Cleanup
 2017-09-26 10:19:47 +02:00
BertoCQ
73c47dcd0e Merge pull request #1905 from wairbut-m2c/iagirre-autocomplete-tags 
Iagirre autocomplete tags
 2017-09-26 10:19:34 +02:00
Bertocq
ee7ef6e2df Normalize some i18n files 2017-09-25 23:02:54 +02:00
Bertocq
7e4d9b749b Fix Style/ColonMethodCall rubocop issues 2017-09-25 22:53:15 +02:00
Bertocq
43758ba830 Fix Style/EmptyCaseCondition rubocop issue 2017-09-25 22:52:38 +02:00
Bertocq
91fcea03b1 Remove useless parentheses on new() call 2017-09-25 22:51:07 +02:00
Bertocq
71b57ffc67 Always use parentheses on method definition 2017-09-25 22:50:24 +02:00
Bertocq
ca35c8b85c Fix Style/NestedParenthesizedCalls rubocop issues 2017-09-25 22:47:59 +02:00
Bertocq
5129fc83a8 Use next to go for next iteration instead than surrounding if 2017-09-25 22:47:03 +02:00
Bertocq
c5059f7292 Fix Style/ParenthesesAroundCondition rubocop issues 2017-09-25 22:46:09 +02:00
Bertocq
22822aa173 Fix Style/RedundantParentheses rubocop issues 2017-09-25 22:44:58 +02:00
Bertocq
2c35cbd27a Remove no longer present Style/StringLiteralsInInterpolation from rubocop todo list 2017-09-25 22:41:05 +02:00
Bertocq
ef038b30ac Remove trailing comma in arguments 2017-09-25 22:30:29 +02:00
BertoCQ
cc7ba7495b Merge pull request #1921 from consul/admin-menu 
Admin menu
 2017-09-25 19:48:23 +02:00
decabeza
9de8ef2e14 sets data-multi-open to false on admin menu 2017-09-25 19:40:24 +02:00
BertoCQ
e4521e4591 Merge pull request #1920 from consul/admin-notifications 
Admin notifications icon
 2017-09-25 19:34:08 +02:00
decabeza
7827f6edd1 fixes icon notifications on admin header 2017-09-25 19:17:48 +02:00
BertoCQ
aafd82542e Merge pull request #1894 from consul/chore/rubocop 
🤖  Rubocop fixes and config
 2017-09-25 19:12:06 +02:00
BertoCQ
0eb33bbcd4 Merge pull request #1910 from consul/filter-subnav 
Filter subnav
 2017-09-25 19:02:30 +02:00
BertoCQ
a1a74f59bf Merge pull request #1911 from consul/legislation-process 
Legislation process SCSS
 2017-09-25 19:00:42 +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
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
María Checa
2629837306 Fixed admin menu active states 2017-09-22 17:25:33 +02:00
María Checa
a870f35de8 Added translations 2017-09-22 17:21:55 +02:00
María Checa
02fa3a83b5 Custom tags for Legislation Process available 
Custom tags for Legislation Processes, editable in the admin section.
 2017-09-22 17:16:04 +02:00
María Checa
3c4f2426db Removed unnecessary content 2017-09-22 11:39:30 +02:00
María Checa
ebfa3fb011 Disallow users to edit their legislation proposals 2017-09-22 11:39:17 +02:00
iagirre
0948959a65 Run scss-lint to fix some errors in autocomplete_overrides.scss 2017-09-22 08:09:03 +02:00
María Checa
f3229007e8 Run pending migrations 2017-09-21 21:28:54 +02:00
María Checa
ac5620c583 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-09-21 21:24:56 +02:00
decabeza
2948251fc2 updates specs 2017-09-21 18:31:30 +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
decabeza
c400c83fa2 removes unnecessary methods on topics helper 2017-09-21 17:41:35 +02:00
decabeza
363f2a59ac improves styles for community 2017-09-21 17:39:55 +02:00
decabeza
0fa59401e4 improves i18n for community 2017-09-21 17:39:32 +02:00
decabeza
c887cb7366 improves html markup on communities and topics views 2017-09-21 17:35:21 +02:00
María Checa
536ee520e8 Removed unnecessary views 2017-09-21 17:13:22 +02:00
María Checa
57c48fe596 Legislation proposals comments working 2017-09-21 17:13:12 +02:00
María Checa
5ae8cda0d5 Fixed legislation proposal vote action 2017-09-21 16:23:34 +02:00