raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,029 Commits 18 Branches 453 Tags
07a42e8a2127377e7dcdc8f1136838cdafcfc46b
Commit Graph

19029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
7cd710622e Bring fontawesome css from spree_backend 2020-01-24 17:52:11 +00:00
Pau Pérez Fabregat
529265697c Merge pull request #4715 from openfoodfoundation/transifex 
Transifex
 2020-01-24 13:31:08 +01:00
Pau Pérez Fabregat
690f18c58c Merge pull request #4653 from Matt-Yorkley/db2fog_region 
Db2fog region
 2020-01-24 13:30:11 +01:00
Luis Ramos
1b9c020bee Merge pull request #4650 from tomekr/docker-rspec-fix 
Docker rspec fix
 2020-01-24 12:24:50 +00:00
Luis Ramos
af3ac703a5 Merge pull request #4717 from openfoodfoundation/dependabot/bundler/ddtrace-0.32.0 
Bump ddtrace from 0.31.1 to 0.32.0
 2020-01-24 12:23:51 +00:00
dependabot-preview[bot]
1d8fce09b6 Bump ddtrace from 0.31.1 to 0.32.0 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.31.1 to 0.32.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.31.1...v0.32.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-23 19:17:08 +00:00
luisramos0
904c85c5be Move css import to ie hacks file where it's needed 2020-01-23 19:01:52 +00:00
Transifex-Openfoodnetwork
c129af88d4 Updating translations for config/locales/en_FR.yml 2020-01-24 05:53:03 +11:00
Transifex-Openfoodnetwork
ca1e6744ad Updating translations for config/locales/fr.yml 2020-01-24 05:52:29 +11:00
Unknown
a101c5c507 Change in English locale to add "end" 
The "end" term is used in the _date_range_form, but there is no entry in the English locale. Added so that it can start being translated with Transifex.
 2020-01-23 12:56:07 -05:00
Transifex-Openfoodnetwork
d9672a0032 Updating translations for config/locales/en_GB.yml 2020-01-24 02:55:07 +11:00
Matt-Yorkley
7e7eb67e0a Merge pull request #4714 from luisramos0/fix_permissions_load_problem 
Add require to fix loading issue. Some other Permissions module was being loaded
v2.7.1 		2020-01-23 15:56:27 +01:00
luisramos0
a5f222b067 Bring css_browser_selector_dev from spree_backend and respective hacks 2020-01-23 14:45:35 +00:00
luisramos0
0ec39106b1 Bring modernizr from spree_backend 2020-01-23 14:45:35 +00:00
luisramos0
c59afd4951 Remove jquery-migrate-1.0.0, we already have jquery-migrate 1.2.1 (jquery-migrate-min) through gemfile jquery-migrate-rails 2020-01-23 14:45:35 +00:00
luisramos0
2c59b522de Reorganize admin/all.js in meaningful groups 2020-01-23 14:45:35 +00:00
luisramos0
337fbf1be9 Remove unused JS dependency timeago, we use momentjs now 2020-01-23 14:45:35 +00:00
luisramos0
1548eaeb7e Add frozen_string_literal magic comment 2020-01-23 14:42:19 +00:00
luisramos0
ee3c9563d8 Add all submenus entries to the main tabs list so that the main menu keeps selected when user selects the submenus 2020-01-23 14:31:25 +00:00
luisramos0
4b0ddcda01 Add require to fix loading issue. Some other Permissions module was being loaded 2020-01-23 11:42:10 +00:00
Luis Ramos
f5adf6a9d7 Merge pull request #4697 from mkllnk/4457-line-item-spec 
Stabilise spec by not creating noise data
 2020-01-23 11:35:34 +00:00
Matt-Yorkley
86231672a6 Merge pull request #4703 from openfoodfoundation/daniellemoorhead-patch-1 
Updated shopfront message placeholder for home tab
 2020-01-23 12:32:08 +01:00
Luis Ramos
e47bd019a1 Merge pull request #4656 from mkllnk/config 
Use strings for all environment variables
 2020-01-23 11:07:17 +00:00
