consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,202 Commits 1 Branch 0 Tags
0affaaee7e194d901b0ebc1bbb032444e12ec01e
Commit Graph

6128 Commits

Author SHA1 Message Date
Alberto
d17b628426 Merge branch 'master' into backport-2588-fix_supports_filter 2018-07-26 13:44:20 +02:00
Alberto
273781430c Merge pull request #2800 from wairbut-m2c/backport-2589-investments_supports_order_filter 
Change admin budget investments list order by supports from less to more
 2018-07-26 13:43:28 +02:00
Alberto
52a2931fcb Merge pull request #2798 from consul/activity_fix 
Adds logic to handle activity actionable attributes
 2018-07-26 12:58:33 +02:00
María Checa
a62b5c1492 Removes author from Proposal#users_to_notify 2018-07-26 12:51:34 +02:00
María Checa
5dfefbbe2f Change admin budget investments list order by supports from less to more 
Sorting by id is in descending order and by title ascending

Backported from AyuntamientoMadrid/consul
 2018-07-26 12:24:53 +02:00
Alberto
ad7166166c Merge pull request #2796 from consul/remove_see_results_button 
Removes permissions for admins to access unfinished budget results
 2018-07-26 12:16:26 +02:00
María Checa
22210c46d0 Adds logic to handle activity actionable attributes 2018-07-26 11:46:35 +02:00
Alberto
25feaafce5 Merge pull request #2794 from consul/fix_notifiable_delegation 
Try if notifiable has notifiable methods
 2018-07-26 11:33:23 +02:00
María Checa
2dd5fe22a8 Removes permissions for admins to access unfinished budget results 2018-07-26 11:07:19 +02:00
Bertocq
c0feabd71e Try if notifiable has notifiable methods 
Why:

There are Notifications with associated `notifiables` that actually are
not anymore Notifiables (the class doesn't include the Notifiable
concern). So when Notification delegates certain "notifiable" methods
to them the is an error.

How:

Using `try` directly on the notifiable association to avoid the delegate
trap on those corner case scenarios.
 2018-07-26 10:33:04 +02:00
María Checa
4d355f3531 Added year to showed creation date and ordered by date DESC 
Backported from AyuntamientoMadrid/consul fork
 2018-07-26 10:22:42 +02:00
Bertocq
ac9f85e208 Change Proposal Notification Digest link to anchor 
On the proposal notification digest messages there was a link to each
notification. Instead we need that link to point towards the notifications
tab of the proposal.
 2018-07-25 20:20:33 +02:00
Bertocq
eb0919d978 Add Preview Pending action to Admin System Emails 
Some system emails need to be manually reviewed before being sent. This
new action allows admins to see a preview of all Pending to be sent
Proposal Notification Digest messages.
 2018-07-25 20:20:33 +02:00
Bertocq
5c726e0949 Add Admin System Emails view & first system email 
Admins need to be able to see what a particular System Email looks like
with dummy data.

Also adding the first system email to be managed: the proposal
notification digest.

In case the current admin doesn't have any Notifications from
 ProposalNotifications there will be a crash. We'll solve this in later
 PR's with a system to "inject" sample text in email templates without
 having to generate records in the database.
 2018-07-25 20:20:33 +02:00
Bertocq
b9c6da245a Add System emails menu & list to admin panel 
We need a section to list all System Emails to view the templates and
preview an example of what would be sent.
 2018-07-25 20:19:58 +02:00
Bertocq
3fd97b0a9b Rename Newsletter & Notification to User Messages 
We're increasing the features around messaging users, menu name has to
be generic enough.
 2018-07-25 20:18:58 +02:00
Alberto
177eedf8e4 Merge pull request #2580 from consul/admin_notifications 
Admin notifications
 2018-07-25 20:05:19 +02:00
Alberto
7b8003dcb9 Merge pull request #2790 from wairbut-m2c/backport-1421-investments_csv_fixes 
Add visible_to_valuators and author_username to admin investments CSV
 2018-07-25 18:41:29 +02:00
Bertocq
f695a7faf3 Add AdminNotification management at admin panel 
In the same fashion Newsletters is managed, with the only difference that
the preview is using the notification partial in the same way the index
of notifications.
 2018-07-25 18:33:45 +02:00
Bertocq
4a5235f96f Allow notifications with explicit/unexistent links 
Notifications usually link to the associated notifiable, but the new
AdminNotifications have a link attribute that may be empty or contain an
external or internal url.
 2018-07-25 18:31:41 +02:00
Bertocq
a683fcff98 Refactor notification partials and index view 
The notification body has been extracted to a new partial to allow
notifications without link to be rendered without needing an if-else
duplicating view code.

