Ziyan Junaideen
ffe7465b86
Spec adjustments
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
9bad639bb5
i18n usage - typo + sub navigation using new keys
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
a6bbf32b8e
Content blocks - new keys
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
a37b64dfb6
i18n desc for content block known keys + use in select in form
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
494493214c
Revert "Hiding help if there is a left/right content block"
...
This reverts commit 6eeb7bfdaef9d370892fe0cc03635b45b29e2036.
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
33c1aaeb71
Content blocks spec
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
4ee2c20253
Hiding help if there is a left/right content block
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
7fb4d10989
Not showing top links if content block exist
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
5b6a6b5324
Changed keys for locations
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
1c818850d2
Content blocks for navigation
2018-07-26 22:55:49 +05:30
Ziyan Junaideen
b95aa5d912
Sub nav content positions
2018-07-26 22:55:49 +05:30
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
