raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-03 22:06:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 19 Branches 452 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

15608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Will Marshall
b757629bfa Minor test tweaks 2014-05-29 11:52:46 +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
summerscope
3f36a3785b Adding in icon for list style from new OFN icon font 2014-05-28 17:06:34 +10:00
summerscope
6ea7988f4e New version fonts 2014-05-28 17:06:06 +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
summerscope
0c2a7ac247 Adding style sheet to allow access to custom font 2014-05-28 16:32:37 +10:00
summerscope
1e0aec0267 Adding in font files for custom font 2014-05-28 16:32:10 +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
b8cc9d3343 Modding image sizing on groups 2014-05-28 16:03:42 +10:00
Will Marshall
f65ff5af18 Automatically sorting out image rotation 2014-05-28 16:03:42 +10:00
Will Marshall
a7105fc3a8 Tweaking image sizing on enterprise 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
Will Marshall
1af82bd4fb Forcing scope to parent scope so we don't child our child 
Conflicts:
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
 2014-05-28 14:43:16 +10:00
summerscope
1a79b966e9 Adding in links to homepage buttons for Groups & Producers 2014-05-28 12:21:25 +10:00
summerscope
3c3409bc1f Tweaks to styling on groups page 2014-05-27 18:03:12 +10:00
summerscope
9fe4bef7df Adding groups icon into background for visual consistency 2014-05-27 17:55:51 +10:00
summerscope
2130470eaf Styling for groups page 2014-05-27 17:11:42 +10:00
Rohan Mitchell
cc2498bb9b Fix spec fails - group buy and available on removed from new product form 2014-05-24 18:26:02 +10:00
Rohan Mitchell
403e957111 Further removal of references to 'Admin' from global namespace 2014-05-24 17:15:20 +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
9c1528607a Merge branch 'user-import-export' 2014-05-24 17:13:34 +10:00
Rohan Mitchell
acbe49b8de Revert primary taxons 2014-05-24 17:13:01 +10:00
Rohan Mitchell
e6461ba01e Fix enterprises spec - primary taxons change 2014-05-24 10:34:22 +10:00
Will Marshall
2db63540ee Adding primary taxon 2014-05-24 10:27:57 +10:00