consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,045 Commits 1 Branch 0 Tags
652f85cba3447c2ef4c1a70dfd7b3f7e5ae63b51
Commit Graph

693 Commits

Author SHA1 Message Date
Javier Martín
8bcf713d10 Merge pull request #3100 from consul/backport-2743-add_milestones_to_legislation_processes 
Add milestones to legislation processes
 2018-12-12 15:12:36 +01:00
Javier Martín
a1df90c1b7 Merge pull request #3097 from consul/fix_milestone_translations_migration 
Fix budget investment milestone translations migration
 2018-12-12 14:48:59 +01:00
Javi Martín
a42f5fab37 Add milestones summary to legislation processes 2018-12-11 20:19:48 +01:00
Julian Nicolas Herrero
6aa54d6c62 Merge branch 'master' into content_blocks_for_headings 2018-12-11 16:40:25 +01:00
Julian Nicolas Herrero
9aab3ddd7b Merge pull request #3038 from MatheusMiranda/add_map_to_heading_page 
Add map to sidebar on Heading's page
 2018-12-11 16:32:35 +01:00
Javi Martín
b685419b28 Fix "Remove obsolete model usage" 
We accidentally changed the schema when modifying an existing migration.
It wasn't critical because we're going to remove that table in the
future, but it resulted in conflicts for users who had already run the
migration before its modification.

This commit fixes commit 4a7f479.
 2018-12-11 13:54:38 +01:00
Javi Martín
4a7f479d21 Remove obsolete model usage 
We'd rather keep the table so future data migrations work smoothly, so
we change the migration in order to create the translation table without
using models.
 2018-11-30 14:15:21 +01:00
Marko Lovic
c0f6fa182f Make Milestones general, and not specific to Budget Investments 
Generalize the Budget::Investment::Milestone model to a
polymorphic Milestone model so it can be used for entities
other than Budget::Investment.
 2018-11-30 14:15:21 +01:00
Marko Lovic
81f516efd7 Change BudgetInvestmentStatus to Milestone::Status 
Generalize the BudgetInvestmentStatus model to Milestone::Status so it
is not specific to budget investments, but can be used for any entity
which has milestones. This is in preparation to make the Milestone
model polymorphic and usable by entities other than budget investments.
 2018-11-30 14:15:21 +01:00
Milber Champutiz Burbano
9f455b9165 Added feature to add content block to headings in sidebar -- rebase 2018-11-27 09:37:35 -05:00
Raimond Garcia
ed9e501ae7 Merge branch 'master' into add_map_to_heading_page 2018-11-27 11:07:16 +01:00
João Lutz
34b58a5208 Adds draft phase functionality in legislation processes 2018-11-19 22:18:50 -02:00
Matheus Miranda
06f07b1139 Add map to sidebar on Heading's page 
Signed-off-by: Matheus Miranda <matheusmirandalacerda@gmail.com>
 2018-11-16 09:05:23 +01:00
decabeza
546105d989 Merge branch 'master' into dashboard-master 2018-10-19 01:48:37 +02:00
Raúl Fuentes
05340e423c Add select to Legislation::Proposals 
Add admin interface for mark any proposal as selected
Add filter to public interface for selected proposals
 2018-10-04 16:28:56 +02:00
Javier Martín
132fea9c94 Merge pull request #2913 from papayalabs/2741-updates-translatable-custom-pages-reloaded 
Updates translatable custom pages
 2018-10-03 13:23:13 +02:00
Papaya Labs
914bfa645e Updates translatable custom pages 2018-09-27 13:46:17 +02:00
Juan Salvador Pérez García
488e7e081f Merge branch 'dashboard' into rebase_consul_master 2018-09-27 09:18:27 +02:00
Javi Martín
5bb5cfa7fb Make Widget::Card translatable 2018-09-26 16:09:09 +02:00
Raimond Garcia
4086220ebf Merge pull request #2914 from microweb10/make_polls_translatable 
Make polls translatable
 2018-09-26 13:19:17 +02:00
Julian Herrero
673ec075eb Make answers translatable 2018-09-20 17:13:40 +02:00
Julian Herrero
5e6248d2ac Make questions translatable 2018-09-20 17:11:53 +02:00
Julian Herrero
9495208518 Make polls translatable 2018-09-20 17:07:43 +02:00
Marko Lovic
ee15295f54 Add migration for all collaborative legislation translations 2018-09-19 14:54:24 +02:00
Marko Lovic
f6749049c9 Make Admin Notifications translatable 2018-09-19 12:15:26 +02:00
Javi Martín
9cfa07ff1d Remove unrelated schema changes 2018-09-12 12:35:28 +02:00
Javi Martín
43e83889ff Simplify CKEditor authorization 
We can use the `config.authorize_with` option, so we don't need to copy
the controller in order to load and authorize resource.

