Dany Marcoux
a751d24562
Run bundler install in parallel with the amount of available CPUs
2020-06-07 23:32:50 +02:00
Dany Marcoux
6c564dc7b2
Shallow clone specific release for rbenv and ruby-build
...
We don't need the whole git history, so doing a shallow clone is
favourable. Cloning a specific release (the latest at the time of
writing this) allows us to have reproducible results since we're not
cloning whatever is on master at the time of building the Docker image.
2020-06-07 23:29:17 +02:00
Pau Pérez Fabregat
ca458018ca
Merge pull request #5547 from luisramos0/ctrl_hacks
...
Bring the spree_get spec helpers from spree and move them together with the api_get spec helpers
2020-06-05 17:34:16 +02:00
Luis Ramos
e2e3ae68b7
Update all locales with the latest Transifex translations
2020-06-05 11:36:27 +01:00
Luis Ramos
8ba15931e3
Merge pull request #5521 from openfoodfoundation/transifex
...
Transifex
2020-06-05 11:34:13 +01:00
Transifex-Openfoodnetwork
c317ae7bf3
Updating translations for config/locales/en_FR.yml
2020-06-05 17:51:47 +10:00
Transifex-Openfoodnetwork
76aded5fb5
Updating translations for config/locales/fr.yml
2020-06-05 17:51:06 +10:00
Luis Ramos
82290bb5e1
Merge pull request #5448 from rmklaus12/5302-paypal-missingkey
...
Added translation keys for PayPalExpress payment method
2020-06-04 21:32:27 +01:00
Luis Ramos
3a20de1465
Merge pull request #5398 from cillian/open-street-map
...
Add support for using Open Street Map on the Map and Group pages.
2020-06-04 17:01:25 +01:00
Transifex-Openfoodnetwork
52323887b6
Updating translations for config/locales/en_FR.yml
2020-06-04 15:58:45 +10:00
Transifex-Openfoodnetwork
095d0f4ca8
Updating translations for config/locales/fr.yml
2020-06-04 15:58:22 +10:00
Luis Ramos
12000d2d44
Merge pull request #5425 from luisramos0/pay_method_warning
...
Add warning to payment method edit page
2020-06-03 21:03:56 +01:00
Transifex-Openfoodnetwork
bbf381d130
Updating translations for config/locales/es.yml
2020-06-03 18:32:57 +10:00
Pau Pérez Fabregat
da3d51b500
Merge pull request #5539 from luisramos0/dev_docs
...
Improve Dev onboarding docs
2020-06-03 09:50:03 +02:00
Transifex-Openfoodnetwork
61d85eda61
Updating translations for config/locales/ca.yml
2020-06-03 17:40:19 +10:00
Pau Pérez Fabregat
4935932e45
Merge pull request #5531 from openfoodfoundation/dependabot/bundler/i18n-js-3.7.0
...
Bump i18n-js from 3.6.0 to 3.7.0
2020-06-03 09:17:58 +02:00
Pau Pérez Fabregat
d9cf22fed5
Merge pull request #5528 from luisramos0/checkout_js
...
Make checkout JS code send bugsnag alert even if there's an error processing an error
2020-06-03 09:13:40 +02:00
Pau Pérez Fabregat
fb339d6a99
Merge pull request #5263 from luisramos0/pdp
...
[Mobile] Restyle product modal
2020-06-03 08:55:20 +02:00
Transifex-Openfoodnetwork
4e497d93b7
Updating translations for config/locales/en_CA.yml
2020-06-03 10:31:14 +10:00
Luis Ramos
53a80de503
Improve method names and set use_route with reverse_merge so it can be overridden
2020-06-02 17:32:46 +01:00
Luis Ramos
7b89f4d6c5
Switch controller helper calls routes from spree to main_app, this will include all routes all the time
2020-06-02 15:00:57 +01:00
Luis Ramos
13836a62bb
Rename parameters to params and change default from nil to {}
2020-06-02 14:36:06 +01:00
Luis Ramos
3136aa5a8b
Make api_process use process_spree_action
2020-06-02 14:00:24 +01:00
Luis Ramos
2f76e0b15b
Bring methods from Spree::TestingSupport::ControllerRequests to our ControllerRequestsHelper so we can merge them later
2020-06-02 13:54:33 +01:00
Luis Ramos
5d0856e5a3
Rename ControllerHacks to ControllerRequestsHelper and move it's configuration to spec_helper
2020-06-02 13:47:59 +01:00
Luis Ramos
cd3bc54c37
Remove resource_scoping to make things more simple
2020-06-02 13:43:33 +01:00
Luis Ramos
2c2263ab78
Fix rubocop issues in shipments_controller_spec
2020-06-02 13:41:50 +01:00
Luis Ramos
092e047b44
Remove resource_scoping from api/shipments_controller spec
2020-06-02 13:35:48 +01:00
Luis Ramos
a0aa42cd58
Remove resource_scoping from api/variants spec
2020-06-02 13:26:12 +01:00
Luis Ramos
89c461662f
Merge pull request #5502 from Matt-Yorkley/dropshadow-regression
...
[mobile ux] Fix missing drop-shadow
2020-06-02 12:07:37 +01:00
Transifex-Openfoodnetwork
e5cc425662
Updating translations for config/locales/tr.yml
2020-06-01 16:39:17 +10:00
Luis Ramos
5d9e88a3bc
Restructure GETTING STARTED to make it clear what the wiki pages are for
2020-05-31 23:00:32 +01:00
Luis Ramos
fb45cb602e
Remove duplication from CONTRIBUTING
2020-05-31 21:07:52 +01:00
Matt-Yorkley
8e57f9d929
Adjust shared map partial
2020-05-31 19:21:20 +02:00
Cillian O'Ruanaidh
94b85fb9e3
Fix up Code Climate issues with Open Street Map code.
2020-05-31 18:42:55 +02:00
Cillian O'Ruanaidh
deafe32354
Add support for using Open Street Map on the Map and Group pages.
...
The map is displayed using https://leafletjs.com/
To enable Open Street Map go to the Admin -> Configuration -> Content section and click 'Open Street Map Enabled'.
The 'Open Street Map Provider Name' setting can be used to configure different tile providers thanks to the Leaflet-providers extension (https://github.com/leaflet-extras/leaflet-providers )
Some tile providers require an API key, this can provided in JSON format e.g. '{ apiKey: 123 }' in the 'Open Street Map Provider Options' setting.
Each tile provider has their own usage policy so this should be checked before enabling Open Street Map.
The search field for the Open Street Map works differently than searching on Google Maps. It matches producers by their name or address because it was easier to implement instead of matching place names all over the world.
2020-05-31 18:42:55 +02:00
Luis Ramos
c01da01c70
Merge pull request #5518 from openfoodfoundation/dependabot/bundler/ddtrace-0.36.0
...
Bump ddtrace from 0.35.2 to 0.36.0
2020-05-30 11:05:40 +01:00
dependabot-preview[bot]
f773e57dee
Bump i18n-js from 3.6.0 to 3.7.0
...
Bumps [i18n-js](https://github.com/fnando/i18n-js ) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/fnando/i18n-js/releases )
- [Changelog](https://github.com/fnando/i18n-js/blob/master/CHANGELOG.md )
- [Commits](https://github.com/fnando/i18n-js/compare/v3.6.0...v3.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-05-29 19:20:40 +00:00
Luis Ramos
6e842212ea
Always throw back error even if there is an error loading the flash for example translating the error message
2020-05-29 14:45:22 +01:00
Matt-Yorkley
c73defa8a1
Merge pull request #5494 from Matt-Yorkley/group-maps-fix
...
Fix group maps
2020-05-29 12:05:55 +02:00
Pau Pérez Fabregat
c0ad992352
Merge pull request #5465 from luisramos0/rename_accessible_by
...
[Rails 4.1] Rename order_cycle.accessible_by to remove name clash with active record
2020-05-29 12:04:19 +02:00
Transifex-Openfoodnetwork
5e0e88bf2c
Updating translations for config/locales/fr.yml
2020-05-29 17:24:01 +10:00
Transifex-Openfoodnetwork
9fbd8b4fe1
Updating translations for config/locales/en_FR.yml
2020-05-29 16:46:33 +10:00
Maikel
2f82a58055
Merge pull request #5365 from mbudm/task/orderCycleSpecSplit
...
Split order_cycle_spec into smaller specs grouped by theme
2020-05-29 13:46:42 +10:00
Transifex-Openfoodnetwork
11f33bd911
Updating translations for config/locales/pt_BR.yml
2020-05-29 08:12:24 +10:00
Luis Ramos
bb8401a0fc
Merge pull request #5444 from luisramos0/dead_js_code
...
Remove some dead JS code related to admin sub menus
2020-05-28 19:54:42 +01:00
Luis Ramos
bd5de9d82f
Delete unused translations
2020-05-28 19:51:23 +01:00
Luis Ramos
bec798c6c9
Bring some spree translations to ofn in payment methods pages
2020-05-28 19:51:23 +01:00
Luis Ramos
fe6bcb5093
Add de-activation warning to payment methods edit page
2020-05-28 19:50:58 +01:00
Luis Ramos
26f1dfb080
Move payment_method display field translations to OFN and adapt them to changes on same field in shipping method
2020-05-28 19:50:58 +01:00
