consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,282 Commits 1 Branch 0 Tags
dcad390933e0ab79a41091d82562ff3c93d9f45c
Commit Graph

16282 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
taitus
4bb194e1cc Recover rake "settings:rename_setting_keys" 
We need to add :rename_setting_keys before :add_new_settings task.
This way the value of the old key will not be lost.
 2020-02-19 16:14:44 +01:00
taitus
162462fc32 Use en-GB locale when current locale is not include in application.js 
When a current locale is not defined on applicaton.js, datepicker load
the last jquery-ui/i18n/datepicker-xx defined.
Add 'jquery-ui/i18n/datepicker-en-GB' as last "require" to use when a current locale is not defined.
 2020-02-19 15:58:55 +01:00
taitus
11cdcb72ef Add the rest of the languages available in "available_locales" 
Of all the available locales on application.rb, the only ones that do not
have a correspondence with:
https://github.com/jquery/jquery-ui/tree/master/ui/i18n are [:so, :val]
 2020-02-18 17:57:21 +01:00
Alceu Medeiros
6c3509fbf5 Add datepicker translations to available locales 2020-02-18 17:42:46 +01:00
Javier Martín
36eb2f8eda Merge pull request #3921 from edumoreira1506/fix/card-description 
Fix card description overflow
 2020-02-18 14:47:45 +01:00
Julian Nicolas Herrero
377c24f49b Merge pull request #3063 from microweb10/poll_question_answer_update_spec 
Check for missing feature specs for Poll::Question::Answer
 2020-02-18 19:38:49 +07:00
Eduardo Moreira
9f948c150b Fix card description overflow 2020-02-18 09:36:19 -03:00
Julian Nicolas Herrero
4e906b2af8 Merge pull request #3912 from consul/refactor_editing_budget_investments 
Refactor editing budget investments
 2020-02-18 19:21:28 +07:00
Julian Herrero
4c5dc297b4 Show edit and delete investments buttons differently 
In most of the rest of the application the buttons are shown in this
way, we do this little adjustment to improve the consistency with the
rest of the application
 2020-02-18 13:49:31 +07:00
Julian Herrero
65e841e44e Show edit button instead of remove image on accepting phase 
Since now it's possible to edit the budget investment during the
accepting phase, it does not really make sense to show the button to
just remove the image when the investment project can be fully edited,
and the image can be removed from the editing form.
 2020-02-18 13:49:28 +07:00
taitus
b9792241ca Allow always send forward email 
The new key only block notifications emails from Dashboard::Mailer.
Fix specs.
 2020-02-17 16:30:38 +01:00
taitus
5608424510 Rename all ocurrences from this Setting to new key 2020-02-17 16:30:38 +01:00
taitus
45aec05b93 Update and rename Setting as feature type 
The old Setting["dashboard.emails"] is a Feature Setting, but appeared as
Configuration Setting without button for enable/disable.
In this commit, we update the old setting to behave like a Feature Setting.
Too we rename setting to clarify what emails are blocked with this feature.
 2020-02-17 16:30:38 +01:00
Javier Martín
4f5d49561e Merge pull request #3915 from consul/polls_menu 
Fix Polls link in admin menu
 2020-02-17 14:47:54 +01:00
Julian Nicolas Herrero
2b69812233 Merge pull request #3919 from consul/select_admins_and_valuators_indentation 
Align select admins and valuators with the rest of the form
 2020-02-13 18:45:41 +07:00
Julian Herrero
bdb12ef63e Align select admins and valuators with the rest of the form 2020-02-13 15:29:30 +07:00
Javier Martín
7af932375f Merge pull request #3916 from consul/without_filters 
Fix filters for investments without admin/valuator
 2020-02-07 14:35:00 +01:00
Javier Martín
7f19b16478 Merge pull request #3902 from consul/wordpress_login 
Enable Wordpress Oauth login and registration
 2020-02-07 14:23:00 +01:00
Julian Herrero
193e51d42f Enable Wordpress Oauth login and registration 2020-02-07 12:23:41 +07:00
Javier Martín
9ada2ccb94 Merge pull request #3914 from rockandror/retired-form 
Improve retired proposal page when translation interface is enabled.
 2020-02-06 17:10:31 +01:00
Javi Martín
f223b3945f Fix filters for investments without admin/valuator 
These filters were only returning investments with valuation open, but
we don't want to do that since the time we changed the interface in
order to allow users to apply several filters at the same time.
 2020-02-06 14:33:36 +01:00
Javi Martín
00484fe5f7 Fix Polls link in admin menu 
The link was marked as active and hidden by foundation when we were in
the "Booths Assignments" section.
 2020-02-05 22:16:16 +01:00
Javier Martín
2b87b9ed19 Merge pull request #3910 from rockandror/improve-dates 
Force dateFormat on datepicker
 2020-02-05 21:12:05 +01:00
Javier Martín
7b76e0bed2 Merge pull request #3913 from consul/cache_image 
Expire investment cache when its image changes
 2020-02-05 21:04:55 +01:00
taitus
14c38a2615 Force dateFormat to dd/mm/yyyy for all locales 
To maintain consistency and the use of advanced search in the frontend,
we forced the expected date format for all languages. This is a temporary
solution that we should analyze in depth to allow different date formats
depending on the language in the filters.
 2020-02-05 09:27:10 +01:00
Javi Martín
98c212f271 Expire investment cache when its image changes 
We've added the option to remove an image from an investment. However,
removing the image did not expire the cache, so the rendered HTML still
included an `<image>` tag (which wouldn't show an image, since it had
been deleded) and a link to remove an image.
 2020-02-04 14:51:40 +01:00
Julian Herrero
a24524298a extract budget investment's author actions to a partial 2020-02-04 13:39:09 +07:00
taitus
83a703608f Fix styles when translation interface is enabled. 2020-02-03 17:59:22 +01:00
Javier Martín
9bbed55d20 Merge pull request #3840 from consul/omniauth_csrf 
Add CSRF protection to Omniauth requests
 2020-01-28 12:52:17 +01:00
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