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

9274 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
iagirre
f58bc5d886 Add the menu entry for prop. notifications 
A new menu for the sidebar has been added, so that the moderator
can access to the index from the menu.
 2018-07-02 18:17:56 +02:00
iagirre
21b1d00205 Add backend for the moderators 
Add new routes for the proposal notifications edition and
abilities to let moderators edit it (mark as ignored, hide, etc.).

The notifications are not flaggable because they doesn't work like that,
but in a similar way. The moderator/administrator is in charge of hidding
them through the UI, so the normal users don't flag it as inappropriate.

New controller Moderation::ProposalNotification to manage the moderators
work.
 2018-07-02 18:17:45 +02:00
iagirre
7982574993 Add migration to generate new columns 
The migration to generate the columns needed for the feature.
There are three new columns:

moderated: a boolean that, when true, it means a moderator has
hidden a proposal notification. The notification is hidden immediately
and it's shown in the moderators proposal notifications index.

hidden_at: used by acts_as_paranoid to hide the notification from the list.
It's like deleting it, but without deleting definitely from DB.

ignored_at: used to mark as a notification as ignored, so that it will
appear in marked as reviewed and not in the pending list. WARNING! this
doesn't mean that it will disappear from the 'All' filter.
 2018-07-02 18:06:19 +02:00
Alberto
cd15e3f23a Merge pull request #2706 from consul/milestone_status 
Investment milestone's project status
 2018-06-28 11:34:06 +02:00
decabeza
d683a6cd6b Adds styles to budget investment milestone status and fixes spec 2018-06-27 19:28:43 +02:00
María Checa
fb5b993920 Add Budget::Investment::Statuses tests 2018-06-27 18:34:02 +02:00
María Checa
a4cda8a9f6 Add new translations 2018-06-27 18:32:54 +02:00
María Checa
7ef77f55a4 Change public investment milestones timeline 2018-06-27 18:31:54 +02:00
María Checa
a5d0c2f6c8 Changed Budget::Investment::Milestone views 2018-06-27 18:23:34 +02:00
María Checa
551e2bb1c4 Changed Budget::Investment::Milestones model 
Added relation with Status and set condition to validate milestone's description presence if there's no status set.
 2018-06-27 18:19:33 +02:00
María Checa
29dadc91ac Change Budget::Investment::Milestones controller 
Added `:status_id` to valid params and new method to get all statuses defined for the budget.
 2018-06-27 18:19:29 +02:00
María Checa
7deded142f Add Budget::Investment::Status migration 2018-06-27 18:19:22 +02:00
Alberto
3e7a53b2c7 Merge pull request #2705 from consul/budget_statuses 
Budget statuses
 2018-06-27 18:18:13 +02:00
María Checa
9eefcafcfb Add Budget::Investment::Status to dev_seeds 2018-06-27 16:49:27 +02:00
María Checa
e8e9fcd0da Add Budget::Investment::Statuses tests 2018-06-27 16:45:58 +02:00
María Checa
564d1b32e2 Add new translations 2018-06-27 16:45:53 +02:00
María Checa
3a163b39c8 Add Budget::Investment::Statuses views 2018-06-27 16:45:44 +02:00
María Checa
2cb59260e9 Add Budget::Investment::Statuses controller and routes 2018-06-27 16:44:58 +02:00
María Checa
87b13bab72 Add Budget::Investment::Statuses model 2018-06-27 16:44:48 +02:00
María Checa
28bb32a085 Add Budget::Investment::Status migration 2018-06-27 16:44:40 +02:00
Alberto
6ec11371a3 Merge pull request #2702 from consul/fix_valuation_heading_filters 
Fix valuation heading filters
 2018-06-27 16:43:25 +02:00
Bertocq
4329fab627 Group Index scenarios at Valuation Investments spec 
Grouping scenarios makes it easier to follow the spec and to know where
to put a new scenario
 2018-06-27 14:34:28 +02:00
Bertocq
3e75bd4dfd Fix Valuation Investment index heading filters 
Why:

Heading filter where not being correctly displayed

How:

