raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,069 Commits 20 Branches 451 Tags
2bcadd52e877aa2bd79a34c02030c6d892cb0cef
Commit Graph

16069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
2bcadd52e8 Hide "Take me shopping" button on /shop and /shops pages 2020-06-18 22:21:55 +02:00
Matt-Yorkley
387a5ec950 Implement "Take me shopping" button 2020-06-18 22:21:55 +02:00
Matt-Yorkley
10b8470e29 Set a fixed width for cart sidebar on tablet up 2020-06-18 22:21:55 +02:00
Matt-Yorkley
4acb08e52b Update hamburger menu icon 2020-06-18 22:21:55 +02:00
Matt-Yorkley
786348bc71 Remove colon from cart total text 2020-06-18 22:21:55 +02:00
Matt-Yorkley
8ac971651c Fix flaky spec 2020-06-18 22:21:55 +02:00
Matt-Yorkley
459e53f43d Adjust specs for new cart display 2020-06-18 22:21:55 +02:00
Matt-Yorkley
2f2ef28351 Use links instead of buttons and fix up styles 2020-06-18 22:21:55 +02:00
Matt-Yorkley
b74b9fbd1d Shift sidebar down vertically (below navigation) and bring navigation up (z-index) 2020-06-18 22:21:55 +02:00
Matt-Yorkley
4a0f43a831 Ensure cart item count is visible in header cart button (for screens smaller than desktop) 2020-06-18 22:21:55 +02:00
Matt-Yorkley
439674ad9c Make cart view fullwidth on mobile 2020-06-18 22:21:55 +02:00
Matt-Yorkley
8ca0119f5d Add empty cart feedback 2020-06-18 22:21:55 +02:00
Matt-Yorkley
95686eda78 Update translations 2020-06-18 22:21:54 +02:00
Matt-Yorkley
7efccac7bb Add close functionality to close button 2020-06-18 22:21:54 +02:00
Matt-Yorkley
4362b8b25b Improve line spacing on cart product list 2020-06-18 22:21:54 +02:00
Matt-Yorkley
be8c0f3600 Remove old cart dropdown view and directive 2020-06-18 22:21:54 +02:00
Matt-Yorkley
33a2dd100e Add new layout for cart sidebar 2020-06-18 22:21:54 +02:00
Matt-Yorkley
400fce8ef9 Separate cart page and cart dropdown styles 2020-06-18 22:21:54 +02:00
Matt-Yorkley
b4e5542e5f Extract re-usable sidebar styes 2020-06-18 22:21:54 +02:00
Matt-Yorkley
a8b981e9cd Add product thumbnais to serializer for cart dropdown images 2020-06-18 22:21:54 +02:00
Matt-Yorkley
b1ce7f2c15 Simplify product naming in cart 2020-06-18 22:21:54 +02:00
Matt-Yorkley
85abfd2056 Create Cart sidebar and controller 2020-06-18 22:21:54 +02:00
Matt-Yorkley
7290d68687 Update all locales with the latest Transifex translations 2020-06-18 20:46:41 +02:00
Luis Ramos
208623bb0a Merge pull request #5635 from Matt-Yorkley/map-icons 
Ensure map icon URLs are correctly generated with fingerprints
 2020-06-18 18:02:47 +01:00
Matt-Yorkley
130f639b61 Rename service and use #call 2020-06-18 17:14:50 +02:00
Pau Pérez Fabregat
63f8830eba Merge pull request #5530 from cillian/remove-spinjs 
Remove spinjs-rails dependency and use spinning-circles.svg instead.
 2020-06-18 16:47:09 +02:00
Matt-Yorkley
5338e782f8 Extract serializer helper method to service so the method isn't globally available 2020-06-18 16:44:15 +02:00
Luis Ramos
66f955f00d Merge pull request #5597 from luisramos0/bo_stripe_payments 
[Spree 2.1] Make backoffice stripe payments work in rails 4
 2020-06-18 14:50:27 +01:00
