raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-21 00:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,725 Commits 18 Branches 454 Tags
d0f48687e28e7094de4580e6e04691cb2a0799ec
Commit Graph

4617 Commits

Author SHA1 Message Date
Pau Pérez Fabregat
fb339d6a99 Merge pull request #5263 from luisramos0/pdp 
[Mobile] Restyle product modal
 2020-06-03 08:55:20 +02:00
Luis Ramos
c9a7a6e897 Merge branch 'master' into 3-0-stable-jun-2 2020-06-02 16:00:45 +01:00
Luis Ramos
89c461662f Merge pull request #5502 from Matt-Yorkley/dropshadow-regression 
[mobile ux] Fix missing drop-shadow
 2020-06-02 12:07:37 +01:00
Cillian O'Ruanaidh
94b85fb9e3 Fix up Code Climate issues with Open Street Map code. 2020-05-31 18:42:55 +02:00
Cillian O'Ruanaidh
deafe32354 Add support for using Open Street Map on the Map and Group pages. 
The map is displayed using https://leafletjs.com/

To enable Open Street Map go to the Admin -> Configuration -> Content section and click 'Open Street Map Enabled'.

The 'Open Street Map Provider Name' setting can be used to configure different tile providers thanks to the Leaflet-providers extension (https://github.com/leaflet-extras/leaflet-providers)

Some tile providers require an API key, this can provided in JSON format e.g. '{ apiKey: 123 }' in the 'Open Street Map Provider Options' setting.

Each tile provider has their own usage policy so this should be checked before enabling Open Street Map.

The search field for the Open Street Map works differently than searching on Google Maps. It matches producers by their name or address because it was easier to implement instead of matching place names all over the world.
 2020-05-31 18:42:55 +02:00
Cillian O'Ruanaidh
e6fa296d03 Remove spinjs-rails dependency and use spinning-circles.svg instead. 
For https://github.com/openfoodfoundation/openfoodnetwork/issues/3491

The spinjs-rails gem provides a CSS3 a spinning activity indicator. This commit removes the gem so we don't have to keep the gem up-to-date and uses the spinning-circles.svg which is used already in other places.

The spinjs spinner can be seen when viewing or editing taxonomies in /admin/taxonomies. It is loaded from the .ajaxStart call in app/assets/javascripts/admin/spree/progress.coffee

To test or restyle this spinner you can change the display property of the #progress element in app/assets/stylesheets/admin/components/progress.scss to 'block'.
 2020-05-29 18:04:49 +01:00
Luis Ramos
6e842212ea Always throw back error even if there is an error loading the flash for example translating the error message 2020-05-29 14:45:22 +01:00
Luis Ramos
3e0839de73 Increase warning sign line height so that it renders correctly on smaller screens 2020-05-29 12:56:22 +01:00
Luis Ramos
2c55bef544 Remove unnecessary padding 
This is looking broken in ipad mini 3
 2020-05-29 12:56:22 +01:00
Luis Ramos
a376a17f64 Group related properties together 2020-05-29 12:56:20 +01:00
Matt-Yorkley
c73defa8a1 Merge pull request #5494 from Matt-Yorkley/group-maps-fix 
Fix group maps
 2020-05-29 12:05:55 +02:00
Luis Ramos
bb8401a0fc Merge pull request #5444 from luisramos0/dead_js_code 
Remove some dead JS code related to admin sub menus
 2020-05-28 19:54:42 +01:00
Luis Ramos
83edfbd1dd Merge pull request #5266 from luchiago/improve-order-cancellation-email 
Improve order cancellation email
 2020-05-28 19:48:26 +01:00
Luis Ramos
6f0106251e Move product-img css class to parent div so we can center align it and keep existing img styling 2020-05-27 19:16:31 +01:00
Matt-Yorkley
953e1f8ff4 Adjust z-index on overlapping elements to fix missing drop-shadow regression 2020-05-26 12:59:51 +02:00
Luis Ramos
513ee6393a Make product modal display image on the right for medium screens like it was doing for large screens 2020-05-25 19:31:02 +01:00
Luis Ramos
1e0e3a063d Add margin right to product modal title so that the close button doesnt overlap with it 2020-05-25 19:14:40 +01:00
Matt-Yorkley
8095371304 Ensure OpenStreetMap credits are aways shown with map and fix credits positioning for /groups page map display 2020-05-25 14:12:12 +02:00
Matt-Yorkley
e03005ed56 Fix maps and tidy up groups map code 2020-05-25 13:52:56 +02:00
Luis Ramos
f34f693620 Merge branch 'master' into 3-0-stable-may-22 2020-05-22 22:54:19 +01:00
Pau Pérez Fabregat
a5b4c5316c Merge pull request #5458 from Matt-Yorkley/oc-form-ui-bug 
Fix display issue on order cycle edit form
 2020-05-22 19:31:41 +02:00
Pau Pérez Fabregat
f1dbad1007 Merge pull request #5466 from Matt-Yorkley/shop-search-fix 
Fix search bar in /shops and /groups
 2020-05-22 18:40:27 +02:00
Pau Pérez Fabregat
17e77df14f Merge pull request #5451 from Matt-Yorkley/oc-selector-fix 
Fix tab-buttons element overlapping order cycle selector
 2020-05-22 18:39:10 +02:00
Luis Ramos
9a71ffc093 Merge pull request #5438 from Matt-Yorkley/cart-stock-ux 
Cart stock UX
 2020-05-22 14:21:16 +01:00
Luis Ramos
12f512e98b Move arrow on OC selector a little to the right so it's centered between end of text (if max length reached) and border 2020-05-21 15:41:26 +01:00
Luis Ramos
b2bfe28173 Remove extra right pad on OC selector, in mobile, this will make the selector be centered 2020-05-21 15:38:55 +01:00
Luis Ramos
ed14a92c7b Make OC selector wider to support more characters where there is enough space for that 2020-05-21 15:38:54 +01:00
Pau Pérez Fabregat
16dfb3c7e9 Merge pull request #5408 from luisramos0/columns_params 
[Spree 2.1] Add missing permitted param to Column Preferences controller
 2020-05-21 14:41:30 +02:00
Luis Ramos
76b721b663 Merge pull request #5457 from Matt-Yorkley/cart-fix 
Fix cart fields sharing same scope
 2020-05-19 19:31:49 +01:00
Matt-Yorkley
3df2d4721b Fix search bar in /shops and /groups 2020-05-19 14:00:20 +02:00
Matt-Yorkley
4a837e8c07 Fix display issue on order cycle form 
Some of the form elements on the first OC edit page were covered up by the save bar in some cases. this ensures they are always visible and clickable.
 2020-05-19 11:56:41 +02:00
Matt-Yorkley
05e6f5792d Fix cart fields sharing same scope 
All cart page quantity fields were displaying a single max quantity instead of a different value for each one.
 2020-05-19 10:23:12 +02:00
Lucas Hiago
ba30f55e70 Add fullwidth for table selector 2020-05-18 22:53:46 -03:00
Eduardo
473b4c63c4 add Shipping Method filter to admin/orders page 2020-05-18 18:46:43 -03:00
Matt-Yorkley
e3c337ef7e Fix mixed error display issue 2020-05-18 16:41:57 +02:00
Matt-Yorkley
d70174becc Use fresh scope for each quantity field 2020-05-18 16:28:07 +02:00
Matt-Yorkley
f9f76f9082 Move reused available stock logic to service 2020-05-18 16:19:49 +02:00
Matt-Yorkley
111e700799 Update invalid input feedback 2020-05-18 16:14:14 +02:00
Matt-Yorkley
f7b4717f29 Improve validation code 2020-05-18 14:51:11 +02:00
Matt-Yorkley
63e4430ea4 Update cart page links to be disabled when changes are required and form is unsaved 
See: https://stackoverflow.com/questions/23425254/enable-disable-anchor-tags-using-angularjs
 2020-05-18 14:51:08 +02:00
Matt-Yorkley
5dd801b432 Fix tab-buttons element overlapping order cycle selector 2020-05-18 14:27:05 +02:00
Luis Ramos
ea8157a5c6 Merge pull request #5304 from dacook/5299-orders-filter-several-tags 
5299 Impossible to filter orders with several tags
 2020-05-18 11:25:54 +01:00
Luis Ramos
6c81c19f00 Remove dead code 2020-05-16 14:19:25 +01:00
Luis Ramos
4292636e70 Remove close button in product modal 2020-05-15 12:16:19 +01:00
Luis Ramos
d95b2a97b0 Add missing padding above close button (both for the case with image or just with text) and also below product image 2020-05-15 12:12:07 +01:00
Luis Ramos
edaf419857 Use rem instead of px or em 2020-05-15 12:12:07 +01:00
Luis Ramos
38bc076c77 Fix some rubocop issues 2020-05-15 12:12:07 +01:00
Luis Ramos
30fe457cb5 Make product modal show close button only if there is a scroll bar 2020-05-15 12:12:07 +01:00
Luis Ramos
3a512478d6 Improve the mobile registration modal by adding a margin 2020-05-15 12:12:07 +01:00
Luis Ramos
4b63893377 Improve mobile login modal with a margin 2020-05-15 12:12:07 +01:00