consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,242 Commits 1 Branch 0 Tags
9694def11a94de68b1bed47e2dcee4fe14c65eb4
Commit Graph

15242 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Juan Salvador Pérez García
9eaa990145 Added default image for proposal dashboard mailing 2018-07-25 17:01:30 +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
Juan Salvador Pérez García
8876b285ce Fixes #229 
Adds email feature for proposals dashboard
 2018-07-25 13:28:44 +02:00
Juan Salvador Pérez García
9b83291b16 Merge pull request #241 from medialab-prado/issue_239 
Fixed #239
 2018-07-25 13:16:24 +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
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
Alberto
5e2f616800 Merge pull request #2782 from wairbut-m2c/backport-show-only-winner-investments-for-finished-budget 
Backport #1571: Add logic to show only winner investments if budget is finished
 2018-07-24 18:50:04 +02:00
decabeza
717b0c183b Fixes tags budget investments specs 2018-07-24 18:49:56 +02:00
decabeza
fa4c3de83c Fixes word wrap on document links 2018-07-24 18:32:34 +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
decabeza
b4f7f8e0f3 Fixes show investment's price & cost explanation spec 
Backport from AyuntamientoMadrid/consul
 2018-07-24 12:25:48 +02:00
decabeza
69ca2be994 Fixes budget investments filter by tag spec 
Backport from AyuntamientoMadrid/consul
 2018-07-24 12:25:19 +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
Juan Salvador Pérez García
0ea0a0031c Merge pull request #240 from medialab-prado/issue_238 
Fixes #238
 2018-07-24 11:29:14 +02:00
Juanjo Bazán
ffd4fb32f4 adds images to budget::investments 2018-07-24 11:22:15 +02:00
Juan Salvador Pérez García
a64bcc0c75 Attempt to build using 4 nodes 
Trying to fix the timeout issues when building with two nodes
 2018-07-24 07:06:17 +02:00
Alberto
ff9888d6fe Merge pull request #2780 from wairbut-m2c/fix/db_seed 
Remove deprecated `image` and `style` attributes when seeding the DB
 2018-07-23 18:26:41 +02:00
Angel Perez
10e755bffd Remove deprecated image and style attributes when seeding the DB 2018-07-23 11:56:08 -04: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
Juan Salvador Pérez García
3b37b4b09d Fixes #238 
Applies new card design for polls in proposals dashboard.
Fixes warnings during tests.
Adds tests for new card design for polls in proposals dashboard.
 2018-07-23 10:31:50 +02:00
Juan Salvador Pérez García
f632fa8b6e Merge pull request #237 from medialab-prado/issue_236 
Fixes #236
 2018-07-23 10:30:44 +02:00
Juan Salvador Pérez García
01846089d4 Fixes #236 
Addressed comments related to CSS and views.
 2018-07-23 07:25:22 +02:00
Juan Salvador Pérez García
4e808c7729 Merge pull request #235 from medialab-prado/issue_234 
Fixes #234
 2018-07-23 07:24:03 +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
1b37032125 Assume investments moderation I18n keys are used 2018-07-20 18:42:34 -04:00
Angel Perez
018de5a9f9 Add specs 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