consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

2781 Commits

Author SHA1 Message Date
Senén Rodero Rodríguez
fe7b0edb38 Adjust filename obfuscation to be able to remove cached uploads 2017-09-26 13:56:06 +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
baf9ce90a9 Obfuscate documentable and imageable file names. 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
bb57c1a7f5 Validate image dimensions only for valid attachment content types 2017-09-26 13:55:03 +02:00
Senén Rodero Rodríguez
d1d2a31876 Remove permissions of obsolete actions. Add missing image managment abilities to common and administrator specs. 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
Bertocq
886431b43d Revert changes in Budget::Investment model that added image attachment directly 2017-09-26 13:53:43 +02:00
Senén Rodero Rodríguez
f23fd927d6 Add constant to set minimum size for budget investment image. 2017-09-26 13:53:43 +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
4469aa9b32 Allow to remove budget investment image from edit image page to authors and administrators. 2017-09-26 13:53:42 +02:00
Alessandro Cuoghi
dd1e73c5fd Add image into investment show and add some change of css. 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
Alessandro Cuoghi
aa471974bd Use different image versions on responsive sizes 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
Senén Rodero Rodríguez
c399692109 Add image description to budget investments 2017-09-26 13:53:42 +02:00
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
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
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
43758ba830 Fix Style/EmptyCaseCondition rubocop issue 2017-09-25 22:52:38 +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
iagirre
f7e96067b0 Actions for budgets' headings added. Edit headings, delete headings if not budget investments associated and add link in order to see budgets investments filtered by the heading. 
Cambios para hacer commit:
	modificado:    app/controllers/admin/budget_headings_controller.rb
	modificado:    app/models/budget/heading.rb
	nuevo archivo: app/views/admin/budget_headings/_errors.html.erb
	nuevo archivo: app/views/admin/budget_headings/edit.js.erb
	nuevo archivo: app/views/admin/budget_headings/update.js.erb
	modificado:    app/views/admin/budgets/_group.html.erb
	nuevo archivo: app/views/admin/budgets/_heading.html.erb
	nuevo archivo: app/views/admin/budgets/_heading_form.html.erb
	modificado:    config/locales/en/activerecord.yml
	modificado:    config/locales/es/activerecord.yml
	modificado:    spec/features/admin/budgets_spec.rb
	modificado:    spec/models/budget/heading_spec.rb
 2017-09-25 15:40:17 +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
ebfa3fb011 Disallow users to edit their legislation proposals 2017-09-22 11:39:17 +02:00
María Checa
ac5620c583 Merge branch 'master' into 1856-legislation_processes_proposals_phase 2017-09-21 21:24:56 +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
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
María Checa
ba041f90c8 Removed unnecessary parts in Legislation Proposals 2017-09-21 16:17:11 +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
f67ba62c49 Merge branch 'master' into user-recomendations 2017-09-19 18:56:12 +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
Bertocq
d9575baaab Correct end at file ending 2017-09-19 17:30:40 +02:00
María Checa
c1672bdbf4 Legislation proposals adaptation in some models and initializers 2017-09-19 10:10:10 +02:00
Bertocq
2e3b5aad49 Totally remove Poll::FinalRecount model, table spec and factory 2017-09-19 01:22:30 +02:00
Bertocq
a3bf69e78d Remove final result usage on admin poll officer assignments results 2017-09-19 01:13:04 +02:00
Bertocq
485b94eab9 Correct end at file ending 2017-09-15 14:06:26 +02:00
BertoCQ
87eeefff41 Merge pull request #1867 from consul/chore/rubocop_autocorrections 
🤖 Rubocop autocorrections
 2017-09-15 14:04:01 +02:00
BertoCQ
87c99018e7 Merge branch 'master' into user-recomendations 2017-09-14 23:45:56 +02:00
Angel Perez
0611e0f4ea Validate presence of 'poll_id' attribute on Poll::Question model 
Fixes #1831

On branch aperez-validate-poll-question-is-selected
  Changes to be committed:
    modified:   app/models/poll/question.rb
    modified:   spec/models/poll/question_spec.rb
    modified:   spec/features/admin/poll/polls_spec.rb
 2017-09-14 11:52:19 -04:00