raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-12 03:50:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,960 Commits 17 Branches 456 Tags
1ce431b671bd97caee5bdca7ef3869eaa7f95bee
Commit Graph

9960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
c4c4547338 Merge pull request #2572 from greysteil/bump-webmock 
Bump webmock
 2018-08-24 08:49:11 +10:00
dependabot[bot]
358bb3030a Bump stripe from 3.3.1 to 3.3.2 
Bumps [stripe](https://github.com/stripe/stripe-ruby) from 3.3.1 to 3.3.2.
- [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/v3.3.1...v3.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-23 19:16:15 +00:00
dependabot[bot]
2e4a8d6318 Bump angular-rails-templates from 0.2.0 to 0.3.0 
Bumps [angular-rails-templates](https://github.com/pitr/angular-rails-templates) from 0.2.0 to 0.3.0.
- [Release notes](https://github.com/pitr/angular-rails-templates/releases)
- [Changelog](https://github.com/pitr/angular-rails-templates/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pitr/angular-rails-templates/compare/v0.2.0...v0.3.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-23 19:15:48 +00:00
luisramos0
910297572e Removed unnecessary currency from CartService constructor, using order.currency instead 2018-08-23 12:40:18 +01:00
luisramos0
ec069b1e3e Converted specs to latest rspec syntax 2018-08-23 12:39:58 +01:00
luisramos0
c7b202f932 Fixed CodeClimate warnings on services/cart_services.rb 2018-08-23 12:39:58 +01:00
luisramos0
05bfc098ff /controllers/spree/order_populator_decorator (with a class_eval) is now /services/CartService with no dependency to Spree::OrderPopulator. 2018-08-23 12:39:55 +01:00
luisramos0
6caa361354 Moved Spree::OrderController.populate to new CartController. 
This was done to make order populate independent of Spree::OrdersController
 2018-08-23 12:37:52 +01:00
Maikel
0312bf93dd Merge pull request #2556 from luisramos0/cookies_failing_tests 
Make cookies tests more stable
 2018-08-23 13:29:02 +10:00
Maikel Linke
00b8b0a36c Sleep to avoid race conditions in cookie spec 
We tried a lot to avoid these sleep commands, but nothing worked. So
it's better to have reliable specs than fast specs.
 2018-08-23 13:13:05 +10:00
Maikel
0c35d1bade Merge pull request #2570 from openfoodfoundation/dependabot/bundler/atomic-1.1.101 
Bump atomic from 1.1.99 to 1.1.101
 2018-08-23 11:05:46 +10:00
Maikel
5dd0aed1c0 Merge pull request #2569 from openfoodfoundation/dependabot/bundler/rack-livereload-0.3.17 
Bump rack-livereload from 0.3.16 to 0.3.17
 2018-08-23 10:56:00 +10:00
Maikel
bc192dabbc Merge pull request #2564 from openfoodfoundation/dependabot/bundler/fuubar-2.3.2 
Bump fuubar from 2.2.0 to 2.3.2
 2018-08-23 10:10:07 +10:00
Maikel
7d40e960f4 Merge pull request #2563 from openfoodfoundation/transifex 
Transifex
 2018-08-23 10:06:16 +10:00
Maikel
92e9392bc5 Merge pull request #2561 from mkllnk/2233-enable-embedded-shopping-spec 
Enable embedded shopping spec
 2018-08-23 09:23:12 +10:00
luisramos0
a97138dd58 Fixed bulk_line_items_controller_spec by setting shipment on test line_items and by allowing shipment decorator to allow no adjustments in the shipment 2018-08-22 23:20:30 +01:00
Grey Baker
468c29b8c1 Use new basic auth stub style 2018-08-22 21:35:56 +01:00
dependabot[bot]
b459ed7122 Bump webmock from 1.8.11 to 3.4.2 
Bumps [webmock](https://github.com/bblimke/webmock) from 1.8.11 to 3.4.2.
- [Release notes](https://github.com/bblimke/webmock/releases)
- [Changelog](https://github.com/bblimke/webmock/blob/master/CHANGELOG.md)
- [Commits](https://github.com/bblimke/webmock/compare/v1.8.11...v3.4.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-22 21:26:05 +01:00
dependabot[bot]
f35e24d5ce Bump atomic from 1.1.99 to 1.1.101 
Bumps [atomic](https://github.com/ruby-concurrency/atomic) from 1.1.99 to 1.1.101.
- [Release notes](https://github.com/ruby-concurrency/atomic/releases)
- [Commits](https://github.com/ruby-concurrency/atomic/compare/1.1.99...1.1.101)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-22 19:18:33 +00:00
dependabot[bot]
c5b426fded Bump rack-livereload from 0.3.16 to 0.3.17 
Bumps [rack-livereload](https://github.com/onesupercoder/rack-livereload) from 0.3.16 to 0.3.17.
- [Release notes](https://github.com/onesupercoder/rack-livereload/releases)
- [Commits](https://github.com/onesupercoder/rack-livereload/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-22 19:17:49 +00:00
Grey Baker
a747561e77 Switch feature matcher style from to_not have to to have_no 2018-08-22 09:29:48 +01:00
dependabot[bot]
8fb5625f1d Bump daemons from 1.2.2 to 1.2.6 
Bumps [daemons](https://github.com/thuehlinger/daemons) from 1.2.2 to 1.2.6.
- [Release notes](https://github.com/thuehlinger/daemons/releases)
- [Changelog](https://github.com/thuehlinger/daemons/blob/master/Releases)
- [Commits](https://github.com/thuehlinger/daemons/compare/v1.2.2...v1.2.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-22 07:48:28 +00:00
dependabot[bot]
ade005bb2c Bump fuubar from 2.2.0 to 2.3.2 
Bumps [fuubar](https://github.com/thekompanee/fuubar) from 2.2.0 to 2.3.2.
- [Release notes](https://github.com/thekompanee/fuubar/releases)
- [Changelog](https://github.com/thekompanee/fuubar/blob/master/CHANGELOG.md)
- [Commits](https://github.com/thekompanee/fuubar/compare/releases/v2.2.0...releases/v2.3.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-08-22 07:47:04 +00:00
Maikel
4417a8f156 Merge pull request #2539 from luisramos0/delete_dead_cart 
removed Cart route, controller, model and specs: dead code
 2018-08-22 17:35:58 +10:00
Transifex-Openfoodnetwork
1bbc615496 Updating translations for config/locales/fr_CA.yml 2018-08-22 08:37:41 +10:00
Transifex-Openfoodnetwork
39b3a964dd Updating translations for config/locales/fr.yml 2018-08-22 04:25:59 +10:00
luisramos0
653804d14c Make cookies test more stable 2018-08-20 21:08:09 +01:00
luisramos0
61f69905f8 fixed UX problem in the state selector in customers admin 2018-08-20 20:51:22 +01:00
luisramos0
898e41acfb Removed monkeypatchs to scope variants on inventory_unit and line_item decorators. We need to make the scoping somewhere else in spree2, see #2559 2018-08-19 20:23:31 +01:00
stveep
17f2ba47ca Add label for card field 2018-08-19 12:00:31 +01:00
stveep
8c6b8d5e84 Move injectors outside Stripe partial to satisfy dependencies 2018-08-19 11:50:34 +01:00
stveep
286101c934 PR changes: switch syntax for mapCC, remove ng-init 2018-08-19 10:43:53 +01:00
stveep
c0f41b6833 PR changes - erb to haml, don't update en_GB translations 2018-08-19 10:43:53 +01:00
stveep
b3da7049c6 Should not hide post code on admin side as no billing address otherwise 2018-08-19 10:43:53 +01:00
stveep
ff7dc811e9 Add translations for messages and remove old placeholder translation 2018-08-19 10:43:53 +01:00
stveep
f9a221e2ff add to manifest, tidy up requirements, hide postcode similar to frontend 2018-08-19 10:43:53 +01:00
stveep
a848b9172e Change name to AdminStripeElements to avoid confusion; add status bar for StatusMessages 2018-08-19 10:43:53 +01:00
stveep
8272aebe29 Add Stripe form and duplicate Stripe Elements in backend Angular app 2018-08-19 10:43:53 +01:00
Matt-Yorkley
fbbbc93aba Class descriptions for Product Import 2018-08-18 11:42:02 +01:00
luisramos0
56879377d5 Added httponly to cookieConsent cookie, this makes this cookie secure, cannot be altered by javascript 2018-08-17 22:57:57 +01:00
Maikel
e0d13010bb Merge pull request #2543 from openfoodfoundation/transifex 
Transifex
 2018-08-17 17:36:22 +10:00
Maikel Linke
7dccbb5213 Enable embedded shopping spec 
It was disabled in
https://github.com/openfoodfoundation/openfoodnetwork/pull/2232, because
it was very unreliable. But it seems stable again since
https://github.com/openfoodfoundation/openfoodnetwork/pull/2468.
 2018-08-17 17:00:15 +10:00
Matt-Yorkley
28b1fc076a Remove empty SKU values if empty 2018-08-16 14:29:50 +01:00
Kristina Lim
c14e7ea8d5 Allow bulk update of order cycle name 2018-08-16 21:18:24 +08:00
luisramos0
91e57cb893 Removed Cart table, its dependency on spree orders table and removed some more dead code related to this 2018-08-15 23:29:28 +01:00
Transifex-Openfoodnetwork
d76112e072 Updating translations for config/locales/de_DE.yml 2018-08-14 17:18:51 +10:00
Maikel Linke
c9862535f8 Import required colour definitions in SCSS 
This avoids asset compile errors like this one:

  Sass::SyntaxError: Undefined variable: "$disabled-light".
 2018-08-14 10:01:48 +10:00
luisramos0
8681618490 Fixed CodeClimate scss feedback on cookies banner and policy page css 2018-08-14 10:01:48 +10:00
luisramos0
ccd5147b11 Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration 2018-08-14 10:01:48 +10:00
luisramos0
1c20967ca4 Added a button to close the cookies policy page at the bottom of the page to improve UX on mobile 2018-08-14 10:01:48 +10:00