raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,068 Commits 21 Branches 450 Tags
a10bb5acbde4efb19ff809bc7964367d0940b367
Commit Graph

12068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel Linke
a10bb5acbd Consider deleted products when creating permalinks 
https://github.com/openfoodfoundation/openfoodnetwork/issues/3844

Spree's implementation and our implementation to create a unique
permalink failed to notice conflicts with soft-deleted products. This
patch looks at deleted products as well.
 2019-06-11 18:20:41 +10:00
Luis Ramos
568e3003ba Merge pull request #3882 from kristinalim/feature/3408-enable_enterprise_fee_summary_for_non_superadmin 
3408 Remove feature flag for Enterprise Fee Summary
 2019-06-06 16:28:36 +01:00
Luis Ramos
e2b506294d Merge pull request #3870 from openfoodfoundation/dependabot/bundler/jwt-2.2.1 
Bump jwt from 2.1.0 to 2.2.1
 2019-06-05 20:48:38 +01:00
Luis Ramos
78f0164f5b Merge pull request #3881 from openfoodfoundation/dependabot/bundler/stripe-4.18.1 
Bump stripe from 4.11.0 to 4.18.1
 2019-06-05 20:48:12 +01:00
Pau Pérez Fabregat
5028c9d283 Merge pull request #3899 from openfoodfoundation/transifex 
Transifex
 2019-06-05 12:28:12 +02:00
Transifex-Openfoodnetwork
215f6e92f2 Updating translations for config/locales/fr.yml 2019-06-05 02:44:40 +10:00
Luis Ramos
fd64e53f61 Merge pull request #3841 from luisramos0/2-0-fix-ship-methods-translations 
Move shipping methods translations to lazy lookups
 2019-06-04 15:15:31 +01:00
Luis Ramos
4dcf309910 Merge pull request #3884 from luisramos0/3879_ship_cats 
Remove matching of product shipping category with shipping method's category on checkout
 2019-06-03 22:53:13 +01:00
Matt-Yorkley
98d1cbec8c Update all locales with the latest Transifex translations 2019-06-02 18:06:51 +01:00
Kristina Lim
2c52c1a6fc Remove unused argument from Spree::Ability method 2019-06-02 01:30:46 +08:00
Pau Pérez Fabregat
ada640b159 Merge pull request #3850 from lin-d-hop/update-readme 
Update outdated things on the README
 2019-05-30 23:56:36 +02:00
luisramos0
c5a95dee79 Remove matching of product shipping category with shipping method's category to allow users to checkout products with categories not supported by the shipping methods. 
See issue #3884 for more details.
 2019-05-29 14:43:19 +01:00
Luis Ramos
187fbd788b Merge pull request #3873 from Matt-Yorkley/branding 
Use OFN logo in admin area
 2019-05-29 10:12:48 +01:00
Luis Ramos
88f109da67 Merge pull request #3868 from luisramos0/delete-en-us 
Remove unused en-US locale file
 2019-05-28 20:06:07 +01:00
Kristina Lim
ecea0600b6 Remove feature flag for Enterprise Fee Summary 2019-05-29 02:50:41 +08:00
Kristina Lim
93850d4317 Merge pull request #3846 from luisramos0/transpec_features 
Transpec spec/features
 2019-05-29 01:17:30 +08:00
