consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,994 Commits 1 Branch 0 Tags
334b57501b8d6dbda8e20778b51df5ce4cb1c7c1
Commit Graph

862 Commits

Author SHA1 Message Date
decabeza
5b8fe4bb98 Add truncate to proposed action description 
The show description link only appears if the description is longer than defined length.
 2019-04-24 13:58:37 +02:00
decabeza
cb22e6cbfb Merge branch 'master' into proposal-dashboard 2019-04-23 17:12:47 +02:00
Raimond Garcia
b230cd29ab Merge pull request #3414 from consul/upgrade_to_rails_5 
Upgrade to rails 5
 2019-04-23 16:26:14 +02:00
Senén Rodero Rodríguez
f87804aa90 Update helpers after globalize gem version update 
Globalize has fixed new translations globalized_model initialization
so we have to adapt existing code.
 2019-04-17 17:40:55 +02:00
rgarcia
b62eff841c Fix symbolize_keys deprectation warning 
DEPRECATION WARNING: Method symbolize_keys is deprecated and will be
removed in Rails 5.1, as `ActionController::Parameters` no longer
inherits from hash. Using this deprecated behavior exposes potential
security problems. If you continue to use this method you may be
creating a security vulnerability in your app that can be exploited.
Instead, consider using one of these documented methods which are not
deprecated:
http://api.rubyonrails.org/v5.0.4/classes/ActionController/Parameters.ht
ml (called from csv_params at
/home/travis/build/consul/consul/app/helpers/budgets_helper.rb:15)
 2019-04-17 17:40:55 +02:00
rgarcia
f23fd6f3bb Remove parameterise deprecation warning 
DEPRECATION WARNING: Passing the separator argument as a positional
parameter is deprecated and will soon be removed. Use `separator: '_'`
instead.
 2019-04-17 17:40:55 +02:00
Julian Herrero
7e422f2187 Fix bug management print voted investments 
If budget is in balloting phase and there are voted investments, it
was not possible to print budgets investments because the ballot was
never being loaded in the controller and therefore an error was raised
when rendering the view.

