consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,253 Commits 1 Branch 0 Tags
93cf9e22c3ed389ee8800be09dfb59c06a2a760c
Commit Graph

15253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Javier Martín
a3a7a07ea4 Merge pull request #3904 from consul/audit_and_globalize 
Don't audit Globalize data migrations
 2020-01-21 14:29:57 +01:00
Javi Martín
3b2d4820cc Don't audit Globalize data migrations 
There's a conflict between the data migrations Globalize uses and the
audited configuration. Since Globalize uses the model to run the
migrations, it might try to run code that wasn't available when the
migration was created.

In this case, when migrating data it tries to audit the translations
table for budget investments. However, the migration creating the table
for audits hasn't been run at this point, since it was added after the
migration to add translations to investments was.

On the other hand, this data migration isn't really a change in the
model attibutes, so it shouldn't be audited anyway.

So we're disabling auditing during the migration in order to avoid these
issues.
 2020-01-20 17:04:04 +01:00
Javier Martín
a5105b93f1 Merge pull request #3886 from consul/dependabot/bundler/foundation-rails-6.6.1.0 
Bump foundation-rails from 6.4.3.0 to 6.6.1.0
 2020-01-20 16:51:24 +01:00
Julian Herrero
6d6f173713 Remove duplicated tests 
These scenarios were already tested in
spec/features/admin/poll/questions/answers/answers_spec.rb
 2020-01-19 12:34:16 +07:00
Julian Herrero
925964f5bb Remove duplicated test 
This scenario was already tested in
spec/features/admin/poll/questions/answers/videos/videos_spec.rb
 2020-01-19 12:34:09 +07:00
