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

34725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
summerscope
0258fc24f3 Moving comments to own line. New version of SASS does not like comments on same line as declarations. 2015-03-13 12:58:45 +11:00
Rohan Mitchell
6365434a94 Merge branch 'lin-d-hop-ordercyclemanagementreports2' 2015-03-13 10:53:03 +11:00
Rohan Mitchell
d9f90be38a Fix indentation 2015-03-13 10:52:44 +11:00
Rohan Mitchell
008b43b1fc Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2 2015-03-13 10:47:49 +11:00
Rohan Mitchell
5609354136 Fix bug: When there are variant overrides not owned by the current user, user is unable to make any changes to VOs 2015-03-13 10:45:38 +11:00
Lynne Davis
d9e8ce2f0e Fix bug in report that selecting multiple payment methods didn't work. Added spec as well 2015-03-12 17:16:51 +11:00
Rob Harrington
cce65aa462 Merge remote-tracking branch 'origin/master' into order-confirmation 2015-03-12 16:20:21 +11:00
Rob Harrington
44511b8b61 Only display shipping description if it exists 2015-03-12 16:18:30 +11:00
Rob Harrington
eb413ccc84 Committing schema changes 2015-03-12 16:18:07 +11:00
Rob Harrington
6cd6b751c8 Merge branch 'master' into order-confirmation 2015-03-12 15:34:49 +11:00
Rohan Mitchell
af95181245 Merge branch 'lin-d-hop-ordercyclemanagementreports2' 2015-03-12 12:30:49 +11:00
Rohan Mitchell
36fa4896ed Syntax 2015-03-12 12:28:35 +11:00
Rohan Mitchell
7c723c04b6 Show yes/no instead of true/false 2015-03-12 12:23:02 +11:00
Rohan Mitchell
c85d5b86eb Fix temperature_controlled migration - NOT NULL requires default value 2015-03-12 12:22:51 +11:00
Rohan Mitchell
1a97df1d21 Fix whitespace issues 2015-03-12 12:17:15 +11:00
Rohan Mitchell
a5716cf2c2 Merge branch 'ordercyclemanagementreports2' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-ordercyclemanagementreports2 2015-03-12 12:15:22 +11:00