raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-16 04:24:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,649 Commits 15 Branches 457 Tags
8fa053a0a8bbdd25cf0c8834d2f359d514d69ee2
Commit Graph

1877 Commits

Author SHA1 Message Date
summerscope
8fa053a0a8 Commenting out promo image from About tab in shopfront page. This needs an additional image style to be applied before it can be implemented correctly. 2014-06-03 10:28:18 +10:00
Rob H
f97ef0838c Rollback variant_unit_change check, auto-set primary taxons where they exist 2014-05-30 19:20:15 +10:00
Rob H
bf4d83aecc Fix master options_text display on front end 2014-05-30 18:39:41 +10:00
Rob H
2a8ef182f2 Merge remote-tracking branch 'origin/master' into new-product-form 2014-05-30 16:38:50 +10:00
Will Marshall
5f163eef1c Tweaking the contact thingy 2014-05-30 16:10:45 +10:00
summerscope
ae310ff606 Refactor producers tab content for spacing of string 2014-05-30 16:02:46 +10:00
summerscope
587cf1ac9b Tabs styling for hub shopfront page 2014-05-30 15:56:40 +10:00
summerscope
06adca7462 Producers tab content styling and layout for hub shopfront page 2014-05-30 15:54:42 +10:00
summerscope
9f172af34c Styling and layout for groups tab content 2014-05-30 15:54:42 +10:00
summerscope
87d58b639d Styling and layout and content updates to contact hub tab content 2014-05-30 15:54:42 +10:00
summerscope
57b895b0c3 Styling and layout for About Hub Name tab content on shopping page 2014-05-30 15:54:41 +10:00
Will Marshall
5c46057bf3 Merge branch 'master' into laura_and_will 2014-05-30 15:53:03 +10:00
Will Marshall
13c6ce6786 Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty 2014-05-30 15:52:20 +10:00
Rob H
4aae6be9b7 Remove unused overrides for primary taxons and product/new 2014-05-30 15:48:36 +10:00
Rob H
66d6de9dfc Merge master (with primary taxons restored) 2014-05-30 15:45:48 +10:00
Will Marshall
7abfb2f936 Showing the resizing logo as well 2014-05-30 15:32:47 +10:00
Rob H
69376e7f4b Merge in master 2014-05-30 15:10:13 +10:00
Will Marshall
3ddd7c31e8 Patching which image is rendered 2014-05-30 15:08:16 +10:00
Will Marshall
be640fd856 Patching a spec and naming something 2014-05-30 15:02:47 +10:00
Will Marshall
7304e24591 Switching the image dimensions 2014-05-30 14:47:53 +10:00
summerscope
5cbc60e686 Typo fix on food hub modal 2014-05-30 14:43:31 +10:00
summerscope
68582514ef Grammar fix up for food hub modal 2014-05-30 14:41:34 +10:00
Will Marshall
a979334f2a Adding primary taxon 2014-05-30 14:31:36 +10:00
Will Marshall
b736145552 Adding primary taxon to admin forms 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
	spec/features/admin/products_spec.rb
 2014-05-30 14:31:27 +10:00
Will Marshall
1c31ac56ea Adding primary taxon field to product 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
 2014-05-30 14:31:03 +10:00
summerscope
91224ed0a4 Merge issues. Removing position fixed on modal window styling. 2014-05-30 14:27:37 +10:00
Will Marshall
85ee33517a Restoring another deleted file 2014-05-30 13:19:23 +10:00
Will Marshall
368fbd2383 Patching up admin redirects to be MOAR UNIVERSAL 2014-05-30 12:52:14 +10:00
Will Marshall
ee785a3498 Merge branch 'master' into laura_and_will 2014-05-30 12:01:33 +10:00
Will Marshall
db131af5e7 Patching a class hook 2014-05-30 12:00:28 +10:00
Will Marshall
1a47a7486e Automatically closing the accordion if the form is already valid 2014-05-30 11:58:22 +10:00
Rob H
d9f7865572 Can add an image from redesigned new product page 2014-05-30 11:31:53 +10:00
Will Marshall
5b58bf2c71 Adding our own custom unauthorized page 2014-05-30 11:24:37 +10:00
Rohan Mitchell
4c6a7622eb Convert rep template to rabl 2014-05-29 17:21:52 +10:00
Rohan Mitchell
7d73f7d7f2 Fix reversed checkbox value for select all variants on order cycle admin page 2014-05-29 17:21:52 +10:00
Will Marshall
3ae2dc34e8 Preventing rabl from dying if no current hub 2014-05-29 16:50:41 +10:00
Will Marshall
e26a61c31f Adding back sanitize 2014-05-29 16:49:20 +10:00
summerscope
c0cb9857cc Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this. 2014-05-29 16:42:05 +10:00
Will Marshall
aaf9b76507 Making toggling of fat nodes work 2014-05-29 16:38:01 +10:00
Will Marshall
d5a652182e Scrolling to groups when hotlinked 2014-05-29 16:31:12 +10:00
Will Marshall
c49d9d838c Removing reference to modals and unnecessary ID 2014-05-29 16:19:20 +10:00
Will Marshall
f28fe34958 Removing groups modals 2014-05-29 16:15:39 +10:00
Will Marshall
e44853346e Dropping current producers, switching to suppliers and using Angular 2014-05-29 16:12:58 +10:00
Will Marshall
06bac3de85 Fixing an incorrect sentence case 2014-05-29 15:45:56 +10:00
Will Marshall
65d11ce552 Removing some unnecessary 2014-05-29 15:41:27 +10:00
Will Marshall
2c1ca15393 Some tweaks to visual stuff 2014-05-29 15:37:19 +10:00
Rob H
9b10a2cb94 Added 'Add Another' link to new product page. Altered redirects 2014-05-29 12:13:55 +10:00
Rob H
e110677b3b WIP: Rearrange new product form 2014-05-29 12:11:06 +10:00
Will Marshall
74211cbfc7 Merge branch 'master' into fixing_modals 
Conflicts:
	app/assets/javascripts/darkswarm/all.js.coffee
	app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
	app/views/modals/_producer.html.haml
	app/views/modals/_product.html.haml
	app/views/shop/products.rabl
 2014-05-29 11:14:16 +10:00
Rohan Mitchell
fdff442ec6 Do not fetch products JSON on every shopping page 2014-05-29 10:54:08 +10:00