Commit Graph

909 Commits

Author SHA1 Message Date
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
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
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
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
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