raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-20 00:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 15 Branches 453 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

28175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maikel
d254df7ccc Merge pull request #5073 from Matt-Yorkley/mobile-checkout 
[Mobile UX] Order cycle section updates
v2.8.1 		2020-03-27 15:34:19 +11:00
Pau Pérez Fabregat
a218eab67b Merge pull request #4987 from Matt-Yorkley/3-0-packing 
[Spree 2.1] Packing report deleted variants
 2020-03-26 17:37:51 +01:00
Pau Pérez Fabregat
8caf10f634 Merge pull request #5079 from openfoodfoundation/dependabot/bundler/unicorn-5.5.4 
Bump unicorn from 5.5.3 to 5.5.4
 2020-03-26 17:32:17 +01:00
Transifex-Openfoodnetwork
2e98b0b5c1 Updating translations for config/locales/en_GB.yml 2020-03-27 01:40:20 +11:00
Matt-Yorkley
2966dd9536 Update all locales with the latest Transifex translations 2020-03-26 14:25:34 +01:00
Matt-Yorkley
21e1c0ed0b Merge pull request #5025 from openfoodfoundation/transifex 
Transifex
 2020-03-26 14:22:38 +01:00
Matt-Yorkley
48b99d02b9 Merge pull request #5060 from Matt-Yorkley/weight-calculator 
Fix weight calculator
 2020-03-26 14:19:21 +01:00
Pau Pérez Fabregat
f17a2eeaea Merge pull request #5062 from luisramos0/prop_bug 
Fix broken new property button in properties page (regression from removing spree_backend)
 2020-03-26 11:35:47 +01:00
Pau Pérez Fabregat
18419d0276 Merge pull request #5043 from luisramos0/fix_cookies 
Fix cookies policy helper spec in rails 4
 2020-03-26 11:23:49 +01:00
Pau Pérez Fabregat
1c2815d2b7 Merge pull request #5044 from luisramos0/add_spring 
[Spree 2.1] Re-add spring and newrelic_rpm
 2020-03-26 11:23:19 +01:00
Pau Pérez Fabregat
bd19d8b0bd Merge pull request #5042 from luisramos0/api_base 
Make explicit the namespace of the BaseController for api controllers
 2020-03-26 11:21:27 +01:00
Pau Pérez Fabregat
b3a47964e6 Merge pull request #5033 from luisramos0/ent_fees_data_types 
[Spree 2.1] Adapt EnterpriseFeeSummary report code to slightly different rails 4 sql data conversion
 2020-03-26 11:20:44 +01:00
Pau Pérez Fabregat
9daa40ce9c Merge pull request #5028 from luisramos0/remove_attr_accessible 
[Spree 2.1] Remove new attr_accessible entries
 2020-03-26 11:20:08 +01:00
Pau Pérez Fabregat
f70e155b1b Merge pull request #4984 from Matt-Yorkley/3-0-cart-route 
[Spree 2.1] Fix cart page update
 2020-03-26 11:14:07 +01:00
Maikel Linke
4bcd665379 Handle all line items without unit_value in weight calculation 2020-03-26 17:13:29 +11:00
Matt-Yorkley
e63dbcfa89 Fix some SCSS linting warnings 2020-03-25 23:12:23 +01:00
Matt-Yorkley
c3283adcf5 Show full-width ordercycle subheader on tablet and below 2020-03-25 23:12:23 +01:00
Matt-Yorkley
b2ed69831b Adjust style contexts 2020-03-25 23:12:23 +01:00
Matt-Yorkley
7daba62f43 Update colours for different order cycle sidebar cases 2020-03-25 23:12:23 +01:00
Matt-Yorkley
a08020490d Define new colour and use variable where already in use 2020-03-25 23:12:23 +01:00
Matt-Yorkley
eb4d970bc7 Adjust positioning for order cycle sidebar 2020-03-25 23:12:23 +01:00
Matt-Yorkley
7a3549209f Use 4 columns on checkout sidebar 2020-03-25 23:12:23 +01:00
Matt-Yorkley
52ebd1b402 Remove order cycle popovers; these styles are no longer used 2020-03-25 23:12:08 +01:00
Matt-Yorkley
a3a26f704f Extract re-used box-shadow style 2020-03-25 23:07:39 +01:00
Matt-Yorkley
cff8f6dd96 Add box-shadow to distributor header for cart, checkout, and order confirmation pages 2020-03-25 23:07:39 +01:00
Matt-Yorkley
81537d92cf Extract styles for distributor header 
These styles are used in shop, cart, checkout, order confirmation. Not just shop.
 2020-03-25 23:07:39 +01:00