luisramos0
79f16e0ea3 Run transpec in spec/features/consumer/external_services_spec.rb 2019-05-28 17:04:06 +01:00
luisramos0
7397ab4fd8 Run transpec in spec/features/admin/payment_method_spec.rb 2019-05-28 17:04:06 +01:00
luisramos0
ec7e92202b Run transpec in spec/features/admin/enterprise_user_spec.rb and spec/features/admin/overview_spec.rb 2019-05-28 17:04:06 +01:00
luisramos0
9a21ca38e1 Run transpec in a few more spec/features/admin specs 2019-05-28 17:04:06 +01:00
luisramos0
d2f62f86a9 Run transpec in a few spec/features/admin specs 2019-05-28 16:59:51 +01:00
luisramos0
80537e7e01 Run transpec in spec/features/admin/image_settings_spec.rb 2019-05-28 16:57:11 +01:00
luisramos0
7f43a66fb3 Run transpec in spec/features/admin/adjustments_spec 2019-05-28 16:57:11 +01:00
dependabot-preview[bot]
0b6eaa8d02 Bump jwt from 2.1.0 to 2.2.1 
Bumps [jwt](https://github.com/jwt/ruby-jwt) from 2.1.0 to 2.2.1.
- [Release notes](https://github.com/jwt/ruby-jwt/releases)
- [Changelog](https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/jwt/ruby-jwt/compare/v2.1.0...v2.2.1)
 2019-05-28 13:10:44 +00:00
dependabot-preview[bot]
df2553eac5 Bump stripe from 4.11.0 to 4.18.1 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 4.11.0 to 4.18.1.
- [Release notes](https://github.com/stripe/stripe-ruby/releases)
- [Changelog](https://github.com/stripe/stripe-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stripe/stripe-ruby/compare/v4.11.0...v4.18.1)
 2019-05-28 13:10:43 +00:00
Luis Ramos
6a0925539f Merge pull request #3842 from luisramos0/rubocop-line-length 
Fix a few rubocop warnings manually and run rubocop autocorrect
 2019-05-28 14:08:16 +01:00
luisramos0
d10f9a1a43 Rebuilding rubocop_todo auto after all the fixes 2019-05-28 12:57:29 +01:00
luisramos0
07854cf372 Fix a few problems introduced by rubocop auto correct 2019-05-28 12:57:29 +01:00
luisramos0
86b0d71c7e Result of rubocop auto-correct and rebuilding rubocop_manual_todo 2019-05-28 12:57:29 +01:00
luisramos0
4a67acf954 Removing a few rubocop warnings 2019-05-28 12:55:17 +01:00
Luis Ramos
31098218d2 Merge pull request #3856 from Drumstickx/master 
Fixed sql injection vulnerability in users_and_enterprises_report.
 2019-05-28 10:32:27 +01:00
Luis Ramos
9ccf502365 Merge pull request #3797 from lin-d-hop/variant-master-price 
Remove non-functional Price field from Edit Product screen
 2019-05-28 10:30:05 +01:00
Luis Ramos
de5eeeb6f2 Merge pull request #3812 from openfoodfoundation/dependabot/bundler/unicorn-5.5.1 
Bump unicorn from 5.5.0 to 5.5.1
 2019-05-27 13:06:58 +01:00
dependabot-preview[bot]
09d4ab9f0d Bump unicorn from 5.5.0 to 5.5.1 
Bumps [unicorn](https://bogomips.org/unicorn/) from 5.5.0 to 5.5.1.

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-27 09:22:42 +00:00
Pau Pérez Fabregat
2d3bd7f471 Merge pull request #3828 from eelcodevlieger/webdrivers 
Webdrivers
 2019-05-27 11:20:04 +02:00
Pau Pérez Fabregat
018b019f10 Merge pull request #3865 from mkllnk/438-aus-locale 
Add Australian English locale
 2019-05-27 11:11:04 +02:00
Pau Pérez Fabregat
6aa039876d Merge pull request #3809 from openfoodfoundation/dependabot/bundler/jquery-rails-3.0.4 
Bump jquery-rails from 3.0.0 to 3.0.4
 2019-05-27 10:40:44 +02:00
Pau Pérez Fabregat
6b08e2ab2c Merge pull request #3864 from openfoodfoundation/disable-harmful-rake-tasks-in-production 
Disable harmful rake tasks in production
 2019-05-27 10:36:07 +02:00
Matt-Yorkley
099914be40 Use OFN logo in admin area 2019-05-27 02:20:04 +01:00
dependabot-preview[bot]
1a9ad4fcbc Bump jquery-rails from 3.0.0 to 3.0.4 
Bumps [jquery-rails](https://github.com/rails/jquery-rails) from 3.0.0 to 3.0.4.
- [Release notes](https://github.com/rails/jquery-rails/releases)
- [Changelog](https://github.com/rails/jquery-rails/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/jquery-rails/compare/v3.0.0...v3.0.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-05-24 20:40:14 +00:00
Luis Ramos
655c54f367 Merge pull request #3835 from openfoodfoundation/dependabot/bundler/i18n-js-3.2.2 
Bump i18n-js from 3.2.1 to 3.2.2
 2019-05-24 21:38:16 +01:00
Luis Ramos
b6a456cb67 Merge pull request #3863 from mkllnk/quiet-cron 
Make inserting delayed jobs from cron quiet
 2019-05-24 14:50:19 +01:00
Luis Ramos
db0c874622 Merge pull request #3669 from luisramos0/2-0-without-spree-fe-views 
[Spree Upgrade] Remove dependency to spree frontend - views and assets
 2019-05-24 14:37:34 +01:00
luisramos0
97f09c672a Remove unused en-US locale file 2019-05-24 10:11:44 +01:00
Pau Pérez Fabregat
1d72d461df Merge pull request #3866 from openfoodfoundation/transifex 
Transifex
 2019-05-24 10:10:10 +02:00
luisramos0
5858a83239 Simplify spec_helper config to make file downloads work in headless chrome 2019-05-23 20:31:52 +01:00
Luis Ramos
4a321f200f Merge pull request #3783 from kristinalim/fix/3782-missing_translation 
3782 Fix missing translation in subscription update modal
 2019-05-23 18:45:20 +01:00
Luis Ramos
ae1d260729 Merge pull request #3810 from openfoodfoundation/dependabot/bundler/deface-1.0.2 
Bump deface from 1.0.0 to 1.0.2
 2019-05-23 18:42:51 +01:00
Luis Ramos
12282ad906 Merge pull request #3794 from m-budryte/replace_&_with_OR 
& replaced by OR when multiple property filters are selected
 2019-05-23 14:35:51 +01:00
Transifex-Openfoodnetwork
a4d59b72b0 Updating translations for config/locales/nb.yml 2019-05-23 20:35:12 +10:00