consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,144 Commits 1 Branch 0 Tags
a6d470ded657ff18d11d25b901b63facbfae6eb1
Commit Graph

1277 Commits

Author SHA1 Message Date
Julian Herrero
9495208518 Make polls translatable 2018-09-20 17:07:43 +02:00
Marko Lovic
64d72ca8e7 Enable JS in shared translatable test 
Due to its markdown editor, the admin draft version page
requires JS to correctly render the draft version form.
 2018-09-19 14:54:24 +02:00
Marko Lovic
ee15295f54 Add migration for all collaborative legislation translations 2018-09-19 14:54:24 +02:00
Marko Lovic
0731b137cf Add both English and Spanish translations to Admin Notification seeds 2018-09-19 12:15:45 +02:00
Marko Lovic
f6749049c9 Make Admin Notifications translatable 2018-09-19 12:15:26 +02:00
Raimond Garcia
ea72cd058b Merge pull request #2876 from javierm/ckeditor4_update 
Ckeditor4 update
 2018-09-17 23:02:50 +02:00
Raimond Garcia
cae210c155 Merge pull request #2887 from wairbut-m2c/backport/db_queries 
[Backport] Replace `.all.each` with `.find_each` to reduce memory usage
 2018-09-17 19:06:46 +02:00
Javi Martín
9cfa07ff1d Remove unrelated schema changes 2018-09-12 12:35:28 +02:00
Javi Martín
43e83889ff Simplify CKEditor authorization 
We can use the `config.authorize_with` option, so we don't need to copy
the controller in order to load and authorize resource.

Besides, only administrators can upload images, so we don't need to
track the image's user id.
 2018-09-12 12:35:28 +02:00
Javi Martín
7347874f4b Remove inaccurate comment 
It was automatically added by `rails g ckeditor:install`.
 2018-09-12 12:35:28 +02:00
Raúl Fuentes
d574657b77 Fixes for the review made by @javierm 
this commit will be merged with the others when the chages
are accepted
 2018-09-12 12:35:28 +02:00
Raúl Fuentes
424535c1ae Add models needed to include images on ckeditor4 2018-09-12 12:35:28 +02:00
Marko Lovic
c7fcdd9b0e Use standard locale names for Globalize 
It turns out it is not necessary to downcase and underscore
locale names to use the globalize-accessor gem. The gem
will automatically underscore the locale name when defining and
calling the accessor methods.
 2018-09-11 18:48:14 +02:00
Angel Perez
b6fe7ca9a7 Replace .all.each with .find_each when seeding the DB 2018-09-10 11:39:38 -04:00
Raimond Garcia
4f2ed27f8c Merge pull request #2865 from consul/backport_1585-make_banners_translatable 
[Backport] Make banners translatable
 2018-09-10 16:41:33 +02:00
Marko Lovic
0fa4b60f39 Make Banners translatable 2018-08-30 16:29:29 +02:00
Angel Perez
3dd525f9b9 Remove Madrid-specific DB attribute from Legislation::Proposal seeds 2018-08-06 10:14:49 -04:00
Angel Perez
f568f9baab Add Legislation::Proposal seeds 2018-08-06 09:39:17 -04: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
Raimond Garcia
2c79197a05 Merge pull request #2809 from wairbut-m2c/backport/translatable-content-for-admin 
Basic content for I18n on Admin panel
 2018-07-27 18:01:00 +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
Alberto
fb19aafee7 Merge pull request #2778 from wairbut-m2c/backport/investments-moderation 
Allow budget investments to be moderated
 2018-07-27 12:34:17 +02:00
Raúl Fuentes
6d6dc32c38 Complete basic I18n backend and frontend 2018-07-26 19:06:19 -04: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
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
Angel Perez
335f78ae24 Migrate DB to add moderation attrs to budget_investments table 2018-07-20 18:02:37 -04: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