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

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rob H
61f303ced2 Merge pull request #2373 from oeoeaio/fix-import-date-filter 
Reimplement import date filter as an actual Filter
 2018-06-15 16:53:22 +10:00
Rob Harrington
d0f8e9fba6 Reimplement import date filter as an actual Filter 2018-06-15 11:31:47 +10:00
Maikel
46f5f5061a Merge pull request #2377 from mkllnk/2376-fix-paypal-redirects 
Pass on redirect path instead of URL
 2018-06-15 10:16:31 +10:00
Maikel Linke
561a73e911 Pass on redirect path instead of URL 
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/2376

The checkout doesn't deal with absolute URLs since
fc2cc09ea5.
 2018-06-14 16:49:52 +10:00
Pau Pérez Fabregat
24c6b940f6 Merge pull request #2370 from openfoodfoundation/transifex 
Transifex
 2018-06-13 12:03:34 +02:00
Pau Pérez Fabregat
d5310eed6c Merge pull request #2371 from HugsDaniel/2359_js_libs_not_found_or_not_defined 
Changed require syntax to fit jquery-ui-rails v<5.0
 2018-06-13 09:12:57 +02:00
Rob Harrington
c72a2fda91 Use placed_at state to determine whether to remove orphaned proxy orders 2018-06-13 13:46:11 +10:00
Rob Harrington
d9ddad554e Prevent proxy_orders for active or complete order cycles from being removed automatically by ProxyOrderSyncer 2018-06-13 13:46:11 +10:00
Rob Harrington
ac309ffaf5 Rename obsolete_proxy_orders to orphaned_proxy_orders 2018-06-13 13:46:11 +10:00
Maikel
51bbf64b10 Merge pull request #2363 from oeoeaio/update-contributors 
Update contributors list in the README
 2018-06-13 11:11:29 +10:00
Hugo Daniel
6e2966d7e8 Changed require syntax to fit jquery < 5.0 2018-06-12 15:59:41 +02:00
Matt-Yorkley
ea0d24a5bf Re-word test names for clarity 2018-06-12 13:20:00 +01:00
Transifex-Openfoodnetwork
644c2e8788 Updating translations for config/locales/nb.yml 2018-06-12 20:33:43 +10:00
Transifex-Openfoodnetwork
03fb5e7ccf Updating translations for config/locales/fr.yml 2018-06-12 20:03:03 +10:00
Transifex-Openfoodnetwork
6908635822 Updating translations for config/locales/pt.yml 2018-06-12 19:36:28 +10:00
Pau Perez
78e59d059a Show product import's UI only to superadmins 
We still need to iterate on its implementation and it's too early to
make it publicly available.
 2018-06-11 19:50:53 +02:00
Rob Harrington
56040685a0 Add Matt, Pau and Enrico to the contributors list on the README 2018-06-10 18:26:50 +10:00
Matt-Yorkley
c7f7541e2d Admin order customer details spec 2018-06-10 02:32:59 +01:00
Matt-Yorkley
d90e362e6f Remove guest checkout radio buttons from admin order view 2018-06-09 02:43:42 +01:00
Matt-Yorkley
7bef474efd Admin Order guest checkout status 2018-06-09 02:43:42 +01:00
Pau Pérez Fabregat
4c9dd4e8a1 Merge pull request #2349 from robotscissors/issue-2278-add-missing-image 
Add image back into server for background
 2018-06-08 19:12:01 +02:00
luisramos0
9e0732ceae removed uppercase from state on shops and producers lists in the frontoffice 2018-06-08 14:11:53 +01:00
Pau Pérez Fabregat
bb3ae976c6 Merge pull request #2364 from coopdevs/update-template 
Ask devs to tell whether we should test on mobile
 2018-06-08 14:37:16 +02:00
Pau Perez
fed60cf961 Ask devs to tell whether we should test on mobile 2018-06-08 10:01:04 +02:00
Pau Pérez Fabregat
b77091f87d Merge pull request #1969 from coopdevs/feature/do-not-upcase-state-abbr 
Do not upcase State abbreviation
 2018-06-08 08:36:55 +02:00