Failure/Error: <% if ballot.has_investment?(investment) %>

  ActionView::Template::Error:
    undefined method `has_investment?' for nil:NilClass
      app/views/budgets/investments/_ballot.html.erb:3
      app/views/budgets/investments/_investment.html.erb:88
      app/views/custom/management/budgets/investments/print.html.erb:26
 2019-04-17 14:19:32 +02:00
decabeza
94b8caffca Merge branch 'master' into proposal-dashboard 2019-04-04 14:08:30 +02:00
rgarcia
6fa7562181 Automatically create a budget poll if it does not exist 2019-04-03 22:23:22 +02:00
Javier Martín
12bccf3fd0 Merge pull request #3364 from LextrendIT/3357_add_admin_investments_advanced_filter_for_max_supports 
Add on admin budget investments an advanced filter for max supports
 2019-04-03 21:39:15 +02:00
lalo
0a5057a0a8 Add max support advanced filter for admin budget investments 2019-04-02 19:46:16 +02:00
decabeza
170cc45a20 Shows message on index if officer has no shifts 2019-03-28 15:50:34 +01:00
decabeza
18e57b9662 Hides sibebar menu if officer has no shifts 2019-03-28 15:50:34 +01:00
decabeza
2af154d539 Merge branch 'master' into proposal-dashboard 2019-03-28 01:26:04 +01:00
decabeza
91be3cf775 Fix more hound warnings 2019-03-27 15:22:14 +01:00
decabeza
eda6ea7f12 Merge branch 'master' into dashboard 2019-03-26 16:45:48 +01:00
Javi Martín
4c35df4812 Use double quotes inside string interpolation 2019-03-25 14:58:54 +01:00
Javi Martín
2b4e1cf358 Add missing double quotes 
We overlooked a few single quotes while we changed thousands of them.
 2019-03-25 13:22:35 +01:00
decabeza
21c6da3767 Use min age to participate setting on verification residence form 2019-03-22 16:15:48 +01:00
taitus
6342d598f7 Update active resources count for proposal 
Fix: Sum default resources (mail, poster, poll) to actives resources for a proposal.
 2019-03-21 12:29:31 +01:00
taitus
a1de5b2334 Display tag "new" on actions 
An author will see a "new" tag on each action or resource that has appeared on his dashboard since his last login.
Too add "new" tag on dashbord menu when there are new resources.
 2019-03-21 12:29:31 +01:00
Julian Herrero
89d4ea5aa3 Remove homepage widget settings from configuration tab 
- Rename homepage widget settings keys
 2019-03-19 19:45:34 +01:00
Julian Herrero
c82b2a975a Add new settings tab for participation processes 
- Rename setting keys
- New tab por participation processes
- Hide these settings from features tab
 2019-03-19 19:45:32 +01:00
Julian Herrero
dbac4bc222 Change admin settings tab for maps 
- Rename map settings keys
- Add fields for latitude, longitude and zoom
- Add a callout message on how to enable map feature
 2019-03-19 18:14:57 +01:00
Julian Herrero
b460c024f3 Use double quotes in app/helpers 2019-03-15 09:26:49 +01:00
decabeza
83e8d6035a Remove questions link on admin polls menu 2019-03-13 13:33:49 +01:00
decabeza
528a4b6e8e Add default colours to admin banners 2019-03-13 13:17:42 +01:00
Alberto
098f4b6c5f Merge pull request #3328 from consul/admin-settings 
Improve Admin settings section
 2019-02-27 10:49:54 +01:00
Javier Martín
a1c5dad4ff Merge pull request #3324 from consul/backport-sorting_icons 
Add sorting icons to sortable tables
 2019-02-20 17:56:49 +01:00
decabeza
3ab80b229f Use interpolation instead of concatenation on legislation helper 2019-02-20 13:32:35 +01:00
decabeza
e1bbd0eef0 Add default colours for legislation processes header 2019-02-20 13:32:31 +01:00
decabeza
9e9eb1359b Add icon to sortable table 2019-02-20 13:07:08 +01:00
decabeza
ccee843da7 Remove unused settings 
These settings are customised for Madrid's fork. On CONSUL any user can include new links using site customisation content blocks from admin panel.
 2019-02-18 15:40:11 +01:00
Julian Herrero
884274c4ad Add a description for open polls 2019-02-18 13:34:07 +01:00
Javier Martín
b330de01f6 Merge pull request #3148 from matisnape/budget_investments_sorting_columns 
Add sort links to admin tables
 2019-02-15 19:19:11 +01:00
Julian Herrero
a963a99c55 Use correct scope to sort headings by name 2019-02-13 13:35:09 +01:00
Julian Herrero
922600252c Make budget headings translatable 2019-02-13 13:35:07 +01:00
Julian Herrero
1c35ec99c1 Make budget groups translatable 2019-02-13 12:30:37 +01:00
Julian Herrero
f38c4e3a0c Highlight budgets menu when editing budget phases 2019-02-13 11:44:46 +01:00
rgarcia
55fb14ac14 do not display alert when supporting for whole city 2019-02-07 16:55:24 +01:00
Alberto
14e73e9086 Merge pull request #3269 from consul/homepage-feeds 
[Backport] Change layout on homepage if feed debates and proposals are enabled
 2019-02-06 14:32:46 +01:00
decabeza
218c8e1ae7 Change layout on homepage if feed debates and proposals are enabled 2019-02-05 17:28:57 +01:00
decabeza
a2161f3ace Hide voted group css class if current filter is unfeasible 2019-02-05 17:16:04 +01:00
decabeza
5409db6c55 Show only selected investments on map from publishing prices phase 
If there are no selected investements show all investments on map.
 2019-02-05 14:01:27 +01:00
taitus
487c485fe0 Add new section on sidebar menu for recommended proposals 
- Display recommended_proposals on new section as goals with toogle.
- Divide recommended actions into actions done and actions pending to clarify the information to the user as summary_recomended_actions.
 2019-02-04 11:48:47 +01:00
Alberto
9475a0c6ee Merge pull request #3249 from consul/custom-pages 
Refactor processes header colors and custom pages
 2019-01-30 20:05:20 +01:00
decabeza
773302f0d7 Show only random order for unfeasible and unselected investments 2019-01-30 14:16:25 +01:00
decabeza
5893ed7587 Create helper for legislation process header with custom colors 2019-01-30 13:15:42 +01:00
decabeza
2695e19e2f Fix hound warnings 2019-01-29 17:54:02 +01:00
Alberto
41fe1e3922 Merge pull request #3152 from NahiaSolutions/add_image_to_legislation_processes 
Add image to legislation processes and banner colors
 2019-01-29 16:06:54 +01:00