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,061 Commits 18 Branches 453 Tags
a0475ee8a4b0ea05d871f76f6f2ddf9ecf391c60
Commit Graph

14061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luis Ramos
a0475ee8a4 Merge pull request #4613 from luisramos0/autocomplete 
Bring remaining variants autocomplete (and related) JS code from spree_backend
 2020-01-31 16:08:50 +00:00
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
luisramos0
9254928656 Remove underscore from product_autocomplete css file 2020-01-28 13:53:04 +00:00
luisramos0
228997c35b Add handlebars dependency from spree_backend 2020-01-28 13:53:04 +00:00
luisramos0
667f44336d Remove unused split logic from variant autocomplete, the split functionality is not used in ofn because we only have one stock location 2020-01-28 13:53:04 +00:00
luisramos0
0a136ff2fb Comment out click event registration as this will duplicate events until the spree_backend code is there 
These can be activated when spree_backend is removed
 2020-01-28 13:53:04 +00:00
luisramos0
3f3577e73c Remove encoding tag from admin/spree/orders js files 2020-01-28 13:53:04 +00:00
luisramos0
cf1664bed3 Bring some variant autocomplete styling from spree_backend 2020-01-28 13:53:04 +00:00
luisramos0
b8aee4e857 Bring address_states as is from spre_backend 2020-01-28 13:53:04 +00:00
luisramos0
cfe3435851 Bring shipments.js as is from spree_backend 2020-01-28 13:53:04 +00:00
luisramos0
53e342ba1a Bring variant_autocomplete from spree_backend as is 2020-01-28 13:53:04 +00:00
luisramos0
6bdb14248c Require lodash.underscore to support _. calls in js 
spree_backend relies on Underscore.js 1.4.4, from Jan 2013, in some auto complete functions, here we will be depending on Lo-Dash 2.4.1, from Dec 2013
 2020-01-28 13:53:03 +00:00
luisramos0
8e27291b15 require handlebars extensions from spree_core to allow translations inside handlebar templates 2020-01-28 13:52:19 +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