consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,520 Commits 1 Branch 0 Tags
65e4435822c8ce483f61ea1256e8b67bbf23dd9c
Commit Graph

9520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alberto
65e4435822 Merge pull request #2137 from wairbut-m2c/iagirre-admin-menu-in-management 
Add admin menu in management view (if user is admin)
 2018-07-27 12:35:07 +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
Alberto
3f388d8c6f Merge pull request #2808 from consul/memcached 
Increase max cache size to 2MB
 2018-07-27 12:33:40 +02:00
rgarcia
2995734762 Increase max cache size to 2MB 
We have lots of votes in this edition of participatory budgets and the
default cache size (1MB) is not enough to hold certain cache fragments
 2018-07-27 12:08:20 +02:00
Alberto
b5b35da708 Merge pull request #2807 from 16yuki0702/fix_issue_2783 
Fix active item on admin menu
 2018-07-27 11:51:29 +02:00
16yuki0702
c14fbf8540 Fixed misunderstanding 2018-07-27 16:34:00 +09:00
16yuki0702
57dbb0220a Fix active item on admin menu 2018-07-27 15:45:42 +09:00
Alberto
4be40b9e5d Merge pull request #2802 from consul/newsletter-delivery 
Newsletter delivery
 2018-07-26 18:20:50 +02:00
decabeza
69d67940d3 Removes unnecesary scope 2018-07-26 17:55:06 +02:00
decabeza
786a3949fd Moves moderate_system_email from private method 2018-07-26 17:55:06 +02:00
María Checa
9d580e15f5 Adds activity tab for system emails 2018-07-26 17:55:06 +02:00
María Checa
f1e7b634ba Adds moderate actions to proposal system notifications 2018-07-26 17:55:06 +02:00
María Checa
3cc8b1d123 Removes rake task to send proposal notifications 
This action will be performed manually by admin users from the `admin/system_emails` view.
 2018-07-26 17:55:06 +02:00
María Checa
eb8c021451 Adds button to send pending proposal notifications 2018-07-26 17:55:06 +02:00
decabeza
d58941ef9c Updates text on notifications spec 2018-07-26 17:55:06 +02:00
María Checa
7bddd97ed3 Adds validation of email present in valid_email? method 2018-07-26 17:55:06 +02:00
María Checa
b7a1599fdf Adds logic to send proposal notifications in batches 
WIP batches tests
 2018-07-26 17:55:06 +02: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
rgarcia
8960928a76 Skip invalid emails when sending newsletter 
We were seeing an exception when sending some emails due to having
invalid format

With this commit we are skipping this invalid formatted emails when
sending the newsletter
 2018-07-26 17:55:06 +02:00
rgarcia
3bc8fce5fa Process newsletters deliveries asynchronously 
We were seeing a timeout when queuing the 300.000+ emails to be
delivered

With this commit we are dealing asynchronously with this creations and
responding promptly, to avoid the web timeout of 30 seconds
 2018-07-26 17:55:06 +02:00
Alberto
420fe20deb Merge pull request #2804 from wairbut-m2c/backport-1541-fix_see_results_button 
Adds logic to show 'see results' button only for finished budgets
 2018-07-26 16:30:47 +02:00
Angel Perez
c240c57171 Add budget investment factory to fix failing scenario 
Changes introduced in commits 41f66fa and dc87b75 will render the
'See results' button under `admin/budget_investments` only if a
finished budget has winner investments associated with it
 2018-07-26 14:54:20 +02:00
María Checa
15a07ad4eb Adds logic to show 'see results' button only for finished budgets 2018-07-26 14:31:42 +02:00
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