raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,554 Commits 20 Branches 451 Tags
75d24c19fcb89a4d5037596f7c7eac1fee58b188
Commit Graph

15554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pau Pérez Fabregat
75d24c19fc Merge pull request #5206 from chrishil1/clear_filters 
Clear filters on admin/products page
 2020-06-11 10:37:17 +02:00
Pau Pérez Fabregat
bdc4340034 Merge pull request #5582 from openfoodfoundation/transifex 
Transifex
 2020-06-11 10:30:13 +02:00
Pau Pérez Fabregat
961be38734 Merge pull request #5581 from openfoodfoundation/dependabot/bundler/test-unit-3.3.6 
Bump test-unit from 3.3.5 to 3.3.6
 2020-06-11 09:16:57 +02:00
Transifex-Openfoodnetwork
e76bc07d72 Updating translations for config/locales/es.yml 2020-06-11 17:11:55 +10:00
Transifex-Openfoodnetwork
6ef94febe5 Updating translations for config/locales/ca.yml 2020-06-11 17:10:49 +10:00
Transifex-Openfoodnetwork
472338b522 Updating translations for config/locales/fr.yml 2020-06-11 16:32:02 +10:00
Transifex-Openfoodnetwork
220c84075f Updating translations for config/locales/en_FR.yml 2020-06-11 16:25:36 +10:00
Luis Ramos
ccf6cbb003 Merge pull request #5483 from rmklaus12/5281-missing-translation-ordercreation 
Changed translation syntax to normal t() call and lazy lookup.
 2020-06-10 23:00:44 +01:00
Luis Ramos
13a4a3edbe Merge pull request #5532 from luchiago/fix-admin-config-separator-withou-highlight 
Fix admin config separator without highlight
 2020-06-10 23:00:30 +01:00
Luis Ramos
21746e72ce Merge pull request #5484 from rmklaus12/5336-errormsg-translation 
Added translation keys to error messages partial and en.yml file to a…
 2020-06-10 23:00:07 +01:00
Luis Ramos
1e248c1848 Merge pull request #5354 from jeduardo824/enhancement/5277-be-able-to-filter-orders-according-to-shipping-method 
Enhancement/5277 be able to filter orders according to shipping method
 2020-06-10 20:50:06 +01:00
Luis Ramos
28f126eed1 Merge pull request #5545 from mbudm/task/matomo-tag-manager 
Add configuration to enable Matomo Tag Manager
 2020-06-10 20:49:34 +01:00
dependabot-preview[bot]
1a700f870c Bump test-unit from 3.3.5 to 3.3.6 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.3.5 to 3.3.6.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.3.5...3.3.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-10 19:16:40 +00:00
Luis Ramos
113533e3b1 Merge pull request #5557 from Matt-Yorkley/reports-improvement 
Improve performance in various reports
 2020-06-10 18:54:51 +01:00
Pau Pérez Fabregat
a547aae770 Merge pull request #5562 from openfoodfoundation/transifex 
Transifex
 2020-06-10 17:57:07 +02:00
Transifex-Openfoodnetwork
1abbd7261e Updating translations for config/locales/es.yml 2020-06-11 01:13:33 +10:00
Transifex-Openfoodnetwork
9a2618cd39 Updating translations for config/locales/ca.yml 2020-06-11 01:09:41 +10:00
Steve Roberts
f8673fb575 Moved tag manager instructions to be directly below the field 2020-06-10 15:06:53 +10:00
Luis Ramos
89003aece7 Merge pull request #5414 from openfoodfoundation/dependabot/bundler/stripe-5.22.0 
Bump stripe from 5.15.0 to 5.22.0
 2020-06-09 17:41:20 +01:00
Pau Pérez Fabregat
86d59c4e86 Merge pull request #5564 from dmarcoux/improve-dockerfile 
Improve Dockerfile
 2020-06-09 16:17:37 +02:00
Steve Roberts
5fcc0dcd14 Add configuration to enable matomo tag manager 
- Update embed codes and allow both scripts concurrently
- Add lines around blocks
- Update MTM copy based on PR feedback
- checked cookies unchanged
 2020-06-09 10:21:11 +10:00
jeffrey s hill md
c4e910a7c8 Make clear filters fetch products automatically without filters 
The spec change is needed: fetchProducts() makes cleared filters values undefined in removeClearedValues.
 2020-06-08 18:27:10 +01:00
Transifex-Openfoodnetwork
dceae2a98b Updating translations for config/locales/it.yml 2020-06-08 23:23:41 +10:00
Transifex-Openfoodnetwork
7515b9c86c Updating translations for config/locales/it.yml 2020-06-08 23:20:30 +10:00
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
Transifex-Openfoodnetwork
e8f59ca80f Updating translations for config/locales/tr.yml 2020-06-06 20:02:55 +10: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
Matt-Yorkley
9e278d5b2f Improve performance in various reports 2020-06-05 16:39:01 +02:00
Luis Ramos
e2e3ae68b7 Update all locales with the latest Transifex translations v2.10.0 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