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
15,602 Commits 20 Branches 451 Tags
b00fbd69aecfe9aa1d439e89eb185f3dca887db1
Commit Graph

15602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt-Yorkley
b00fbd69ae Update Fragment Caching for Rails 4 
Rails 4 introduced "automagically" modified cache keys, that included a digest in the key on any cache entry related to views. This is not what we want at all, fixed here with the `skip_digest: true` option.
 2020-05-22 14:22:21 +02:00
Matt-Yorkley
a9abe48ede Re-enable cache invalidation test 2020-05-22 14:21:45 +02:00
Matt-Yorkley
04ffe7b911 Fix expectations and mock responses for Rails 4 
Mocking these objects is working differently in Rails 4, and utilising `#and_call_original` helped to ensure different parts of the codebase were receiving the correct response objects (AR relations, etc).
 2020-05-22 14:21:45 +02: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
Pau Pérez Fabregat
050e83e745 Merge pull request #5410 from luisramos0/fix_some_specs 
[Spree 2] Make api/enterprises_controller_spec less flaky
 2020-05-21 13:45:39 +02:00
Luis Ramos
942dde62ff Merge pull request #5464 from luisramos0/3-0-action-caching 
[Spree 2.1] Add actionpack-action_caching gem to make action caching work again
 2020-05-19 18:47:55 +01:00
Luis Ramos
2e9f911958 Add actionpack-action_caching to support action caching 2020-05-19 12:06:24 +01:00
Luis Ramos
d1eebe1cfb Merge pull request #5426 from luisramos0/3-0-stable-may13 
[Spree 2.1] Merge master into 3-0-stable
 2020-05-18 15:05:11 +01:00
Luis Ramos
19da0ba969 Merge branch 'master' into 3-0-stable-may13 2020-05-13 19:50:32 +01:00
Luis Ramos
5f7c1474a2 Merge pull request #5377 from manvil/1782_enterprise_at_same_address 
Handling multiple enterprises at the same location
 2020-05-13 19:31:14 +01:00
Luis Ramos
1671184a3c Merge pull request #5375 from luisramos0/sample_order 
[Spree 2.1] OFN v3 comes with sample orders :-)
 2020-05-13 12:04:06 +01:00
Luis Ramos
be998a9eb6 Reload shipment before shipping otherwise shipment stays as ready but with shipped_at defined 2020-05-13 12:00:37 +01:00
Luis Ramos
ef2d7f9485 Merge pull request #5330 from openfoodfoundation/mobile-ux-filters 
[mobile ux] Merge search and filter epic to master
 2020-05-13 08:59:32 +01:00
Matt-Yorkley
598071fa78 Remove conflicting "clear search" buttons added by Chrome 2020-05-12 18:59:15 +02:00
Matt-Yorkley
265a8ed573 Move messages and products form outside of row and columns to enable full-width 2020-05-12 18:24:10 +02:00
Luis Ramos
83381ad439 Relax array order verification 2020-05-12 15:46:23 +01:00
Luis Ramos
7804c740a6 Add name to permitted params and fix some rubocop issues 2020-05-12 15:35:47 +01:00
Luis Ramos
41645e8351 Merge pull request #5334 from coopdevs/output-logs-in-djs-log-file 
Output logs in Delayed Job's log file
 2020-05-12 10:05:26 +01:00
Luis Ramos
5f4882fc32 Merge pull request #5403 from openfoodfoundation/dependabot/bundler/ddtrace-0.35.2 
Bump ddtrace from 0.35.1 to 0.35.2
 2020-05-12 08:39:26 +01:00
dependabot-preview[bot]
1114e062b5 Bump ddtrace from 0.35.1 to 0.35.2 
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb) from 0.35.1 to 0.35.2.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases)
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md)
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.35.1...v0.35.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-05-11 22:07:52 +00:00
Luis Ramos
dcd097a22e Merge pull request #5231 from pacodelaluna/add-dfc-provider-engine 
Add DFC Provider engine
 2020-05-11 20:27:21 +01:00
