raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 18 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
luisramos0
87366ae7fc Remove usage of jConfirm so that we dont have to bring dependency jquery.alerts from spree_backend 2020-02-04 09:33:58 +00:00
luisramos0
27aea0b277 Bring js code from spree_backend to make taxons admin work 2020-02-04 09:33:58 +00:00
luisramos0
d4edc9f20d Bring jstress css from spree_backend 2020-02-04 09:33:58 +00:00
luisramos0
6c7991be75 Bring jquery.jstree from spree_backend 2020-02-04 09:33:34 +00:00
luisramos0
3f81352df5 Bring jquery.cookie from spree_backend 2020-02-04 09:33:34 +00:00
Kristina Lim
9d0e26ae28 Wait for products panel to show in outgoing exchanges feature spec 2020-02-04 16:20:47 +08:00
Luis Ramos
d80554a14a Merge pull request #4744 from luisramos0/oc_pag_bug 
Make pagination optional in the ExchangeProductsController
v2.7.3 		2020-02-03 17:19:06 +00:00
luisramos0
a5fe5fb448 Remove usage of deleted const DEFAULT_PAGE 
If params[:page] is not in the request, the results will not be paginated now
 2020-02-03 15:04:34 +00:00
luisramos0
4c51d60bfd Make pagination optional in the ExchangeProductsController 2020-02-03 13:11:26 +00:00
blainebillings
9218008530 Edit new_resource Partial 2020-02-02 11:22:54 -05:00
myersca1
f36c5b8938 Edit new_resource partial 2020-02-02 11:19:10 -05:00
dependabot-preview[bot]
67199fd2d6 Bump bugsnag from 6.12.2 to 6.13.0 
Bumps [bugsnag](https://github.com/bugsnag/bugsnag-ruby) from 6.12.2 to 6.13.0.
- [Release notes](https://github.com/bugsnag/bugsnag-ruby/releases)
- [Changelog](https://github.com/bugsnag/bugsnag-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bugsnag/bugsnag-ruby/compare/v6.12.2...v6.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-31 19:15:09 +00:00
Transifex-Openfoodnetwork
18d17ec674 Updating translations for config/locales/fr_CA.yml 2020-02-01 04:02:53 +11:00
Transifex-Openfoodnetwork
3981ee7ec1 Updating translations for config/locales/en_CA.yml 2020-02-01 03:54:02 +11:00
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
Maikel Linke
9535c5647f Make pluralisation code an independent lib 
I considered moving the code to a service but I think that this code
can be completely independent of the Open Food Network use case. It
would be easy to move to a gem. The downcasing may need reconsidering
for general use.
 2020-01-31 09:48:32 +11:00
Maikel Linke
6f8bb793e1 Add unit names commonly used in French 2020-01-31 09:48:32 +11:00
Maikel Linke
2476050f29 Remove usage count comments 2020-01-31 09:48:32 +11:00
Maikel Linke
1cce106977 Use our unit name pluralization in Ruby 
This code will be used for the shop front and reports.
 2020-01-31 09:48:32 +11:00
Maikel Linke
98b55287f1 Pluralize common variant unit names 
This adds the most popular unit names as singular and plural to our
locale for translation. The added Javascript performs a reverse lookup
to find the right singular/plural form of a unit name in that language.
 2020-01-31 09:48:32 +11:00
dependabot-preview[bot]
25c4aed368 Bump rack-mini-profiler from 1.1.4 to 1.1.6 
Bumps [rack-mini-profiler](https://github.com/MiniProfiler/rack-mini-profiler) from 1.1.4 to 1.1.6.
- [Release notes](https://github.com/MiniProfiler/rack-mini-profiler/releases)
- [Changelog](https://github.com/MiniProfiler/rack-mini-profiler/blob/master/CHANGELOG.md)
- [Commits](https://github.com/MiniProfiler/rack-mini-profiler/compare/v1.1.4...v1.1.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-30 19:28:45 +00:00
dependabot-preview[bot]
c5a6ef673c Bump oj from 3.10.1 to 3.10.2 
Bumps [oj](https://github.com/ohler55/oj) from 3.10.1 to 3.10.2.
- [Release notes](https://github.com/ohler55/oj/releases)
- [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/ohler55/oj/compare/v3.10.1...v3.10.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-30 19:26:07 +00:00
Transifex-Openfoodnetwork
79ba15fe9a Updating translations for config/locales/en_GB.yml 2020-01-31 03:53:48 +11: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
luisramos0
e192207f4e Fix bug in before filters migration, needs to load payment for the show action 2020-01-30 10:27:26 +00: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
dependabot-preview[bot]
48a75c956f Bump oauth2 from 1.4.2 to 1.4.3 
Bumps [oauth2](https://github.com/oauth-xx/oauth2) from 1.4.2 to 1.4.3.
- [Release notes](https://github.com/oauth-xx/oauth2/releases)
- [Changelog](https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md)
- [Commits](https://github.com/oauth-xx/oauth2/compare/v1.4.2...v1.4.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-01-29 19:24:24 +00:00
lin-d-hop
baf1ecb436 Fixing incorrect payment and balance calculation 
Corrections and added specs
 2020-01-29 16:06:06 +00: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