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

1256 Commits

Author SHA1 Message Date
María Checa
bf61dffd4b Removed files that are not used 2017-10-03 10:47:48 +02:00
BertoCQ
7f936f440c Merge branch 'master' into polls_minor_changes 2017-10-02 16:44:53 +02:00
Bertocq
b5cf28cb35 Swap Poll White/Null/Total usage for Poll Recount 2017-10-02 15:46:49 +02:00
María Checa
adf18ee756 Polls admin fixes 
Removed search from questions tab and unassign button.
 2017-10-02 10:37:10 +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
49b4af5e04 Add flash error for shift creation without date, increase spec 2017-09-28 10:53:15 +02:00
Bertocq
f40a0d09ed Add Shift vote and recount date ranges, filter selected one on controller 2017-09-27 18:08:03 +02:00
Senén Rodero Rodríguez
5815389cb8 Rename map settings keys 2017-09-27 14:49:07 +02:00
Senén Rodero Rodríguez
5956207a00 Add map locations. Each map location can belongs to proposal or budget investment. 2017-09-27 14:48:12 +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
Bertocq
ce92dcd088 Add Task selection on Poll Shift creation, and on shifts table 2017-09-27 14:05:25 +02:00
Senén Rodero Rodríguez
2993ef8707 Remove documents single uploads 2017-09-27 11:04:56 +02:00
Senén Rodero Rodríguez
eef8ad1b73 Remove images single uploads 2017-09-27 10:41:48 +02:00
Senén Rodero Rodríguez
5deb07328b Remove obsolete code 2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
f6fba64012 Remove uneeded document and image initializations 2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
e58feb7d6d Fix for remote filesytem paperclip configuration. 2017-09-26 13:57:14 +02:00
Senén Rodero Rodríguez
93e5c9656c Remove unnedded code 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
0a86727c6a Move method 'recover_image_from_cache' from imageable controllers to image. 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
c22637c349 Move method 'recover_documents_from_cache' from documentable controllers to document. 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
d98d1312ca Add _destroy parameter to nested image 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
77f63a4c44 Add _destroy parameter to nested documents 2017-09-26 13:57:13 +02:00
Senén Rodero Rodríguez
f8d78ec4ab Remove new_nested action from images controller. Use cocoon gem to manage new nested fields creation on images. 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
661bdda41f Stronger direct upload model specs 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
824dd26d5a User new direct uploads controllers action on documentable. Skipped spec. 2017-09-26 13:55:51 +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
c6dabedb4a Add missing image model spec. Add shared specs to check image validations at any imageable model 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
7b63f01a86 Use paperclip destroy function instead of setting object to nil. 2017-09-26 13:53:43 +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
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
taitus
7b88e63136 Add image to budget investments. 2017-09-26 13:53:42 +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
91fcea03b1 Remove useless parentheses on new() call 2017-09-25 22:51:07 +02:00
Bertocq
5129fc83a8 Use next to go for next iteration instead than surrounding if 2017-09-25 22:47:03 +02:00
Bertocq
22822aa173 Fix Style/RedundantParentheses rubocop issues 2017-09-25 22:44:58 +02:00
Bertocq
ef038b30ac Remove trailing comma in arguments 2017-09-25 22:30:29 +02:00
BertoCQ
aafd82542e Merge pull request #1894 from consul/chore/rubocop 
🤖  Rubocop fixes and config
 2017-09-25 19:12:06 +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
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
Bertocq
03ee43bfee Use weeks instead of week for more than one 2017-09-20 16:07:53 +02:00
BertoCQ
d0528acb85 Merge branch 'master' into aperez-fix-for-issue-1848 2017-09-19 22:54:06 +02:00