raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-09 23:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,897 Commits 18 Branches 453 Tags
0139c4bda2f7d9b44e7a2e1dc9a098a48367dca2
Commit Graph

2897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rohan Mitchell
0139c4bda2 Set producer property 2014-06-18 15:22:03 +10:00
Rohan Mitchell
9d8629f41f Add producer property model 2014-06-18 15:22:02 +10:00
Rob H
6809d70397 Redirect user back to enterprise edit page after saving 2014-06-18 13:18:33 +10:00
Rob H
65a0e4707a Add text which explains cropping of promo image 2014-06-18 12:58:32 +10:00
Rob H
3884b0cc1b Adding a direct link to shopfront to enterprise edit page for distributor enterprises 2014-06-18 12:37:26 +10:00
Rob H
45b16d52dd Add visible checkbox to enterprises index page to allow bulk editing of visibility 2014-06-18 11:44:47 +10:00
Rob H
2e749ef1f3 Move admin enterprises index to haml 2014-06-18 11:08:00 +10:00
Rob H
0611947306 Merge branch 'master' into sm-makeover 2014-06-18 10:39:40 +10:00
Rob H
bd41ee8b97 Commit schema version 2014-06-18 10:38:59 +10:00
Rob H
004548a4fe Rearrange shipping method edit page 2014-06-18 10:21:21 +10:00
Will Marshall
d6098ec2de Fixing a private method 2014-06-13 14:23:44 +10:00
Will Marshall
3aa9501480 Adding main app 2014-06-13 14:13:16 +10:00
Will Marshall
f7c71568df Merge branch 'laura_and_will' 
Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb
 2014-06-13 12:42:14 +10:00
Will Marshall
415a4eff0a Not pre-loading images and setting the map back to gifses 2014-06-13 11:05:32 +10:00
Will Marshall
bc93ce57e6 Smooth scrolling, svg support via directive 2014-06-13 11:00:28 +10:00
summerscope
6135fe0336 Revert producers list to standard bullet point list 2014-06-13 10:26:09 +10:00
summerscope
4fd1a3d77c Remove SVG from styling - cannot reach it through iframe #document markup 2014-06-12 16:52:04 +10:00
summerscope
e090352c43 Styling for shopfront page to resize icons as SVGs 2014-06-12 16:51:32 +10:00
summerscope
e2f983b448 Icon update for update to icon font 2014-06-12 16:40:06 +10:00
summerscope
567855b13c Adding in new icon for producers modal list 2014-06-12 16:39:35 +10:00
summerscope
2ff4883725 Update icon font to add Bulk icon and pop out icon 2014-06-12 16:22:54 +10:00
summerscope
f9ded4c616 Markup change for taxon to be spat out correctly in shopfront view 2014-06-12 16:22:54 +10:00
Will Marshall
365c14d4fe Adding smooth scroll to hubses 2014-06-12 16:16:46 +10:00
Will Marshall
f6690cb8dd Patching a minor bug in cart emptying 2014-06-12 16:13:52 +10:00
Will Marshall
a55e58d50c Adding working scrolling to anchors 2014-06-12 16:13:51 +10:00
Will Marshall
7a062b0310 Reworking the variant display of units and names 2014-06-12 16:13:51 +10:00
Rob H
8412d740ff Move distributors into sidebar for new & edit shipping methods screen 2014-06-12 16:10:30 +10:00
summerscope
1a4e3c20ad Styling for new svg icons for taxons 2014-06-12 15:47:38 +10:00
Rohan Mitchell
98611c3672 Fix timing error in enterprise supplied products rabl spec 2014-06-12 15:21:35 +10:00
Rohan Mitchell
9ccdd3b4e0 Add reactive integrity test that soft-deleted variants are removed from order cycles 2014-06-12 14:59:27 +10:00
Rohan Mitchell
8cea6d53ed Correctly designate primary_taxon_id as NOT NULL 2014-06-12 14:59:27 +10:00
Rohan Mitchell
b23430375c Add migration to remove deleted variants from order cycles 2014-06-12 14:59:27 +10:00
Rohan Mitchell
0061caa8df Do not show deleted products in order cycle admin 2014-06-12 14:59:27 +10:00
Rohan Mitchell
836a08606c Product and variant deletion removes the product or variant from any order cycles 2014-06-12 14:59:27 +10:00
Rohan Mitchell
083220089f WIP: Delete ExchangeVariants when product is soft-deleted 2014-06-12 14:59:27 +10:00
Rohan Mitchell
c21d5cc3dc Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors. 2014-06-12 14:59:27 +10:00
Rohan Mitchell
88c41df201 BPE uses soft-delete for products 2014-06-12 14:59:27 +10:00
Rohan Mitchell
b970f54f53 Admin UI soft-deletes variants, not hard delete 2014-06-12 14:59:27 +10:00
Rohan Mitchell
9dc02e5eac Add product soft-delete API action 2014-06-12 14:59:26 +10:00
Rohan Mitchell
e6c7acdff3 Add soft-delete method to variant 2014-06-12 14:59:26 +10:00
Rob H
4e98ee6e56 Remove sidebar from admin edit shipping methods 2014-06-12 14:48:36 +10:00
summerscope
8acbfba873 Change z index of icon so it sits behind fixed menu at top 2014-06-12 13:03:39 +10:00
Will Marshall
901cde73df Adding not-null constraint 2014-06-12 12:58:40 +10:00
Rob H
be6a043aac Move dynamic placeholder logic to directive so that it can be used for master variants too 2014-06-12 12:58:40 +10:00
Rob H
0b1b260527 Adding dynamic text to display as placeholder 2014-06-12 12:58:39 +10:00
Rob H
7782745663 Add fields for variant display name and display as to bpe 2014-06-12 12:58:39 +10:00
Rob H
fa567ac607 Change variant name to display name 2014-06-12 12:58:10 +10:00
Rob H
9f681bd1ef Use display_as as option value for variant when it is present 2014-06-12 12:57:56 +10:00
Rob H
721aeea130 OptionValueNamer spec refactor 2014-06-12 12:57:20 +10:00
Rob H
248c38fd2c Adding name and display_as fields to variants 2014-06-12 12:56:44 +10:00