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 Linke
8e73a2e0d6
Dereference enterprises and taxons later
2016-07-06 16:20:07 +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
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
Continuous Integration
e252414263
Auto-merge from CI [skip ci]
2016-06-30 01:30:53 +10: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
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
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
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
Lynne Davis
ed37604bc2
Update from address in notification emails
2016-06-18 09:09:43 +01:00
Maikel Linke
e284ad62b2
Inject only relative enterprises into shopfront
...
Other shops displayed in producer modals are lazy loaded when opening
their modal.
2016-06-17 17:15:16 +10:00
Rob Harrington
e40ecae681
Removing inline styles for links dropdown
2016-06-17 16:44:02 +10:00
Rob Harrington
6586e67a5c
Better messaging around deletion of customers
2016-06-17 14:47:04 +10:00
Rob Harrington
d9b3366a5c
Auto-select shop on customers index when only one available
2016-06-17 11:28:20 +10:00
Rob Harrington
61969f5c84
Ensure CustomersController#update.json gives an appropriate response
...
pendingChanges submits an empty string when a field is blank (rather than undefined)
2016-06-16 22:42:53 +10:00
Rob Harrington
2a4737147f
Tweaking the way new customer form error messages are display for latest version of AngularJS
2016-06-16 16:32:10 +10:00
Rob Harrington
a909f0ddb8
Merge remote-tracking branch 'origin/master' into pr/1033
2016-06-16 15:12:30 +10:00
Rob Harrington
25cdd4af8e
Preventing shop from being changed when unsaved customer changes exist
...
Also making layout of filters on customer index more consistent with other pages
2016-06-16 15:10:16 +10:00
Continuous Integration
9ba07a2afb
Merge remote-tracking branch 'origin/master' into HEAD
2016-06-15 11:26:02 +10:00
Rob Harrington
d424c2eb20
Enterprise form SaveBar becomes available when adding a new rule
2016-06-15 10:51:34 +10:00
Rob Harrington
c8c8f0d02d
Removing old cancel button from bottom of OC forms
2016-06-15 10:51:34 +10:00