Note the `link_to_if` at _notification partial, as well as the optional
body attribute.
 2018-07-25 18:31:41 +02:00
Bertocq
45488d117a Create AdminNotification model, spec and factory 2018-07-25 18:30:29 +02:00
Marko Lovic
c991d9e7c7 Fix typo in i18n key 2018-07-25 17:28:14 +02:00
María Checa
e9d73eb687 Fix max_per_heading filter in Admin budget investments list 
Also changed the name of the param to `min_total_supports`, which is more descriptive on what it actually does.

Backport of 75f20d5 and 07f0806 from AyuntamientoMadrid/consul fork
 2018-07-25 15:44:51 +02:00
Marko Lovic
601e3058d8 Add visible_to_valuators and author username to admin investments CSV 
Backport based on 012e4be by María Checa from AyuntamientoMadrid/consul fork
 2018-07-25 15:10:56 +02:00
Marko Lovic
5413c34458 Restructure and rename translations 
Based on 012e4be by María Checa from AyuntamientoMadrid/consul fork
 2018-07-25 15:10:09 +02:00
Alberto
61589122ef Merge pull request #2723 from wairbut-m2c/backport_2400_combine_free_text_search_and_filters 
Combine text search and filters for Investments on Admin panel
 2018-07-25 14:42:19 +02:00
Alberto
ce5317138e Merge pull request #2786 from consul/ui-long-links 
Fixes word wrap on document links
 2018-07-24 19:30:39 +02:00
decabeza
fa4c3de83c Fixes word wrap on document links 2018-07-24 18:32:34 +02:00
María Checa
8c69871cfa Add logic to show only winner investments if budget is finished 
Backported from AyuntamientoMadrid/consul
 2018-07-24 11:33:38 +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
Alberto
c63fd5ada1 Merge pull request #2776 from consul/ui-custom 
UI custom
 2018-07-23 11:39:19 +02:00
Angel Perez
f063391e41 Add missing thead & tbody tags on investments moderation index 2018-07-20 18:42:34 -04:00
Angel Perez
7f70106299 Fix page entries information positioning for investments moderation 2018-07-20 18:42:34 -04:00
Angel Perez
c64e93867a Allow moderators to moderate investments 2018-07-20 18:42:34 -04:00
Angel Perez
4da23716bb Allow admins to moderate investments 2018-07-20 18:42:34 -04:00
Angel Perez
1990092fdf Allow moderators to hide inappropriate investments 2018-07-20 18:42:33 -04:00
Angel Perez
7bb1da1804 Adapt backend to enable flagging/unflagging investments 2018-07-20 18:42:33 -04:00
Angel Perez
8ef3e81e03 Adapt public views for flagging/unflagging investments 2018-07-20 18:42:33 -04:00
Angel Perez
bcb0b9fbfa Enable moderation abilities for Budget::Investment model 2018-07-20 18:03:11 -04:00
decabeza
b5caefc0d4 Makes footer sticky to bottom and changes footer styles 2018-07-20 18:51:13 +02:00
decabeza
dcec003d0e Updates header markup and includes new logo 2018-07-20 18:50:49 +02:00
Alberto
81b102f002 Merge pull request #2577 from consul/random-order 
Fix random order for budget investments
 2018-07-20 18:31:37 +02:00
María Checa
3cc0d1b065 Merge pull request #2770 from consul/release-0.16 
Release v0.16
 2018-07-20 14:06:39 +02:00
Alberto
bc5d263a53 Merge pull request #2761 from wairbut-m2c/backport_1384-add-max-heading-number-budget-group-list 
Backport 1384 add max heading number budget group list
 2018-07-20 13:17:38 +02:00
María Checa
eccf7de54c Update version number for consul.json 2018-07-20 12:54:51 +02:00
Raimond Garcia
593979b51a Merge pull request #2775 from consul/proposals-responsible-name 
Fix validation error when creating proposals without user verification
 2018-07-20 12:51:01 +02:00
Alberto
1f821a6540 Merge pull request #2714 from wairbut-m2c/fix/admin-menu-string-literal 
Fix string literal warning for admin menu
 2018-07-20 12:41:13 +02:00
rgarcia
4cd5bb90d4 Fix validation error when creating proposals without user verification 
We were getting a validation error when skipping user verification and
creating proposals

This was due to the responsible_name being empty for unverified users

As skipping user verification is a temporary setting used until Census
integration is configured, we can safely skip this validation when this
setting is active
 2018-07-20 11:53:01 +02:00
Angel Perez
31c16406c0 Move disable recommendations permissions to Abilities::Common model 2018-07-15 21:28:58 -04:00