Increasing scenario to cover all possible combinations, and fixing the
heading_filters method of the Valuation Budget Investment Controller to
correctly:
  * Find how many investments the valuator can access
  * Count investments for each heading
 2018-06-27 14:30:09 +02:00
Alberto
06831f4fc9 Merge pull request #2699 from consul/polls-concerns-behaves-like-notifiable-in-app 
Flaky spec: Polls Concerns behaves like notifiable in-app Multiple users commented on my notifiable
 2018-06-27 14:02:19 +02:00
Raimond Garcia
1411e8c52a Merge pull request #2701 from consul/gemfile 
Regenerate Gemfile.lock
 2018-06-27 13:34:45 +02:00
rgarcia
0117a8257b Regenerate Gemfile.lock 2018-06-27 13:07:52 +02:00
iagirre
271c1595ba Changed the way the notifications page is accessed. Instead of doing it through UI, after the notifications are created the test goes directly to the notifications page (after login in the user). To check if the notification icon is correctly shown, a new test has been created that only does that. 2018-06-26 17:35:42 +02:00
Alberto
24e4f027b1 Merge pull request #2694 from consul/homepage-design 
Homepage design
 2018-06-22 18:40:20 +02:00
decabeza
de6d919ff0 Fixes scss lint warning 2018-06-22 18:01:39 +02:00
decabeza
6477983a85 Adds card hover effect 2018-06-22 18:01:28 +02:00
decabeza
79eea245a4 Adds gradient overlapping card image 2018-06-22 18:01:12 +02:00
decabeza
c710e31b4a Replaces header and debates images 2018-06-22 18:00:39 +02:00
Alberto
5bada5bde6 Merge pull request #2692 from consul/admin-menu-toggle 
Fixes admin menu toggle
 2018-06-22 17:34:23 +02:00
Alberto
63f0a95f2b Merge pull request #2693 from consul/homepage-cards 
Homepage cards
 2018-06-22 17:23:46 +02:00
Alberto
6133afa4ab Merge pull request #2679 from PierreMesure/2667-Create-dev-seeds-to-homepage 
Adding homepage header and cards seeds
 2018-06-22 16:49:07 +02:00
decabeza
5afe255c1b Adds data-equalizer to fix height on homepage cards 2018-06-22 14:02:51 +02:00
decabeza
804fabdc25 Fixes admin menu toggle 2018-06-22 13:56:25 +02:00
Pierre Mesure
1ebcf04186 Adding images and seeds for the homepage 2018-06-15 14:26:29 +02:00
rgarcia
a8178a6ca8 Fix specs 2018-06-12 15:11:06 +02:00
Raimond Garcia
399cc5ad06 Merge pull request #2653 from aamarill/fix-2644-split-spec-helpers 
Split spec common actions support helper
 2018-06-12 15:09:40 +02:00
Raimond Garcia
e93b8a5e8f Merge branch 'master' into fix-2644-split-spec-helpers 2018-06-12 14:26:26 +02:00
Alberto
09bcf81ded Merge pull request #2666 from consul/admin-ui 
Admin UI
 2018-06-11 17:23:08 +02:00
decabeza
56ee33d947 Removes content pending to backport 2018-06-08 19:46:07 +02:00
decabeza
85efdfbf47 Restores removed columns 2018-06-08 19:00:21 +02:00
rgarcia
3e330193d4 Fix select investment specs 
The select button seems to be outside the window. Removing some columns
to make the select button visible by capybara

This is just a temporary fix, we have to find a better solution.
Playing with the css to find an appropriate length for the table
containing this select button, is probably the way to go
 2018-06-08 18:59:57 +02:00
decabeza
55097ac643 Updates specs for show to valuators checkbox 2018-06-08 18:59:53 +02:00
decabeza
43b75b8356 Updates texts on admin legislation specs 2018-06-08 18:49:19 +02:00
decabeza
0858b3103a Shows always show to valuators on investments table 2018-06-08 18:48:58 +02:00
decabeza
4fca07172c Reorders and improve i18n for legislation processes form 2018-06-08 18:45:52 +02:00
decabeza
573a7e7c13 Moves content blocks info to index view 2018-06-08 18:45:45 +02:00