Rob Harrington
5cbc4cbf30 Use scoped keys for table headers in saved card partial 2018-06-08 15:30:08 +10:00
Rob Harrington
18c211e97c Ensure that savedCreditCards always exists 2018-06-08 15:30:08 +10:00
Rob Harrington
6a202d9446 Use more descriptive name for after_save callback method: :ensure_single_default_card 2018-06-08 15:30:08 +10:00
Rob Harrington
5dbf98f39b Use exists? method to avoid unnecesary loading of credit card array 2018-06-08 15:30:07 +10:00
Rob Harrington
05e4d9007e Update card spec to make the initial roles of cards clearer 2018-06-08 15:30:07 +10:00
Rob Harrington
254f0db97c Automatically select the customer's default card in the checkout 2018-06-08 15:30:07 +10:00
Rob Harrington
e88e963b4c Alter cards interface to allow updating of default card 2018-06-08 15:30:07 +10:00
Rob Harrington
1327b9dc2c Add update method to CreditCardsController 2018-06-08 15:30:07 +10:00
Rob Harrington
d146d3714f Add callbacks to ensure a user always has a default credit card 
(if any exist)
 2018-06-08 15:30:01 +10:00
robotscissors
5c25e85d92 Create dark background on load 2018-06-07 21:53:17 -07:00
Rob Harrington
3619ec0dc8 Add is_default attribute to Spree::CreditCard model 2018-06-08 12:01:10 +10:00
Maikel
0befc714ce Merge pull request #2358 from coopdevs/revert-current-order-argument 
Spree 2.0: Fix GET "/"
 2018-06-07 10:45:06 +10:00
Pau Pérez Fabregat
d4e0d14fe1 Merge pull request #2342 from openfoodfoundation/transifex 
Transifex
 2018-06-06 09:05:29 +02:00
Rob Harrington
4fa09639cb Rewrite user stat query for improved performance of homepage 2018-06-06 16:27:23 +10:00
Pau Pérez Fabregat
7ff7fe4891 Merge pull request #2122 from oeoeaio/subs-unplaced-fees 
Subs: prevent fees from displaying in email when subscription order cannot be fulfilled
 2018-06-06 07:57:18 +02:00
Maikel
9d2c1976e0 Merge pull request #2343 from mkllnk/2212-remove-report-default-filters 
2212 remove report default filters
 2018-06-06 12:19:47 +10:00
Pau Perez
daf12d1300 Revert "Refactor Order#current_order argument" 
This reverts commit ae935202be.
 2018-06-05 18:42:41 +02:00
Pau Perez
89c2733f50 Revert "Removing redundant curly braces" 
This reverts commit 03173d4f7b.
 2018-06-05 18:42:31 +02:00
Pau Perez
32069cffe1 Revert "Removing useless spaces" 
This reverts commit d81b6be259.
 2018-06-05 18:42:19 +02:00
Maikel
494aeb9a14 Merge pull request #2348 from oeoeaio/fix-tabs 
Provide specific tab widths for shop tabs when screen width > medium
 2018-06-05 15:27:40 +10:00
Pau Pérez Fabregat
3283c5158b Merge pull request #1492 from Matt-Yorkley/uk/import2 
Uk/import2
 2018-06-04 09:56:36 +02:00
Pau Pérez Fabregat
cf77bb439a Merge pull request #2337 from Matt-Yorkley/uk/modal_fix 
Fix guest checkout login modal
 2018-06-04 09:56:00 +02:00
Pau Pérez Fabregat
ed116867d4 Merge pull request #2322 from luisramos0/issue1913 
Fixed issue #1913 with expand/collapse of list of producers of a shop
 2018-06-04 09:55:40 +02:00
Rob Harrington
fed0a81159 Add an optional link to Skylight dashboard to footer 2018-06-02 11:55:28 +10:00
Rob Harrington
e3ea60fda5 Process proxy orders even if underlying subscription has been paused or cancelled 2018-06-01 16:57:56 +10:00