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

855 Commits

Author SHA1 Message Date
Juan Salvador Pérez García
488e7e081f Merge branch 'dashboard' into rebase_consul_master 2018-09-27 09:18:27 +02:00
Juan Salvador Pérez García
6cc1ddb9af Fixes #231 
Implements a poster feature for the proposals dashboard
 2018-07-31 12:50:25 +02:00
Juan Salvador Pérez García
50f73abb0c Fixes #voodoorai2000 comments 
Fixes some comments from #voodoorai2000 for the PR to consul
 2018-07-27 16:30:03 +02:00
Bertocq
a883e842ba Make admin notifications seed data translatable 2018-07-25 18:35:34 +02:00
Bertocq
2aa4b5cad6 Add AdminNotification seed data 2018-07-25 18:34:33 +02:00
Bertocq
b556fe9000 Create AdminNotification database table 2018-07-25 18:29:10 +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
e5f9cf6710 Fixed #239 
Proposals dashboard refactored to dashboard.
Added missing specs for the dashboard.
 2018-07-24 15:52:43 +02:00
Juanjo Bazán
ffd4fb32f4 adds images to budget::investments 2018-07-24 11:22:15 +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
decabeza
e101458891 Removes custom content on seeds 2018-07-20 18:49:54 +02:00
Juan Salvador Pérez García
ea421980b5 Rebased to upstream/master 2018-07-17 19:34:58 +02:00
Juan Salvador Pérez García
dc4945f1aa Fixed missing seed initialization 
Fixed missing setting initialization in seeds.rb
 2018-07-17 17:59:11 +02:00
Juan Salvador Pérez García
a872c5b5df Fixes #200 
Adds settings to complete the polls card and feature view.
 2018-07-17 17:59:11 +02:00
Juan Salvador Pérez García
6e75f5b494 Fixes #140 
Adds a new setting that allows defining what is considered a successful
proposal.
 2018-07-17 17:59:11 +02:00
Juan Salvador Pérez García
3c3f60dfcc Implements #173 
Public view for suggested actions as well as resources has been
completelly redesigned.

Private side for this feature has been adapted as well in order to meet
the requirements.
 2018-07-17 17:58:22 +02:00
Juan Salvador Pérez García
2ce9f95283 Polls in the dashboard 
A reduced version of polls has been added to the dashboard
 2018-07-17 17:57:30 +02:00
Juan Salvador Pérez García
8bb3d5b3ab frozen_string_literal removed 
frozen_string_literal magic comment has been removed until a decission
is taken regarding to its convenience.
 2018-07-17 17:53:18 +02:00
Juan Salvador Pérez García
33b3431c70 Implements #150 
Adds an entry inside moderation section that allows moderators to check
pending tasks and mark them as solved.
 2018-07-17 17:52:47 +02:00
Juan Salvador Pérez García
83f78b1940 Fixes #135 
Adds a table with proposed actions in the dashboard. The user can mark
an action as executed.
 2018-07-17 17:51:13 +02:00
Juan Salvador Pérez García
e4e0cb65de Implements #142 
Dashboard actions can be proposed actions or resources
 2018-07-17 17:50:05 +02:00
Juan Salvador Pérez García
1464bddfa8 Fixes #134 
Adds an administration interface for the proposal dashboard actions.
 2018-07-17 17:48:46 +02:00
Juan Salvador Pérez García
1db5a00eae Prepare capistrano/db migrations to support more setups (#2) 
The following parameters have been added to deploy-secrets.yml:

* **use_rvm**: yes/no
* **ruby_version**: Ruby version for rvm. Defaults to 2.3.2
* **repository**: Git repository. Defaults to the oficial repository
* **branch**: Branch to deploy. Defaults to master
* **rails_env**: Defaults to the stage.

Fixed migrations that required admin rights. Now first check if the postgress extensions are available. If so finish without doing nothin.

Added support for passenger.
 2018-07-17 17:46:54 +02:00
Juan Salvador Pérez García
77dd60427d Implements story #136 
Adds draft state for proposals
 2018-07-17 17:46:54 +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
0b7967440f Recommendations for users are enabled by default 2018-07-15 21:28:58 -04:00
Angel Perez
fefa225f8a Add new settings for dev seeds for Debates and Proposals recommendations 2018-07-15 21:28:57 -04:00
Angel Perez
a58f6a2662 Enable 'Recommended proposals' setting for users 2018-07-15 21:28:57 -04:00
Angel Perez
522c206f6d Enable 'Recommended debates' setting for users 2018-07-15 21:28:57 -04:00
decabeza
bdb3f30e40 Adds recommendations on proposals index 2018-07-15 21:28:57 -04:00
decabeza
36a5ff39b8 Adds recommendations on debates index 2018-07-15 21:28:57 -04:00
Fernando Garcia Samblas
ffbd4a08d8 add proposal image on dev_seeds task 2018-07-16 01:33:25 +02:00
iagirre
3dcd7886d7 Add migration to delete the image and styles from banners, in order to use background_color and font_color 2018-07-13 12:08:39 -04:00
iagirre
0d9da5398b Fix banners in user pages 
Banners were not been shown in certain pages; now
they are.

Spec to check if the banner is been shown correctly
added. Before it was in admins specs, now it has it's
own spec out of admins folder.
 2018-07-12 10:17:25 -04:00
iagirre
5ce08532cb Update PR with master 
Rebase master branch so that this PR can
be updated with the latest changes.
Conflicts has been solved. dev_seeds
has been also adapted to the new format
(it all separated to be easier to manage).
Some specs has been updated to work with
selenium-webkit.
 2018-07-12 10:17:25 -04:00
iagirre
5d1b06a3cb New and fresh DB schema 2018-07-12 10:16:48 -04:00
iagirre
3690cae458 Apply banner style to the new banners 
Banner sections can be saved (one banner can appear in several sections)
If the hex color is changed in the textfield, the color of the color picker changes.
 2018-07-12 10:16:47 -04:00
iagirre
6d6da8affc Add form fields to set the colours and the sections for the banner 
Add migrations to store the information in the database
 2018-07-12 10:16:47 -04: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
María Checa
7deded142f Add Budget::Investment::Status migration 2018-06-27 18:19:22 +02:00
María Checa
9eefcafcfb Add Budget::Investment::Status to dev_seeds 2018-06-27 16:49:27 +02:00
María Checa
28bb32a085 Add Budget::Investment::Status migration 2018-06-27 16:44:40 +02:00
decabeza
c710e31b4a Replaces header and debates images 2018-06-22 18:00:39 +02:00
Pierre Mesure
1ebcf04186 Adding images and seeds for the homepage 2018-06-15 14:26:29 +02:00
rgarcia
b672a4550d Add option to configure feed items displayed in homepage 2018-05-29 19:58:04 +02:00
rgarcia
7c17eea6a3 Refactor widget feed from activemodel to activecord 2018-05-29 18:26:20 +02:00
rgarcia
ad181b0e10 Add label to cards 
Also removes unused fields related to buttons and alignment
 2018-05-28 18:17:26 +02:00