consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,436 Commits 1 Branch 0 Tags
f695a7faf39b72118477a591c9400fb5941e2d65
Commit Graph

9436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Juanjo Bazán
ffd4fb32f4 adds images to budget::investments 2018-07-24 11:22:15 +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
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
decabeza
7533ce21ab Unifies spanish investment projects i18n 2018-07-20 18:50:19 +02:00
decabeza
e101458891 Removes custom content on seeds 2018-07-20 18:49:54 +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
Alberto
bed97347a9 Merge pull request #2762 from wairbut-m2c/backport_1208-flaky-already-voted-on-booth-cannot-vote-on-website 
Backport Flaky spec: Polls Booth & Website Already voted on booth cannot vote on website
 2018-07-20 13:17:24 +02:00
María Checa
eccf7de54c Update version number for consul.json 2018-07-20 12:54:51 +02:00
María Checa
e34f001fad Update changelog for release v0.16 2018-07-20 12:54:49 +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
2366182689 Fix specs 2018-07-20 12:28:56 +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
rgarcia
0f287ec78d Regenerate knapsack report 
This report is used to distribute specs across Travis’ build matrix
 2018-07-18 23:36:55 +02:00
Alberto
3c517462e4 Merge pull request #2760 from wairbut-m2c/backport/user-recommendations 
Debates and proposals recommendations for users
 2018-07-16 13:54:54 +02:00
Raimond Garcia
f2c780fac6 Merge pull request #2768 from AuiDrome/add_proposal_images_on_dev_seeds 
add proposal image on dev_seeds task
 2018-07-16 10:35:55 +02:00
Fernando Garcia Samblas
0cf26b8770 remove add_images_to argument spaces 
Sorry, at work we have a co-worker (@rochgs) that thanks this "spaced" style
because of his visual handicap. Here you are!! ;)
 2018-07-16 08:48:24 +02:00
Angel Perez
1884841ffc Add Rake task to enable recommendations settings 2018-07-15 21:28:59 -04:00
Angel Perez
10efcb2029 Change I18n strings for warning when dismissing recommendations 2018-07-15 21:28:59 -04:00
Angel Perez
e194240a0a Add rake task to enable recommendations for existing users 2018-07-15 21:28:59 -04:00
Angel Perez
31c16406c0 Move disable recommendations permissions to Abilities::Common model 2018-07-15 21:28:58 -04:00
Angel Perez
54853745f0 Fix typos for Settings locales (English) 2018-07-15 21:28:58 -04:00
Angel Perez
a143fa447b Ensure recommendations are only shown when enabled 2018-07-15 21:28:58 -04:00
Angel Perez
463c753880 Recommendations are automatically disabled if dismissed by user 2018-07-15 21:28:58 -04:00
Angel Perez
0b7967440f Recommendations for users are enabled by default 2018-07-15 21:28:58 -04:00
decabeza
137078054e Fixes padding bottom on recommended index 2018-07-15 21:28:58 -04:00
decabeza
8cbc709601 Fixes margin top on recommended index 2018-07-15 21:28:58 -04:00