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

6861 Commits

Author SHA1 Message Date
Will Marshall
3ae2dc34e8 Preventing rabl from dying if no current hub 2014-05-29 16:50:41 +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
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
summerscope
4f1c7345c5 Add search icon into search input on producers page 2014-05-29 11:59:55 +10:00
summerscope
86dee82acb Add search icon into search input on hubs 2014-05-29 11:59:28 +10:00
summerscope
39358247fd Kill whitespace around icon 2014-05-29 11:47: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
summerscope
68ab24b790 Add links into footer 2014-05-29 11:10:45 +10:00
summerscope
b8eb43f8db Add groups icon to modal 2014-05-29 11:08:35 +10:00
summerscope
81f51e734c Add groups icon to listings on page 2014-05-29 11:07:43 +10:00
summerscope
1248eaeed7 Add producers icon to modal 2014-05-29 11:05:28 +10:00
summerscope
ff1c5a13e7 Add producers icon to active table 2014-05-29 11:01:49 +10:00
summerscope
8f7bab4ab7 Add hub icon to active table 2014-05-29 10:54:27 +10:00
Rohan Mitchell
fdff442ec6 Do not fetch products JSON on every shopping page 2014-05-29 10:54:08 +10:00
summerscope
4971e2305f Add hub icon to modal 2014-05-29 10:54:07 +10:00
summerscope
45f6a86fd2 Adding new icons to menu partials 2014-05-29 10:19:50 +10:00
Rohan Mitchell
2a630a855a Move primary taxon field into Rob's new product form 2014-05-29 09:28:08 +10:00
summerscope
614b25c446 Applying new icon font to footer partial on homepage 2014-05-28 17:06:52 +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
summerscope
d3802e9f83 Applying new icon font to map partial on homepage 2014-05-28 16:43:06 +10:00
summerscope
4c832b6ae9 Applying new icon font to producers partial on homepage 2014-05-28 16:39:26 +10:00
summerscope
7185aa6ab6 Applying new icon font to groups partial on homepage 2014-05-28 16:38:01 +10:00
summerscope
8954caf3e0 Applying new icon font to active table on homepage 2014-05-28 16:33:01 +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