Matt-Yorkley
75e57e5c2c Call #image_path on map cluster icon 2020-06-18 14:14:41 +02:00
Matt-Yorkley
9a39cbbbc5 Convert MapConfiguration service to .js.erb.coffee 2020-06-18 14:14:41 +02:00
Matt-Yorkley
551daaadea Use #image_path correctly on map marker icons 2020-06-18 14:14:41 +02:00
Matt-Yorkley
2143122a30 Add helper method for correctly generating with fingerprints in Serializers 2020-06-18 14:14:39 +02:00
Pau Pérez Fabregat
e02191078d Merge pull request #5595 from coopdevs/improve-payments-report-performance 
Remove N+1 fetching payments in report
 2020-06-18 12:32:40 +02:00
Pau Pérez Fabregat
762b3a4a59 Merge pull request #5618 from openfoodfoundation/dependabot/bundler/httparty-0.18.1 
Bump httparty from 0.17.3 to 0.18.1
 2020-06-18 12:30:18 +02:00
Pau Pérez Fabregat
98490efbb3 Merge pull request #5600 from openfoodfoundation/transifex 
Transifex
 2020-06-18 12:29:10 +02:00
Matt-Yorkley
7cc47d652c Merge pull request #5624 from Matt-Yorkley/rails4-image-precompile 
v3 image precompile
 2020-06-18 12:01:23 +02:00
Luis Ramos
52dd7ce916 Improve comment about httparty 2020-06-18 10:12:37 +01:00
dependabot-preview[bot]
669330ee90 Bump httparty from 0.17.3 to 0.18.1 
Bumps [httparty](https://github.com/jnunemaker/httparty) from 0.17.3 to 0.18.1.
- [Release notes](https://github.com/jnunemaker/httparty/releases)
- [Changelog](https://github.com/jnunemaker/httparty/blob/master/Changelog.md)
- [Commits](https://github.com/jnunemaker/httparty/compare/v0.17.3...v0.18.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-18 10:12:37 +01:00
Transifex-Openfoodnetwork
20c41ce69e Updating translations for config/locales/it.yml 2020-06-18 19:11:23 +10:00
Luis Ramos
f6e3e01a10 Extract permitted payment_source attributes from checkout to use them in the backoffice payments controller 
Add spec to verify payment source attributes are passed
 2020-06-18 09:54:34 +01:00
Transifex-Openfoodnetwork
b5a67e65c5 Updating translations for config/locales/es.yml 2020-06-18 17:42:06 +10:00
Transifex-Openfoodnetwork
da7d36cd0e Updating translations for config/locales/ca.yml 2020-06-18 17:41:48 +10:00
Pau Pérez Fabregat
8f885dd1c5 Merge pull request #5628 from Matt-Yorkley/flaky-caching-spec 
Flaky caching spec
 2020-06-18 09:37:45 +02:00
Transifex-Openfoodnetwork
fba5f96968 Updating translations for config/locales/nb.yml 2020-06-18 17:33:09 +10:00
Transifex-Openfoodnetwork
0c634c566c Updating translations for config/locales/fr.yml 2020-06-18 17:08:17 +10:00
Transifex-Openfoodnetwork
a9ed081488 Updating translations for config/locales/en_FR.yml 2020-06-18 17:01:02 +10:00
Luis Ramos
37cbcf4172 Merge pull request #5605 from luisramos0/spree_rev 
Update spree revision and upgrade ransack to 1.2.3
 2020-06-17 20:00:25 +01:00
Luis Ramos
06a37d8ff0 Merge pull request #5566 from rioug/5132-no-error-when-product-csv-malformed 
Add handling of CSV::MalformedCSVError for product_importer
 2020-06-17 19:58:35 +01:00
Luis Ramos
d0bb625c19 Merge pull request #5593 from coopdevs/fix-report-order-link 
Fix link from report to order
 2020-06-17 19:55:40 +01:00
Luis Ramos
5163317b10 Merge pull request #5623 from luisramos0/zones 
Make Zones editable again
 2020-06-17 19:41:20 +01:00