Besides, only administrators can upload images, so we don't need to
track the image's user id.
 2018-09-12 12:35:28 +02:00
Raúl Fuentes
d574657b77 Fixes for the review made by @javierm 
this commit will be merged with the others when the chages
are accepted
 2018-09-12 12:35:28 +02:00
Raúl Fuentes
424535c1ae Add models needed to include images on ckeditor4 2018-09-12 12:35:28 +02:00
Marko Lovic
0fa4b60f39 Make Banners translatable 2018-08-30 16:29:29 +02:00
Raimond Garcia
2c79197a05 Merge pull request #2809 from wairbut-m2c/backport/translatable-content-for-admin 
Basic content for I18n on Admin panel
 2018-07-27 18:01:00 +02:00
Juan Salvador Pérez García
50f73abb0c Fixes #voodoorai2000 comments 
Fixes some comments from #voodoorai2000 for the PR to consul
 2018-07-27 16:30:03 +02:00
Alberto
fb19aafee7 Merge pull request #2778 from wairbut-m2c/backport/investments-moderation 
Allow budget investments to be moderated
 2018-07-27 12:34:17 +02:00
Raúl Fuentes
6d6dc32c38 Complete basic I18n backend and frontend 2018-07-26 19:06:19 -04:00
rgarcia
9264763ec5 Log newsletter emails sent 
With this commit we are logging which emails have already received the
newsletter

This could be important if something goes wrong sending the newsletter,
to be able to identify which users have already received the newsletter
and be able to skip them

We’ve had to add a new action to the Activity model (email) and add
paranoia features to be able to deal gracefully with the default
`with_hidden` scope in Activities[1]

[1]
https://github.com/AyuntamientoMadrid/consul/blob/master/app/models/acti
vity.rb#L2
 2018-07-26 17:55:06 +02:00
Bertocq
b556fe9000 Create AdminNotification database table 2018-07-25 18:29:10 +02:00
Juan Salvador Pérez García
e5f9cf6710 Fixed #239 
Proposals dashboard refactored to dashboard.
Added missing specs for the dashboard.
 2018-07-24 15:52:43 +02:00
Raimond Garcia
ae0f0f4f5f Merge pull request #2382 from wairbut-m2c/iagirre-admin-banner-migration 
Migration to remove images and styles from banners
 2018-07-23 14:45:37 +02:00
Angel Perez
335f78ae24 Migrate DB to add moderation attrs to budget_investments table 2018-07-20 18:02:37 -04:00
Juan Salvador Pérez García
ea421980b5 Rebased to upstream/master 2018-07-17 19:34:58 +02:00
Juan Salvador Pérez García
3c3f60dfcc Implements #173 
Public view for suggested actions as well as resources has been
completelly redesigned.

Private side for this feature has been adapted as well in order to meet
the requirements.
 2018-07-17 17:58:22 +02:00
Juan Salvador Pérez García
2ce9f95283 Polls in the dashboard 
A reduced version of polls has been added to the dashboard
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
33b3431c70 Implements #150 
Adds an entry inside moderation section that allows moderators to check
pending tasks and mark them as solved.
 2018-07-17 17:52:47 +02:00
Juan Salvador Pérez García
83f78b1940 Fixes #135 
Adds a table with proposed actions in the dashboard. The user can mark
an action as executed.
 2018-07-17 17:51:13 +02:00
Juan Salvador Pérez García
e4e0cb65de Implements #142 
Dashboard actions can be proposed actions or resources
 2018-07-17 17:50:05 +02:00
Juan Salvador Pérez García
1464bddfa8 Fixes #134 
Adds an administration interface for the proposal dashboard actions.
 2018-07-17 17:48:46 +02:00
Juan Salvador Pérez García
77dd60427d Implements story #136 
Adds draft state for proposals
 2018-07-17 17:46:54 +02:00
Angel Perez
0b7967440f Recommendations for users are enabled by default 2018-07-15 21:28:58 -04:00
Angel Perez
a58f6a2662 Enable 'Recommended proposals' setting for users 2018-07-15 21:28:57 -04:00
Angel Perez
522c206f6d Enable 'Recommended debates' setting for users 2018-07-15 21:28:57 -04:00