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

11202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alberto
db44dd1226 Merge pull request #2720 from wairbut-m2c/backport/moderation-index-positioning 
Fix moderation index views information positioning
 2018-07-26 14:18:11 +02:00
Alberto
b04b1bee46 Merge pull request #2801 from consul/proposal_authors_notifications 
Prevent authors from receiving their own proposals notification emails
 2018-07-26 14:12:14 +02:00
Alberto
89f2f53e75 Merge pull request #2799 from wairbut-m2c/backport-2588-fix_supports_filter 
Fix `max_per_heading` filter in Admin budget investments list
 2018-07-26 14:11:03 +02:00
Alberto
f93b1e24fb Merge pull request #2797 from wairbut-m2c/fix-admin-budget-investments-spec 
Fix order-dependent spec
 2018-07-26 13:57:04 +02:00
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
163d2f6edf Merge pull request #2788 from javierv/2769-fix_flaky_notifications_spec 
Fix flaky spec: Moderate proposal notifications Hide
 2018-07-26 13:27:10 +02:00
Alberto
9eacc5c5ff Merge pull request #2753 from consul/unfeasibility-explanation 
Fix display of unfeasibility explanation
 2018-07-26 13:21:21 +02:00
Alberto
1aa8737ed5 Merge branch 'master' into proposal_authors_notifications 2018-07-26 13:00:54 +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
rgarcia
ab5f78120a Fix specs 
Git seems to have gotten confused and some specs where duplicated
and others missing

This commits restructures commits to sync them with Madrid's fork
 2018-07-26 12:52:51 +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
Alberto
a2f2413286 Merge pull request #2793 from wairbut-m2c/backport-1427-signature_sheets_improvements 
Added year to showed creation date and ordered by date DESC
 2018-07-26 11:32:58 +02:00
Marko Lovic
b816a5be00 Fix order-dependent specs 
Due to how DB IDs are assigned with AUTO INCREMENT, tests
cannot assume that any specific ID will be available.
 2018-07-26 11:25:51 +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
Alberto
7053711269 Merge pull request #2792 from consul/system_emails 
System emails
 2018-07-26 00:01:07 +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
decabeza
8b6a8703e0 Adds missing fill_in_admin_notification_form in common actions 2018-07-25 19:13:31 +02:00
decabeza
bbf3faa783 Fixes admin notifications specs 2018-07-25 19:12:48 +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
a883e842ba Make admin notifications seed data translatable 2018-07-25 18:35:34 +02:00
Bertocq
812002dd7b Add admin notification related translations 2018-07-25 18:34:33 +02:00
Bertocq
2aa4b5cad6 Add AdminNotification seed data 2018-07-25 18:34:33 +02:00
Bertocq
e010f95485 Increase notifications spec with AdminNotification scenarios 2018-07-25 18:33:45 +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
a10169bac0 Add specs for Admin AdminNotification management 2018-07-25 18:31:41 +02:00
Bertocq
45488d117a Create AdminNotification model, spec and factory 2018-07-25 18:30:29 +02:00
Bertocq
b556fe9000 Create AdminNotification database table 2018-07-25 18:29:10 +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
6669442b79 Merge pull request #2789 from consul/investment_images 
Adds images to budget::investments
 2018-07-25 14:44:48 +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
Marko Lovic
53a1ea8847 Fix spec 2018-07-25 14:15:37 +02:00
Javier Martín
8b78dd88a0 Fix typo in proposal notifications spec. 2018-07-25 01:49:47 +02:00
Alberto
3528f09202 Merge pull request #2787 from consul/budgets-specs 
Fixes tags budget investments specs
 2018-07-24 20:25:34 +02:00