consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,136 Commits 1 Branch 0 Tags
d07a8712bf309a784da07be9d414aa1ad1a6b718
Commit Graph

532 Commits

Author SHA1 Message Date
taitus
3048578c53 Add new boolean field published_proposal to Dashboard::Action 
Need differentiate between an action in a published proposal and an action in a draft proposal
 2019-02-02 17:45:55 +01:00
taitus
573495d208 BugFixes: generate new schema according to migrations. 2019-01-08 13:20:28 +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
iagirre
3dcd7886d7 Add migration to delete the image and styles from banners, in order to use background_color and font_color 2018-07-13 12:08:39 -04:00
iagirre
5d1b06a3cb New and fresh DB schema 2018-07-12 10:16:48 -04:00
iagirre
3690cae458 Apply banner style to the new banners 
Banner sections can be saved (one banner can appear in several sections)
If the hex color is changed in the textfield, the color of the color picker changes.
 2018-07-12 10:16:47 -04:00
iagirre
6d6da8affc Add form fields to set the colours and the sections for the banner 
Add migrations to store the information in the database
 2018-07-12 10:16:47 -04:00
iagirre
7982574993 Add migration to generate new columns 
The migration to generate the columns needed for the feature.
There are three new columns:

moderated: a boolean that, when true, it means a moderator has
hidden a proposal notification. The notification is hidden immediately
and it's shown in the moderators proposal notifications index.

hidden_at: used by acts_as_paranoid to hide the notification from the list.
It's like deleting it, but without deleting definitely from DB.

ignored_at: used to mark as a notification as ignored, so that it will
appear in marked as reviewed and not in the pending list. WARNING! this
doesn't mean that it will disappear from the 'All' filter.
 2018-07-02 18:06:19 +02:00
María Checa
7deded142f Add Budget::Investment::Status migration 2018-06-27 18:19:22 +02:00
María Checa
28bb32a085 Add Budget::Investment::Status migration 2018-06-27 16:44:40 +02:00
rgarcia
b672a4550d Add option to configure feed items displayed in homepage 2018-05-29 19:58:04 +02:00
rgarcia
7c17eea6a3 Refactor widget feed from activemodel to activecord 2018-05-29 18:26:20 +02:00
rgarcia
ad181b0e10 Add label to cards 
Also removes unused fields related to buttons and alignment
 2018-05-28 18:17:26 +02:00
rgarcia
0e097973cc Add widget feeds to homepage 
Note there is some funkiness going on with class loadings
Had to create a `feed` and `widget_feed` table even though in this
first version the Widget::Feed includes only uses ActiveModel instead
of ActiveRecord, otherwise some specs failed

We’ll figure it out and clean up 😌
 2018-05-28 18:17:26 +02:00