Matt-Yorkley
91e88bd028 Allow conditional use of order cycle sidebar 
We need to re-use the "shopping_shared/header" partial in multiple places, but we don't always want the (nested) order cycle sidebar inside it.
 2020-03-25 23:07:39 +01:00
Matt-Yorkley
f5e254a105 Remove quick fix for hiding oc selector 2020-03-25 23:07:39 +01:00
Sigmund Petersen
b41b5d0395 Update Slack invitation link 2020-03-25 20:38:45 +01:00
dependabot-preview[bot]
296d2e5edb Bump unicorn from 5.5.3 to 5.5.4 
Bumps [unicorn](https://yhbt.net/unicorn/) from 5.5.3 to 5.5.4.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-03-25 19:17:31 +00:00
Luis Ramos
ac0a62e962 Merge pull request #5050 from Matt-Yorkley/bullet_tweaks 
Performance tweaks 2
 2020-03-25 18:32:49 +00:00
Matt-Yorkley
0cc5cbd1d2 Merge pull request #5038 from luisramos0/strong_params_prod 
[Spree 2.1] Implement strong params in products, variants, variant_overrides and resource controllers
 2020-03-25 18:35:58 +01:00
Luis Ramos
523faa670d Remove FoundationRailsHelper, this is dead code now 2020-03-25 17:31:56 +00:00
Luis Ramos
2c5db8935b Merge pull request #5022 from Matt-Yorkley/performance_tweaks 
Performance tweaks
 2020-03-25 15:42:07 +00:00
Luis Ramos
e5e9325499 Fix paper_trail custom_data for order_cycle, custom data must be a string, cant be an array 2020-03-25 15:35:51 +00:00
Luis Ramos
2e4f8003b6 Fix group factory in rails 4 
params[:address] was breaking the creation of the EnterpriseGroup
 2020-03-25 15:32:16 +00:00
Luis Ramos
24c8f38111 Restructure spec to avoid variable names with numbers 2020-03-25 15:48:57 +01:00
Luis Ramos
b801bffcd9 Merge pull request #5030 from Matt-Yorkley/reports-loading 
Improve reports performance
 2020-03-25 12:54:34 +00:00
Yuhao Gao
60d9edb185 fix translation missing in order cycles outgoing page (closed #4937) 2020-03-25 21:51:13 +09:00
Luis Ramos
434b68b019 Merge pull request #5048 from Matt-Yorkley/3-0-user-spec 
Ensure perform_deliveries is correctly set in user email spec
 2020-03-25 11:52:43 +00:00
Luis Ramos
f1b64e90e0 Add comment to explain unusual fix 2020-03-25 11:49:14 +00:00
Matt-Yorkley
433ae00818 Ensure :info log level is set in Rails 4 2020-03-25 11:39:03 +00:00
Matt-Yorkley
7bc29769cd Fix logging configs for Rails 4 2020-03-25 11:38:29 +00:00
Matt-Yorkley
483d847b00 Use eager_load = true in production and staging environments 2020-03-25 11:36:33 +00:00
Luis Ramos
9af4bb9757 Use create instead of build so that we test with callbacks 2020-03-25 11:22:40 +00:00
Luis Ramos
95ba1fd02c Merge pull request #5065 from luisramos0/upgrade_deps 
[Spree 2.1] Upgrade some dependencies... rails 4.0.13 :-)
 2020-03-25 11:04:13 +00:00
Luis Ramos
c02a3e919f Merge pull request #5039 from luisramos0/strong_params_ent 
[Spree 2.1] Implement strong params in enterprises, enterprise_groups, enterprise_roles, customers and customer_details controllers
 2020-03-25 10:53:01 +00:00
Luis Ramos
b7cb95ae3e Fix problem in PermittedAttributes::Address namespace 2020-03-25 10:52:23 +00:00
Luis Ramos
6b62c8aafd Extract permitted attributes to separate service 2020-03-25 10:52:23 +00:00
Luis Ramos
e5f56c19c0 Switch to using PermittedAttributes::Address instead of spree version of it that will be removed later 2020-03-25 10:52:23 +00:00