Maikel Linke
0cb5dfbbe0
delete old sidebar partials
2016-02-19 16:29:19 +11:00
Maikel Linke
6ba534fb58
Show noticeboard in mobile menu
2016-02-19 15:16:24 +11:00
Maikel Linke
38cac3a3c4
Explicitly referencing main_app.discourse_login_path
...
Fixes #830 .
2016-02-19 11:23:38 +11:00
Maikel Linke
82182d24e7
Merge remote-tracking branch 'origin/master' into discourse-sso
2016-02-19 11:02:59 +11:00
stveep
83d248469f
Running balances
2016-02-16 20:32:09 +00:00
Lynne Davis
2d620071f0
Fxing conflicts
2016-02-11 16:14:44 +00:00
Paul Mackay
50c657133a
Change "&" to "and"
...
There are very few places where ampersands are appropriate.
Minor typo in footer.
2016-02-09 10:01:51 +00:00
Maikel Linke
3db79aa6b2
Prevent body from scrolling when a modal is open
2016-02-05 15:18:18 +11:00
Rob Harrington
2ebad800b2
Try again: using :site_meta_description for translation of global site meta description
2016-02-05 14:57:18 +11:00
Rob Harrington
dbe7fbc760
Using :meta_description for translation of global site description
2016-02-05 14:17:42 +11:00
Maikel Linke
ac413937f3
Merge remote-tracking branch 'origin/master' into groups
2016-02-05 11:05:40 +11:00
Rohan Mitchell
48b02db70d
Order cycles are undated unless they have both open and close dates defined
2016-02-05 09:27:25 +11:00
Maikel Linke
eef62d4128
fix hub filter style
2016-02-04 16:34:03 +11:00
Maikel Linke
f5ff5bd5b0
Merge remote-tracking branch 'origin/master' into groups
2016-02-04 16:12:57 +11:00
Maikel Linke
bd19bf5f3c
Refactoring filter selectors
...
The FilterSelectorsService is now able to create multiple independent
lists of selectors. These lists are explicitly given to the
filter-selector directive.
For example a group's page has one set for the group's producers and one
set for the group's shops.
2016-02-04 16:08:19 +11:00
Steve Pettitt
0ad3d8f351
WIP: styling updates
2016-02-02 23:21:04 +00:00
Nicolas Blanc
2be005d344
i18n from berlin hackathon
2016-01-31 12:16:33 +00:00
Steve Pettitt
79808acd9f
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-31 11:00:18 +00:00
Steve Pettitt
dcb07237d8
Spec worked, links didn't :)
2016-01-31 11:00:07 +00:00
Maikel
381fb6291e
Auto-merged master into uk/account-balances on deployment.
2016-01-31 21:35:44 +11:00
Steve Pettitt
e3b9ce4d80
Delegate url helper to pass specs
2016-01-31 10:28:19 +00:00
Nicolas Blanc
fb557dd682
Merge branch 'hackweek/i18n' of https://github.com/elf-pavlik/openfoodnetwork into elf-pavlik-hackweek/i18n
2016-01-31 09:16:33 +00:00
Steve Pettitt
4438cbd5d0
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-30 19:53:53 +00:00
Steve Pettitt
ec6b0f873e
style credit/debit, spec updates
2016-01-30 19:53:37 +00:00
Steve Pettitt
92d830b884
Table styling
2016-01-30 17:56:04 +00:00
Maikel
3c8df7c4aa
Auto-merged master into delivery_email_updates on deployment.
2016-01-30 05:04:11 +11:00
Lynne Davis
c0afa6be49
Bug fix
2016-01-29 17:57:10 +00:00
Maikel Linke
d0cb9008a2
Delete unused shopfront haml
2016-01-29 16:09:34 +11:00
Rohan Mitchell
533124fe91
Display receival instructions when editing order cycle
2016-01-29 12:17:20 +11:00
Steve Pettitt
5b73b80e81
sorting orders in reverse date order
2016-01-28 23:10:27 +00:00
Steve Pettitt
ccd66bba9c
Credit/debit formatting, use filters for money formatting, use full page width for table
2016-01-28 22:42:45 +00:00
Lynne Davis
02616a8ac7
Updates based on testing on staging
2016-01-27 18:43:01 +00:00
Lynne Davis
a9c37c162e
Update email footer to use instance email and social media contacts
2016-01-26 13:14:29 +00:00
Maikel
93de2e4b02
Auto-merged master into delivery_email_updates on deployment.
2016-01-26 11:01:47 +11:00
Lynne Davis
a0f51af355
Correcting name tag for order conf email
2016-01-25 23:50:53 +00:00
Maikel
3dd3cfa7ec
Auto-merged master into uk/account-balances on deployment.
2016-01-25 04:43:25 +11:00
Steve Pettitt
295ee47c3a
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-24 17:34:43 +00:00
Steve Pettitt
c9a8d7efa5
Message for users with no orders
2016-01-22 19:49:03 +00:00
Maikel Linke
1f1b0bd783
styling groups blurb
2016-01-22 16:20:07 +11:00
Maikel Linke
d562f6537e
Cleaner opengraph meta tags
2016-01-20 15:42:01 +11:00
Maikel Linke
8c1a16b371
groups blurb text
2016-01-20 14:00:46 +11:00
Maikel Linke
ea796d4f94
Taxon filter for group hubs
2016-01-20 13:32:08 +11:00
Maikel Linke
d5aea1b00d
Taxon filter for group producers
2016-01-20 13:32:08 +11:00
Maikel Linke
fd9de730c8
group producer style adjustment
2016-01-20 13:32:08 +11:00
Maikel Linke
fbdeb557ca
Loading only visible enterprises for group
2016-01-20 13:32:08 +11:00
Rohan Mitchell
07d691fc97
Only apply cart scrolling to non-mobile devices
2016-01-15 16:54:56 +11:00
Maikel
eeb31f65c3
Auto-merged master into combined/cart-fit-to-screen_preserve-max-quantity on deployment.
2016-01-15 16:15:09 +11:00
Rohan Mitchell
046d0f0d19
Merge branch 'preserve-max-quantity' into combined/cart-fit-to-screen_preserve-max-quantity
2016-01-15 16:07:25 +11:00
ludivinecp
a611e73bed
Opengraph facebook: images and description for shops and groups and home => ok
2016-01-15 14:03:33 +11:00
Maikel Linke
f68f7ea2b6
Fix display of "Total"
2016-01-15 12:07:43 +11:00
