Rohan Mitchell
|
ebb3688add
|
Merge branch 'migrations' of https://github.com/folklabs/openfoodnetwork into folklabs-migrations
|
2015-03-25 11:30:00 +11:00 |
|
Rohan Mitchell
|
5da9bdc614
|
Merge branch 'victornava-legacy-login-fix'
|
2015-03-25 10:37:14 +11:00 |
|
Paul Mackay
|
af9a7a2ed4
|
#443: Support currency configuration. Fix LOCALE variable name.
|
2015-03-24 15:34:45 +00:00 |
|
Paul Mackay
|
fcfb1aeb87
|
#440: Try removing validation from update (to prevent geocoding).
|
2015-03-23 14:24:16 +00:00 |
|
Paul Mackay
|
e39d2eb113
|
#440: Reset Enterprise columns before querying them.
|
2015-03-23 13:47:44 +00:00 |
|
summerscope
|
7090bb518b
|
Tweaking logic for alert bar to make messages more human readable for all use cases.
|
2015-03-20 14:24:59 +11:00 |
|
summerscope
|
0b1857771e
|
Finally got this slide animation working. stupid angular documentation!
ref: http://www.yearofmoo.com/2013/08/remastered-animation-in-angularjs-1-2.html
|
2015-03-20 13:09:45 +11:00 |
|
summerscope
|
938eff8482
|
More layout tweaks to enterprise modal template
|
2015-03-19 16:13:47 +11:00 |
|
summerscope
|
b99e94cecf
|
WIP on producer and product modals
|
2015-03-19 16:02:52 +11:00 |
|
summerscope
|
1f97052954
|
Add a min height to modals so they are not quite so stupidly small when not enough content suppied by users
|
2015-03-19 15:05:14 +11:00 |
|
summerscope
|
c76aa1d1c2
|
WIP on product modal
|
2015-03-19 14:52:09 +11:00 |
|
summerscope
|
cdd41ad651
|
change animation class
|
2015-03-19 14:52:00 +11:00 |
|
summerscope
|
3c61bf9cc4
|
Styling for no image available on product modal overlay
|
2015-03-19 14:51:41 +11:00 |
|
summerscope
|
8a0bbb374c
|
Animation WIP
|
2015-03-19 14:51:23 +11:00 |
|
summerscope
|
4e54a3c48e
|
Updating no image all grey, large version larger
|
2015-03-19 14:50:50 +11:00 |
|
Rohan Mitchell
|
ab9bc7b1dc
|
Output debugging information to help investigate bogus changes to the sells field through the enterprises bulk edit action
0.7.4
|
2015-03-18 12:50:25 +11:00 |
|
Rob Harrington
|
bfe7f49033
|
Show and hide search box
|
2015-03-18 12:01:53 +11:00 |
|
Rohan Mitchell
|
cf4ccc268a
|
Admin may set no tax category on product unless tax category is required
|
2015-03-18 10:12:32 +11:00 |
|
Rohan Mitchell
|
7af17242f9
|
EnterpriseFee admin interface allows selecting no fee
|
2015-03-16 14:05:04 +11:00 |
|
Rohan Mitchell
|
eb5e411a8e
|
Update zeus
|
2015-03-16 14:00:55 +11:00 |
|
Rohan Mitchell
|
a6f0d8f69a
|
Show a nice error message instead of 500 error when deleting a referenced order cycle
|
2015-03-16 12:42:35 +11:00 |
|
Rohan Mitchell
|
95c09315f5
|
Change class delete-product -> delete-order-cycle
|
2015-03-16 12:42:05 +11:00 |
|
Rohan Mitchell
|
e38772ada0
|
Enterprise user can delete unreferenced order cycles
|
2015-03-16 12:41:06 +11:00 |
|
Rohan Mitchell
|
e125bcf451
|
Add column header for extra action column
|
2015-03-16 12:15:43 +11:00 |
|
Rohan Mitchell
|
4491d3cc73
|
Merge branch 'legacy-login-fix' of https://github.com/victornava/openfoodnetwork into victornava-legacy-login-fix
Conflicts:
app/views/admin/order_cycles/_row.html.haml
spec/features/admin/order_cycles_spec.rb
|
2015-03-16 12:14:54 +11:00 |
|
Rob Harrington
|
2b32252aff
|
Filtering between selector lists
|
2015-03-15 13:25:04 +11:00 |
|
Rob Harrington
|
29c9f70a1c
|
Rename single line selectors
|
2015-03-15 12:29:05 +11:00 |
|
Rob Harrington
|
2c1ef4c8c1
|
Refactoring single line selectors to remove flicker
|
2015-03-15 12:27:40 +11:00 |
|
Rob Harrington
|
bdeca54377
|
Reloading stale enterprise object in test
|
2015-03-14 16:17:16 +11:00 |
|
Rob Harrington
|
20d59cf5a5
|
Fixing authentication spec to work with altered user factory
|
2015-03-14 11:40:21 +11:00 |
|
Rob Harrington
|
8b241f058b
|
Login to consumer section in a way that ensures user is not an admin
|
2015-03-14 11:02:45 +11:00 |
|
Rob Harrington
|
cb28843af1
|
Reload manager before ensuring owner is a manager
|
2015-03-14 10:41:49 +11:00 |
|
Rob Harrington
|
d684a88697
|
Merge branch 'order-confirmation' into ready-to-merge
|
2015-03-13 18:11:53 +11:00 |
|
summerscope
|
d0f66a6053
|
Fixing label for cart popover to make it write name of product variant without page load
|
2015-03-13 18:10:59 +11:00 |
|
summerscope
|
d2fbf9f14d
|
Fixing logic for instance where collection instructions are not entered
|
2015-03-13 18:00:36 +11:00 |
|
Rohan Mitchell
|
8d3f25bb39
|
Fix intermittent 500 error when updating the cart
|
2015-03-13 17:50:01 +11:00 |
|
summerscope
|
7b1901253c
|
More work on filters for shopfront rewriting as compared to the rest of filter button styles
|
2015-03-13 17:32:33 +11:00 |
|
Rohan Mitchell
|
abaaf05631
|
Merge branch 'user-menu'
|
2015-03-13 17:00:37 +11:00 |
|
Rob Harrington
|
dd8c769ea9
|
Hiding fee breakdown on cart page for now
|
2015-03-13 16:50:57 +11:00 |
|
summerscope
|
864c9ec1da
|
This changes the user menu labels to show Account next to user email.
Small tweak to user account page to make it less awful.
|
2015-03-13 16:49:26 +11:00 |
|
Rob Harrington
|
b0cfa6a17c
|
Shipping method prices displayed next to options in checkout
|
2015-03-13 16:18:49 +11:00 |
|
Rob Harrington
|
51258b242c
|
Merge remote-tracking branch 'origin/order-confirmation' into order-confirmation
|
2015-03-13 16:07:17 +11:00 |
|
summerscope
|
dc1dd2e243
|
Changing the class .filter-box for shopfront to .filter-shopfront
This prevents the issue with inheritance / styling crossover
|
2015-03-13 16:06:46 +11:00 |
|
Rohan Mitchell
|
1a44e74a9d
|
When enterprise user creates an enterprise, make it a hub if they have other hubs
|
2015-03-13 16:06:42 +11:00 |
|
summerscope
|
e3bc7cf894
|
Styling for search alert on shopfront page
|
2015-03-13 15:36:06 +11:00 |
|
summerscope
|
e5cc9063e8
|
Changing the medium input styling to make it same height as taxon filters, and no animation to get big as we want the next row space for tags eventually
|
2015-03-13 15:35:45 +11:00 |
|
summerscope
|
88edaceee0
|
Adding a new color to brand colors - yellow light
|
2015-03-13 15:34:38 +11:00 |
|
summerscope
|
bce64a1ead
|
WIP product modals for shopfront
|
2015-03-13 15:34:11 +11:00 |
|
summerscope
|
c8c07ed700
|
Adding position fixed to modals - got lost somehow with upgrading foundation zurb
|
2015-03-13 12:59:26 +11:00 |
|
Rohan Mitchell
|
efbf2c7ffa
|
Display extended variant name in quick cart
|
2015-03-13 12:58:53 +11:00 |
|