raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-19 00:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,590 Commits 17 Branches 453 Tags
c0cb9857cc04e1090be97bda557d39b0562fdfbb
Commit Graph

1038 Commits

Author SHA1 Message Date
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
2c1ca15393 Some tweaks to visual stuff 2014-05-29 15:37:19 +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
Rohan Mitchell
2a630a855a Move primary taxon field into Rob's new product form 2014-05-29 09:28:08 +10:00
Rohan Mitchell
09ce8697af Only trigger taxon search AJAX when column visible - fixes deadlocks in specs 2014-05-28 16:55:04 +10:00
Will Marshall
4b1f409774 Only rendering images that exist{ 2014-05-28 16:19:10 +10:00
Will Marshall
98b4fe27f6 Hiding group logo if not present 2014-05-28 16:12:13 +10:00
Will Marshall
fcfda13a73 Patching a couple of minor regressions 2014-05-28 16:10:28 +10:00
Will Marshall
5eb54d1ac3 Merge branch 'groups_page' into fixing_modals 2014-05-28 16:04:55 +10:00
Will Marshall
33829d9044 Only rendering images if they exist 2014-05-28 16:03:42 +10:00
Will Marshall
9bb059493e Fixing the image render 2014-05-28 16:03:42 +10:00
Will Marshall
50c7bd55be Adding url strip and re-construction of http 2014-05-28 15:06:01 +10:00
Will Marshall
0c8ee2488b Moving back to ng-bind-html 2014-05-28 14:58:53 +10:00
Will Marshall
c26462db57 Addin some URL stripping 2014-05-28 14:45:26 +10:00
Will Marshall
576f10dbc3 Adding ng-if checks 
Conflicts:
	app/views/modals/_producer.html.haml
 2014-05-28 14:44:17 +10:00
summerscope
1a79b966e9 Adding in links to homepage buttons for Groups & Producers 2014-05-28 12:21:25 +10:00
summerscope
2130470eaf Styling for groups page 2014-05-27 17:11:42 +10:00
Rohan Mitchell
e951f80070 Merge branch 'new-product-form' 
Conflicts:
	app/assets/javascripts/admin/admin.js.coffee
 2014-05-24 17:14:32 +10:00
Rohan Mitchell
acbe49b8de Revert primary taxons 2014-05-24 17:13:01 +10:00
Will Marshall
2db63540ee Adding primary taxon 2014-05-24 10:27:57 +10:00
Rohan Mitchell
e119192cf1 Manually revert merge commit "Hack patching the modals" 2014-05-24 09:23:12 +10:00
Rohan Mitchell
223caa046c Revert "Producers modal styling and markup" 
This reverts commit 4657285769.

Conflicts:

	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-24 09:15:22 +10:00
Rohan Mitchell
69e0e71eb6 Revert "Styling for shop page product modal" 
This reverts commit 84b6f99321.

Conflicts:

	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-24 09:12:24 +10:00
Rohan Mitchell
bb1b7cfa90 Revert "Adding fields to product supplier" 
This reverts commit 6d24a6555e.
 2014-05-24 09:07:58 +10:00
Rohan Mitchell
7ac33beb65 Revert "Adding primary taxon" 
This reverts commit 58112fb105.
 2014-05-24 09:07:55 +10:00
Rohan Mitchell
a7566e3413 Revert "Always showing social media" 
This reverts commit aa23b03f98.
 2014-05-24 09:07:52 +10:00
Will Marshall
aa23b03f98 Always showing social media 2014-05-23 17:29:18 +10:00
Will Marshall
fb7b9a051a Hack patching the modals 2014-05-23 17:22:27 +10:00
Will Marshall
40f116783c Merge branch 'new_shop' 
Conflicts:
	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-23 16:02:20 +10:00
Will Marshall
58112fb105 Adding primary taxon 2014-05-23 16:01:24 +10:00
Will Marshall
6d24a6555e Adding fields to product supplier 2014-05-23 15:59:06 +10:00
summerscope
84b6f99321 Styling for shop page product modal 2014-05-23 15:59:06 +10:00
summerscope
4657285769 Producers modal styling and markup 2014-05-22 16:35:48 +10:00
Rob H
f8776fecff Move enterprises dashboard controller 2014-05-22 15:46:26 +10:00
Rob H
371240652c Change 'Overview' menu item to 'Dashboard' 2014-05-22 15:30:11 +10:00
Rob H
ed3c23cd90 Split 'My Enterprises' dashboard item into Hubs and Producers 2014-05-22 15:28:25 +10:00
Will Marshall
1a7c6f87ed Adding fields to product supplier 2014-05-22 14:47:27 +10:00
summerscope
d7bc1a9b95 Styling for shop page product modal 2014-05-22 14:40:35 +10:00
Will Marshall
015403c282 Merge branch 'new_shop' 2014-05-22 12:40:48 +10:00
Will Marshall
272cb0469f Setting up after_login redirects 2014-05-22 12:40:46 +10:00
Will Marshall
0140472fbc Adding working modals 2014-05-22 12:40:46 +10:00
Will Marshall
c69a4a5f1a Adding social media links 2014-05-22 12:12:10 +10:00
Will Marshall
34c31afabe Adding large image 2014-05-22 11:34:46 +10:00
Rohan Mitchell
06955a024f Enterprise user can only create relationships with their own enterprises as parent 2014-05-22 11:02:03 +10:00
Will Marshall
250b76ec79 Merge branch 'master' into new_shop 2014-05-22 10:43:02 +10:00
Will Marshall
67e72f4504 Setting up after_login redirects 2014-05-22 10:42:44 +10:00
Will Marshall
2d0a42b2c2 Adding working modals 2014-05-22 10:42:44 +10:00
Rohan Mitchell
a049266732 Replace enterprise relationship parent/child concepts with 'X permits Y' 2014-05-21 16:28:27 +10:00
Rohan Mitchell
0c647841a6 Add dynamic filter to enterprise relationships 2014-05-21 16:18:07 +10:00