raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-20 00:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 15 Branches 453 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

3834 Commits

Author SHA1 Message Date
summerscope
68582514ef Grammar fix up for food hub modal 2014-05-30 14:41:34 +10:00
summerscope
72c50486fa ADding new icons into producer modal 2014-05-30 14:29:08 +10:00
summerscope
42a9f16800 Adding in new icon into producer partial 2014-05-30 13:08:18 +10:00
summerscope
49a39bb240 Adding unlock icon to signed in 2014-05-30 13:06:48 +10:00
summerscope
179d9f609c Adding in new lock icon to signed in 2014-05-30 13:05:56 +10:00
summerscope
00ac80bdbb Add new icons 2014-05-30 12:56:56 +10:00
summerscope
a54b3f7849 Adding new icon for refresh 2014-05-30 12:39:44 +10:00
summerscope
9a962f7445 Add new icons to checkout & back to cart buttons 2014-05-30 12:35:54 +10:00
summerscope
15cde6c372 Merge branch 'laura_and_will' into icon_font 
Conflicts:
	app/views/groups/index.html.haml
	app/views/modals/_producers.html.haml
 2014-05-30 12:12:07 +10:00
summerscope
43cc77c88b Adding icon into button 2014-05-30 12:01:57 +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
summerscope
3fca8640fd Add class right to icons 2014-05-30 11:57:19 +10:00
summerscope
9cae581cda Add class right to icons 2014-05-30 11:57:06 +10:00
summerscope
34c4fc8aa1 Add class right to icons 2014-05-30 11:56:52 +10:00
summerscope
474581211b Add class right to icons 2014-05-30 11:56:41 +10:00
summerscope
cca6a39476 Adding in icons to checkout partial 2014-05-30 11:49:14 +10:00
summerscope
cbc28f6da7 Adding in icons to checkout partial 2014-05-30 11:48:59 +10:00
summerscope
b4f14197fa Adding in icons to checkout partial 2014-05-30 11:48:47 +10:00
summerscope
4893679d12 Adding in icons to checkout partial 2014-05-30 11:48:32 +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
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