Matt-Yorkley
ab143ceaed Merge pull request #5352 from pacodelaluna/change-date-displayed-on-sales-tax-report 
Change date displayed on sales_tax reports
v2.9.8 		2020-05-11 09:56:38 +02:00
Matt-Yorkley
0cd4ad0a1a Ensure large amount of search text doesn't break layout with clear all button 2020-05-10 09:44:12 +02:00
Matt-Yorkley
9f882a8674 Ensure search results feedback wraps nicely onto next line 2020-05-10 09:44:12 +02:00
Matt-Yorkley
cb9c56d8aa Ensure correct left-alignment on text in search results feedback 2020-05-10 09:44:12 +02:00
Matt-Yorkley
dee793a392 Change join word between the two filter sets to be "and", to match the actual logic 2020-05-10 09:44:12 +02:00
Matt-Yorkley
7e6683581a Remove full stop from translation 
This doesn't fit with the new syntax structure
 2020-05-10 09:44:12 +02:00
Matt-Yorkley
b78976fcd7 Ensure consistent styling in both "no results" and "searching for" text 2020-05-10 09:44:12 +02:00
Matt-Yorkley
82b11d6947 Ensure join words are not bold 2020-05-10 09:44:12 +02:00
Matt-Yorkley
a75d3276a4 Include applied filters list in "no results" feedback 2020-05-10 09:44:12 +02:00
Matt-Yorkley
a1435e78c9 Extract applied filters feedback to partial 2020-05-10 09:44:12 +02:00
Matt-Yorkley
7be85d1dab Use bold font with teal colour for both applied taxons and applied properties 2020-05-10 09:44:12 +02:00
Matt-Yorkley
483a654d31 Add join word "or" when both categories and properties are present 
Previously for example with "Organic" property and "Fruit" and "Nuts" categories it rendered as: "Fruit or Nuts Organic" instead of: "Fruit or Nuts or Organic"
 2020-05-10 09:44:12 +02:00
Matt-Yorkley
f6b910b38a Fix clear search (x) button position on some layouts 
Hopefully this will work on iPhones as well...?
 2020-05-10 09:44:12 +02:00
Matt-Yorkley
ea06ec7ede Remove smaller (less than 1em) scaling in search bar on mobile 2020-05-10 09:44:12 +02:00
Matt-Yorkley
07ac7dd9c7 Add explicit 'search' input type to search field. 
In theory this should improve some of the custom-keyboard functionality added by mobiles, but the implementations will be vary...
 2020-05-10 09:44:12 +02:00
Matt-Yorkley
71fb3b1845 Focus search field after it's cleared, ready for immediate typing of new search term on mobile 2020-05-10 09:44:12 +02:00
Matt-Yorkley
e0cb514cad Add hover state to filters button with darker background 2020-05-10 09:44:12 +02:00
Matt-Yorkley
5ceaff24e9 Darken overlay background colour to reduce distraction 2020-05-10 09:44:11 +02:00
Matt-Yorkley
a7771a20c4 Adjust border-radius on filters button 2020-05-10 09:44:11 +02:00
Matt-Yorkley
03afae01b3 Decrease sidebar width on mobile for more tapping space 2020-05-10 09:44:11 +02:00
Matt-Yorkley
96c6da304a Increase margin between filter selectors 2020-05-10 09:44:11 +02:00
Matt-Yorkley
2964ec138d Update display of join words in filters list and rearrange code a bit for clarity 
Here we need to build a really dynamic structure on the page like "Results for: <search-term> in <filter1> or <filter2>" and the styling on each of the words needs to be a bit different, specifically the filter terms need to be differently styled to the join words like "in" and "or". We have to generate those bits on the Angular side, but they also have to be wrapped in HTML in a specific way.

$sce.trustAsHtml() marks the injected HTML as "safe" (in relation to security issues like XSS). In this case the injected content doesn't involve any user-defined data, so it should be fine.
 2020-05-10 09:44:11 +02:00
Matt-Yorkley
14d928c39d Fix feature specs where UI has changed 2020-05-10 09:44:11 +02:00
Matt-Yorkley
6b66787004 Update "no results" layout on mobile and tablet 2020-05-10 09:44:11 +02:00
Matt-Yorkley
4b695014e4 Update "no results" styling 2020-05-10 09:44:11 +02:00
Matt-Yorkley
c9bfccf465 Update styling on search feedback bar 2020-05-10 09:44:11 +02:00
Matt-Yorkley
026b98022c Add clear search button in shop searchbar 2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff69389bb0 Make search bar "sticky" for tablets and mobile 2020-05-10 09:44:11 +02:00
Matt-Yorkley
f24969edb1 Remove gutter padding on shop content to gain a bit more horizontal real-estate 2020-05-10 09:44:11 +02:00