raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-07 22:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,049 Commits 18 Branches 453 Tags
4cdc604f4560e49ce0f15988396fc89fa27ef281
Commit Graph

14049 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
4cdc604f45 Merge pull request #4718 from luisramos0/variant_count 
Make Order Cycle exchange tab summary not count inventory variants that are hidden
 2020-01-31 16:03:21 +00:00
Luis Ramos
dbf44c41b2 Merge pull request #4657 from luisramos0/pi-xls 
Remove Product import code for xls suppport
 2020-01-31 12:12:25 +00:00
Kristina Lim
f797745848 Update all locales with the latest Transifex translations v2.7.2 2020-01-30 23:01:02 +08:00
Luis Ramos
25fae17677 Update Copyright to include year 2020 2020-01-30 14:44:31 +00:00
Kristina Lim
8ae6048202 Merge pull request #4720 from openfoodfoundation/transifex 
Transifex
 2020-01-30 22:40:47 +08:00
Luis Ramos
768631a90a Merge pull request #4616 from luisramos0/orders_js 
Bring some JS and CSS code from spree_backend related to orders admin
 2020-01-30 11:37:07 +00:00
luisramos0
d472ceafcc Add required dependencies from spree_backend 2020-01-30 11:36:09 +00:00
luisramos0
9a52a127a4 Add js code needed in the product images page 2020-01-30 11:36:09 +00:00
luisramos0
c20a41111c Bring some css needed in payments list and product edit page and add image for the credit cards in the payments page as well 2020-01-30 11:36:09 +00:00
luisramos0
fd26500ca4 Add orders css for the orders edit page 2020-01-30 11:36:09 +00:00
luisramos0
4f0e441407 Bring and require responsive-tables js and css from spree_backend 2020-01-30 11:36:09 +00:00
Luis Ramos
37a5d1d036 Merge pull request #4628 from luisramos0/be_fontawesome 
Bring fontawesome font and associated css from spree_backend
 2020-01-30 11:21:35 +00:00
Luis Ramos
c4f7588601 Merge pull request #4608 from luisramos0/power_tip 
Bring powertip from spree_backend, including js and css
 2020-01-30 11:20:37 +00:00
Luis Ramos
6509c6f7b5 Merge pull request #4588 from luisramos0/base_helper 
Bring base helper from spree_backend
 2020-01-30 11:18:35 +00:00
Kristina Lim
5aadd444aa Merge pull request #4721 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.4.2 
Bump rubocop-rails from 2.4.1 to 2.4.2
 2020-01-30 19:04:24 +08:00
Kristina Lim
278284583f Merge pull request #4735 from mkllnk/4729-init-taxon-dropdown 
Activate Foundation's dropdowns after tab switch
 2020-01-30 19:00:30 +08:00
Maikel Linke
b63042236d Activate Foundation's dropdowns after tab switch 
If the dropdown doesn't exist during page load, Foundation misses it. We
need to initialise it again.
 2020-01-30 17:02:23 +11:00
Transifex-Openfoodnetwork
32f7a74df7 Updating translations for config/locales/en_NZ.yml 2020-01-29 15:43:31 +11:00
luisramos0
3e68dc5bb2 Extract some methods from base_helper to zones_helper to make it explicit they are only used in the zones admin pages 2020-01-28 18:05:30 +00:00
luisramos0
919242d9ec Fix rubocop issues in spree/admin/base_helper 2020-01-28 18:05:15 +00:00
luisramos0
844731061c Add needed generic partials 2020-01-28 18:04:36 +00:00
luisramos0
109f2866ae Merge base_helper with decorator 2020-01-28 18:04:36 +00:00
luisramos0
76eafa8415 Bring base_helper from spree_backend 2020-01-28 18:04:36 +00:00
luisramos0
947914724a Add frozen string literal magic comment 2020-01-28 18:02:58 +00:00
luisramos0
b5004f1cbf Add specs for ExchangeProductsRenderer#exchange_variants 2020-01-28 18:02:58 +00:00
luisramos0
4596399bc2 Extract logic from controller to renderer service 
Re-using the filter_visible method for both products and variants
 2020-01-28 18:02:58 +00:00
luisramos0
685abccb61 Make variant count consider oc config and not count variants that are hidden in the inventory of the coordinator of the OC 2020-01-28 18:02:58 +00:00
Luis Ramos
5e61ba8136 Merge pull request #4587 from luisramos0/navigation_helper 
Bring navigation helper from spree_backend
 2020-01-28 17:58:18 +00:00
luisramos0
f3447e3a96 Move dependency statement to powertip.css 2020-01-28 14:07:46 +00:00
luisramos0
3d0a31e838 Bring dependencies from spree_backend required by powertip 2020-01-28 14:07:46 +00:00
luisramos0
26bb8cc337 Bring powertip from spree_backend, including js and css 2020-01-28 14:07:45 +00:00
Luis Ramos
a6ade31604 Merge pull request #4607 from luisramos0/legacy_browsers_support 
Remove unused js dependencies (jquery-migrate-1.0.0 and timeago) and bring some legacy browsers support dependencies from spree_backend
 2020-01-28 12:49:38 +00:00
Luis Ramos
b348552cdf Merge pull request #4651 from mkllnk/remove-unused-presenter 
Remove unused presenter
 2020-01-28 09:52:01 +00:00
Maikel
bd8af40afb Merge pull request #4691 from Matt-Yorkley/codeclimate-scss 
Disable two codeclimate SCSS rules
 2020-01-28 11:00:46 +11:00
dependabot-preview[bot]
54d2228a03 Bump rubocop-rails from 2.4.1 to 2.4.2 
Bumps [rubocop-rails](https://github.com/rubocop-hq/rubocop-rails) from 2.4.1 to 2.4.2.
- [Release notes](https://github.com/rubocop-hq/rubocop-rails/releases)
- [Changelog](https://github.com/rubocop-hq/rubocop-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rubocop-hq/rubocop-rails/compare/v2.4.1...v2.4.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-27 19:33:28 +00:00
Transifex-Openfoodnetwork
3b0bec3c0f Updating translations for config/locales/en_FR.yml 2020-01-27 23:37:03 +11:00
Transifex-Openfoodnetwork
2a3e8db560 Updating translations for config/locales/fr.yml 2020-01-27 23:36:31 +11:00
Transifex-Openfoodnetwork
d6d3e5fb5a Updating translations for config/locales/ar.yml 2020-01-27 09:51:47 +11:00
Luis Ramos
d7bb063a30 Merge pull request #4716 from CSCI-462-01-2020/Issue4412 
Change in English locale to add "end" term
 2020-01-25 10:22:29 +00:00
Luis Ramos
c7d8e96beb Merge pull request #4699 from mkllnk/4696-rescue-checkout 
Rescue unknown checkout errors
 2020-01-24 18:11:38 +00:00
luisramos0
a6d4774a93 Bring font-awesome from spree_backend 2020-01-24 17:52:11 +00:00
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