Matt-Yorkley
0011caccc6 Update all locales with the latest Transifex translations 2020-01-23 11:45:58 +01:00
Matt-Yorkley
ad5a599ddf Merge pull request #4710 from openfoodfoundation/transifex 
Transifex
 2020-01-23 11:37:10 +01:00
Luis Ramos
43d7609b81 Merge pull request #4707 from Matt-Yorkley/mobile-checkout-tabs 
Remove tabs from cart and checkout
 2020-01-23 10:19:50 +00:00
Transifex-Openfoodnetwork
56d17bca6a Updating translations for config/locales/nb.yml 2020-01-23 19:43:37 +11:00
Transifex-Openfoodnetwork
7f4e53f411 Updating translations for config/locales/fr.yml 2020-01-23 19:41:23 +11:00
Transifex-Openfoodnetwork
bd16b80d5f Updating translations for config/locales/en_FR.yml 2020-01-23 19:38:34 +11:00
Transifex-Openfoodnetwork
c8a1f9b93c Updating translations for config/locales/fr.yml 2020-01-23 19:38:12 +11:00
Maikel
9a8cd60d5a Merge pull request #4694 from Matt-Yorkley/rails-4-prep-routes 
Rails 4 prep: spree routes
 2020-01-23 17:42:37 +11:00
Maikel
4d11dced39 Merge pull request #4687 from openfoodfoundation/dependabot/bundler/ddtrace-0.31.1 
Bump ddtrace from 0.31.0 to 0.31.1
 2020-01-23 16:35:38 +11:00
Maikel Linke
bd67d63b63 Restore payment error feedback 2020-01-23 16:20:07 +11:00
Maikel Linke
6763012ee9 Rescue unknown checkout errors 2020-01-23 16:20:07 +11:00
Maikel
de2f09db75 Merge pull request #4698 from openfoodfoundation/transifex 
Transifex
 2020-01-23 15:59:36 +11:00
Luis Ramos
494cb00774 Merge pull request #4585 from luisramos0/backend_partial_calc_fields 
Bring spree_backend calculator fields partial to OFN
 2020-01-22 20:27:10 +00:00
Luis Ramos
d782bea458 Merge pull request #4633 from luisramos0/fix_prod_link_bug 
Fix bug in frontoffice order details where the product image was a broken link
 2020-01-22 20:25:24 +00:00
luisramos0
766303b332 Add required payment_helper from spree_backend 2020-01-22 20:22:28 +00:00
luisramos0
74226fbdf8 Fix one rubocop issue and update rubocop todo manual for the new controller 2020-01-22 20:22:28 +00:00
luisramos0
dc5374e284 Merge filter_payment_methods and load_data 2020-01-22 20:21:21 +00:00
luisramos0
f6ecf57737 Make before filters easier to understand using the fact that there are only index, create, new and fire actions in this controller 2020-01-22 20:21:21 +00:00
luisramos0
940953b043 Add missing translations for payments 2020-01-22 20:21:21 +00:00
luisramos0
fbc5887fa6 Bring payments routes from spree_backend 2020-01-22 20:21:21 +00:00
luisramos0
61ce849546 Merge spree/admin/payments_controller with its decorator and fix a few rubocop issues 2020-01-22 20:21:21 +00:00
luisramos0
afddaed9fc Add empty but needed payments templates for check payment method 2020-01-22 20:21:21 +00:00
luisramos0
12158d73fa Add payments_controller from spree_backend so that we can now merge it with the OFN's decorator 2020-01-22 20:21:21 +00:00
Matt-Yorkley
5f3abbf00e Refactor BaseController 2020-01-22 12:17:23 +01:00
Matt-Yorkley
a02c58e231 Add join_table to enterprise groups relation 
has_and_belongs_to_many relationships now require a join_table
 2020-01-22 12:17:23 +01:00
Matt-Yorkley
59ebfb9bd4 Fix subquery errors triggered by #warn_invalid_order_cycles 2020-01-22 12:17:23 +01:00
Matt-Yorkley
57ca1d54bb Fix issue with each_serializer not being called in some cases in Rails 4. 2020-01-22 12:17:23 +01:00