Julian Herrero
cf1f688d38 Move Poll::Question::Answer images tests to the right place 2020-01-19 12:24:04 +07:00
decabeza
d163dee242 Fix menu styles 2020-01-18 11:10:11 +01:00
dependabot-preview[bot]
58071fd66b Bump foundation-rails from 6.4.3.0 to 6.6.1.0 
Bumps [foundation-rails](https://get.foundation) from 6.4.3.0 to 6.6.1.0.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-18 10:09:00 +00:00
Alberto
34c75fec4b Merge pull request #3606 from consul/fontawesome 
Add Font Awesome icons
 2020-01-18 11:07:03 +01:00
Javier Martín
4653841284 Merge pull request #3901 from consul/fix_ckeditor_upload_tab 
Fix uploading images through CKEditor's upload tab
 2020-01-17 22:17:07 +01:00
Javi Martín
d19abd7ddb Fix uploading images through CKEditor's upload tab 
The bug was introduced when we upgraded the ckeditor gem in commit
f240e007.
 2020-01-17 21:52:21 +01:00
Javier Martín
3bdbbed430 Merge pull request #3890 from consul/dependabot/bundler/rack-2.0.8 
[Security] Bump rack from 2.0.7 to 2.0.8
 2020-01-17 17:19:54 +01:00
dependabot-preview[bot]
81883ad89d [Security] Bump rack from 2.0.7 to 2.0.8 
Bumps [rack](https://github.com/rack/rack) from 2.0.7 to 2.0.8. **This update includes a security fix.**
- [Release notes](https://github.com/rack/rack/releases)
- [Changelog](https://github.com/rack/rack/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rack/rack/compare/2.0.7...2.0.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-17 15:46:48 +00:00
Javier Martín
bae999299a Merge pull request #3900 from consul/fix_ckeditor_validation_error 
Fix style for validation errors in HTML areas
 2020-01-17 16:41:41 +01:00
Javier Martín
29d10ef8d4 Merge pull request #3823 from consul/contributing 
Update contributing guidelines
 2020-01-17 16:19:29 +01:00
Javier Martín
50c830a55f Merge pull request #3830 from PierreMesure/fixes-pagination-bug-on-mobile 
Fix pagination problem on mobile
 2020-01-17 16:12:21 +01:00
Javier Martín
ad77b67060 Merge pull request #3894 from ArturT/knapsack-pro-badge 
Add Knapsack Pro badge
 2020-01-17 15:10:20 +01:00
Javi Martín
dc485b0ac6 Fix style for validation errors in HTML areas 
Rails automatically adds the field class to the validation error
message, and so it had an unusual height.
 2020-01-09 20:33:11 +01:00
Artur Trzop
4795705726 Update knapsack pro badge code 2020-01-05 20:50:52 +01:00
Julian Nicolas Herrero
00d023a18d Merge pull request #3891 from consul/sitemap_skip_disabled_processes 
Don't include disabled processes in sitemap
 2019-12-24 11:48:16 +07:00
Artur Trzop
96f590bde3 Add Knapsack Pro badge 2019-12-23 19:40:47 +01:00
Javier Martín
dadd921730 Merge pull request #3854 from PierreMesure/fix-a-css-leak 
Fix a tiny CSS leak
 2019-12-20 15:23:22 +01:00
Pierre Mesure
1431a8379c Fix a CSS leak 2019-12-19 23:34:31 +01:00
Javier Martín
3e0cada45d Merge pull request #3778 from consul/fix_equalizer_investments 
Fix blank space in admin content
 2019-12-19 16:27:01 +01:00
Javi Martín
42106e6601 Fix double scroll bar in admin content 
We were using `overflow: scroll` as a workaround with a problem we had
with the equalizer. But now we never need an extra vertical scroll bar,
and we only need an extra horizontal scroll bar on small screens.

Since the dashboard was using the class `admin-content` as well, we need
to apply to the dashboard the same changes we've done in the admin
section. I've extracted them into a mixin.
 2019-12-19 16:02:31 +01:00
Javi Martín
91d4624443 Simplify admin side menu layout 
We can move the button to toggle the menu to the main content, and
everything will look the same way while we'll need one div less.
 2019-12-19 16:02:31 +01:00
Javi Martín
f2e32b44b1 Fix blank space in admin content 
In some situations where JavaScript makes content disappear, the height
of the element calculated by foundation's equalizer isn't recalculated,
leaving blank space at the bottom of the page. I've seen cases where a
blank vertical space of 2000 pixels is on the page.

Using flexbox solves the problem, since CSS takes care of everything.
 2019-12-19 16:02:31 +01:00
Javier Martín
309c86bed7 Merge pull request #3883 from rockandror/i18n_crowdin 
Update translations from Crowdin
 2019-12-19 14:29:19 +01:00
Julian Herrero
6e00842b0e Don't include disabled processes in sitemap 2019-12-19 13:26:29 +07:00
Senén Rodero Rodríguez
5fa02f604b Fix specs after new Deutsch translations 
New deutsch translations of remote translations
interface have broke these specs where we were
using English translations at specs to do the checks
while the spec interface was in deutsch and now we
have deutsch translations for the interface application
is not returning english fallbacks anymore and a lot of
specs of this file fails.

This commits also changes the alternative language
used at spec from deutsch to spanish which is
maintaned by code not through Crowdin, so if any
developer update current spanish translations for the
user interface this specs will fail.
 2019-12-18 16:50:48 +01:00
Senén Rodero Rodríguez
7ceb42e858 Update translations from Crowdin 2019-12-18 16:50:48 +01:00
Javier Martín
fcd6b07c55 Merge pull request #3887 from rockandror/remove-comments-from-translations-files 
Remove comments from `en/rails.yml` files
 2019-12-17 21:49:31 +01:00
Senén Rodero Rodríguez
30b3309f0b Remove comments from en/rails.yml files 
These comments are not updated with current consul locale files
configuration and Crowdin is adding those comments to all other
existing locales.
 2019-12-17 15:35:48 +01:00
Javier Martín
3bbd63e549 Merge pull request #3871 from consul/smtp_symbols 
Use symbols instead of strings for SMTP settings
 2019-12-11 18:33:55 +01:00
Javier Martín
9a6187dd2f Merge pull request #3876 from consul/dependabot/bundler/puma-4.3.1 
[Security] Bump puma from 4.3.0 to 4.3.1
 2019-12-10 22:36:05 +01:00
Javier Martín
f808af0abe Merge pull request #3874 from rockandror/sanitize-descriptions-on-remote-translations 
Sanitize values before sending them to remote translation client
 2019-12-10 21:46:21 +01:00
Javier Martín
e70755b680 Merge pull request #3880 from rockandror/remove-incorrect-translations-from-american-english 
Remove translations accidentally added from en-US
 2019-12-09 19:20:25 +01:00
Senén Rodero Rodríguez
a18d9108de Remove translations accidentally added 
Remove them from repo so Crowdin stops to automatically re-adding
 2019-12-09 17:40:06 +01:00
dependabot-preview[bot]
a1d8dd0966 [Security] Bump puma from 4.3.0 to 4.3.1 
Bumps [puma](https://github.com/puma/puma) from 4.3.0 to 4.3.1. **This update includes a security fix.**
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v4.3.0...v4.3.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-05 19:39:57 +00:00
taitus
d1c9df5f91 Sanitize resource fields values 
Sanitize resource fields values from ddbb before send
to remote translate client.
 2019-12-04 17:03:57 +01:00
Javier Martín
f9ee34557d Merge pull request #3873 from consul/bump_knapsack_pro 
Bump knapsack_pro from 1.1.0 to 1.15.0
 2019-12-04 13:44:22 +01:00
Javi Martín
92ea3c3d43 Bump knapsack_pro from 1.1.0 to 1.15.0 2019-12-03 14:11:19 +01:00
Javi Martín
1910115469 Use symbols instead of strings for SMTP settings 
ActionMailer does differenciate between symbols and strings, and the
code stringifying keys comes from an early version which we forgot to
remove.
 2019-12-01 20:30:45 +01:00
Javi Martín
c4ebea27a7 Add CSRF protection to Omniauth requests 
More info:

https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-9284
https://github.com/omniauth/omniauth/wiki/Resolving-CVE-2015-9284
 2019-11-29 03:18:53 +01:00
Javier Martín
11adacfdb9 Merge pull request #3870 from rockandror/update-secrets-example 
Add smtp settings for staging environment on secrets
 2019-11-26 17:44:12 +01:00
taitus
0025fcb43e Update secrets.yml.example 
Add smtp settings for staging environment
 2019-11-26 16:52:46 +01:00
Javier Martín
24359294e4 Merge pull request #3868 from andrewcameronsims/legislation_categories_persist 
Fix categories being removed when a legislation process is changed
 2019-11-25 13:19:45 +01:00
Andrew Sims
5d3748d863 Bugfix: categories are shown on process update 
These changes fix a bug that causes categories
of a legislation process to be wiped on update
of the process. It also adds a regression test
for this fix.
 2019-11-25 18:45:53 +11:00
Javier Martín
c3d0e2b917 Merge pull request #3866 from consul/releasing_new_version 
Make it easier to release a new version of CONSUL
 2019-11-23 16:33:41 +01:00
Javi Martín
96be43ae86 Don't generate authors in the CHANGELOG 
We were removing the authors manually after they were generated.
 2019-11-23 14:15:48 +01:00