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

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Transifex-Openfoodnetwork
477d48e9da Updating translations for config/locales/nb.yml [skip ci] 2016-07-15 19:46:47 +10:00
Maikel Linke
ddb54d1924 Delete fee on payment method if payment invalid 
PayPalExpress is always creating two payments. The first one is
invalidated and the second one succeeds. Without deleting the old fee on
the invalidated payment, the order lists the fee twice.
 2016-07-15 17:43:26 +10:00
Maikel Linke
c6bd548413 Don't trigger deployment for transifex branch 2016-07-15 11:19:19 +10:00
Maikel Linke
af6d0ec107 Remove unused code from order confirmation page 2016-07-13 13:54:55 +10:00
Maikel Linke
e693f71775 Inject only needed enterprises into order confirmation page 2016-07-13 13:54:32 +10:00
Maikel Linke
0ff1c95c3d Keep unreferenced entries when dereferencing in js 2016-07-13 12:08:11 +10:00
Maikel Linke
b5bc3a4ca3 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load 2016-07-13 10:01:16 +10:00
Maikel
b587a72eb6 Auto-merged master into transifex on deployment. 2016-07-12 17:44:55 +10:00
Maikel Linke
8e73a2e0d6 Dereference enterprises and taxons later 2016-07-06 16:20:07 +10:00
Rohan Mitchell
e373284934 Fix intermittent spec failure 2016-07-06 16:14:32 +10:00
Rohan Mitchell
b5a9a1b6bf Add translation for business_model_configuration 2016-07-06 16:14:25 +10:00
Rohan Mitchell
13c8f0a230 Improve spec reliability 
It seems that the success message on the customers page is disappearing before the spec can
detect it. This seems unlikely since it's present for 3 s, but this is my best theory right now.
 2016-07-06 15:29:04 +10:00
Maikel Linke
f733c7f207 Include shop enterprise on shop front 2016-07-06 12:45:12 +10:00
Rohan Mitchell
d3c423f7ce Only perform URL search once, not every time map tiles change 2016-07-06 11:56:41 +10:00
Maikel Linke
52f68dac33 Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into enterprise-load 2016-07-06 11:35:26 +10:00
Maikel Linke
f984871b23 Inject only needed enterprises into cart and checkout 2016-07-06 11:14:13 +10:00
Rohan Mitchell
f09cd9e477 Allow groups to be searched by URL 2016-07-06 11:08:38 +10:00
Rohan Mitchell
d6f21b24da Add specs for producers and shops search by URL 2016-07-06 11:08:38 +10:00
Rohan Mitchell
34b2f72ae8 When query changed (typing or autocomplete), update URL. When page loads, perform query search. 2016-07-06 10:44:25 +10:00
Rohan Mitchell
e6bdd2303d Extract showing search result 2016-07-06 10:44:25 +10:00
Rohan Mitchell
a9a68151ec Syntax 2016-07-06 10:44:25 +10:00
Rohan Mitchell
f586dbc3e1 Extract OSM tile setup to own directive 2016-07-06 10:44:19 +10:00
Continuous Integration
5fb5ef1974 Auto-merge from CI [skip ci] 2016-07-02 00:58:27 +10:00
Rohan Mitchell
54028f4e7e Split directive into functions 2016-07-01 15:31:32 +10:00
Rohan Mitchell
e8b83bef41 Simplify responding to search 2016-07-01 15:31:32 +10:00
Bing Xie
78b22c4a82 Fix incorrectly aligned columns 2016-06-30 21:38:10 +10:00
Continuous Integration
e252414263 Auto-merge from CI [skip ci] 2016-06-30 01:30:53 +10:00
Lynne Davis
320db21d5c Updating spec with $ (not £) for automated testing 2016-06-29 16:30:11 +01:00
Maikel Linke
c253d73d11 Refactoring with feedback on pr #1073 2016-06-29 15:46:51 +10:00
Maikel Linke
08fdc8a5bd Load producers of all or selected order cycles into shop 2016-06-29 12:57:09 +10:00
Rohan Mitchell
9cc0bb831a Show properties alongside taxons on producer fat view v1.8.2 2016-06-24 07:57:06 +10:00
Rohan Mitchell
a5a00e9cef Show taxons and properties on producer modal (seen on map, shop producer info) 2016-06-24 07:57:06 +10:00
Rohan Mitchell
4134cbfc9c Include producer properties on producer listing 2016-06-24 07:57:06 +10:00
Rohan Mitchell
58379a5e28 Extract property merging to lib class 2016-06-24 07:57:06 +10:00
Rohan Mitchell
aae1689a27 Show product properties on producers page 2016-06-24 07:57:06 +10:00
Rohan Mitchell
4338f632f6 Add scope: Spree::Property.applied_by 2016-06-24 07:57:06 +10:00
Rohan Mitchell
fa0cc6f2c8 Add spec for filtering producers by taxon 2016-06-24 07:57:06 +10:00
Maikel
12df5de43c Auto-merged master into sign_up_email_i18n on deployment. 2016-06-24 00:45:34 +10:00
Lynne
4da7668dfc Merge pull request #1048 from lin-d-hop/sign_up_email_i18n 
code cleanup
 2016-06-23 15:30:42 +01:00
Lynne Davis
9c29e56fc3 More typo 2016-06-21 17:44:45 +01:00
Lynne Davis
e253590c1c code cleanup 2016-06-21 17:07:42 +01:00
Lynne
43b5216002 Merge pull request #1046 from lin-d-hop/sign_up_email_i18n 
Sign up email i18n
 2016-06-20 18:45:31 +01:00
Lynne Davis
e7adacc541 Typo 2016-06-20 18:34:54 +01:00
Lynne Davis
fa52712e35 More syntax fixes 2016-06-20 18:32:32 +01:00
Lynne
36093c0f64 Merge pull request #1045 from lin-d-hop/sign_up_email_i18n 
Sign up email i18n
Merging so that I can test emails on UK staging.
 2016-06-20 17:29:37 +01:00
Lynne Davis
02d8f52426 Fixing syntax 2016-06-20 17:02:10 +01:00
Lynne Davis
5b22e19ec9 Undoing locale changes accidentally committed 2016-06-20 15:24:24 +01:00
Lynne Davis
99d22649a2 Undoing this change, shouldn't be on this branch 2016-06-20 15:21:34 +01:00
Lynne Davis
98548e15c5 I18n of enterprise emails 2016-06-20 15:18:25 +01:00
Lynne Davis
f37f89dd07 Adding Community forum to ContentConfig 2016-06-20 15:13:49 +01:00