raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,778 Commits 18 Branches 452 Tags
92eca72f4f03fe58e429db027da031fb30a43390
Commit Graph

771 Commits

Author SHA1 Message Date
Will Marshall
92eca72f4f Fixing a couple of paths and clearing localStorage when changing distributor 2014-06-06 14:04:48 +10:00
Will Marshall
54cdc545a4 adding distributor id to localStorage 2014-06-06 14:04:47 +10:00
Will Marshall
afabda788e Adding the close 2014-06-06 14:04:47 +10:00
Will Marshall
ebe40d3b3d New icon 2014-06-06 14:04:46 +10:00
Will Marshall
f881197a74 New icons and some more enterprise data 2014-06-06 14:04:46 +10:00
Will Marshall
ddb5150e77 Automatically resizing to fit 2014-06-06 14:04:46 +10:00
Will Marshall
6f2e841100 Adding modals for the map 2014-06-06 14:04:46 +10:00
Will Marshall
c9c1b4709b Basic but hacky way to get events out of map 2014-06-06 14:04:46 +10:00
Will Marshall
82ab14a33e Starting on on the map 2014-06-06 14:04:45 +10:00
Will Marshall
fc02e7857a Merge branch 'master' into laura_and_will 
Conflicts:
	app/views/shopping_shared/_contact.html.haml
 2014-06-04 17:24:30 +10:00
Will Marshall
69e5459afd Finishing off the merge with localStorage refactoring with sekrets 2014-06-04 17:22:10 +10:00
summerscope
039108a07d Styling label on taxons on fat view of active table for hubs (add a little padding to right) 2014-06-04 17:16:47 +10:00
Will Marshall
cd09f70ed3 Compacting down our flash messages 2014-06-04 17:13:19 +10:00
Will Marshall
a6a4d28072 Fixing up bugs in the Checkout form 2014-06-04 17:13:18 +10:00
Will Marshall
59c433881e Making the auto-closing more granular on checkout 2014-06-04 17:12:16 +10:00
Rohan Mitchell
fc3402bbd0 Determine whether to send card field attributes by payment method type 2014-06-04 16:55:27 +10:00
Rohan Mitchell
6a8def3d76 Do not send attributes for card fields when no card is supplied 2014-06-04 16:30:57 +10:00
Rohan Mitchell
37c780ed70 WIP: Send credit card details to server on checkout 2014-06-04 16:20:48 +10:00
summerscope
77f847dcbe Adding in new icon fonts to menu system. Adding drop down cog to simplify top menu. 2014-06-04 16:06:24 +10:00
summerscope
a6a86612c7 Adding X from new icon font to modal 2014-06-03 11:48:11 +10:00
summerscope
8caccfc5b0 Merge laura_and_will into icon_font 2014-05-30 17:01:49 +10:00
summerscope
ef5b36cddd Styling producers 2014-05-30 16:39:07 +10:00
summerscope
b19ca3b9c4 Remove whitespace 2014-05-30 16:38:27 +10:00
Will Marshall
5f163eef1c Tweaking the contact thingy 2014-05-30 16:10:45 +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
summerscope
91224ed0a4 Merge issues. Removing position fixed on modal window styling. 2014-05-30 14:27:37 +10:00
summerscope
5f6b8c9b5b Merge branch 'laura_and_will' into icon_font 2014-05-30 13:19:54 +10:00
summerscope
5bdb38e293 Merge issues. Removing position fixed on modal window styling. 2014-05-30 13:19:47 +10:00
Will Marshall
85ee33517a Restoring another deleted file 2014-05-30 13:19:23 +10:00
summerscope
2c334a0180 Styling for trash icon on checkout page 2014-05-30 13:02:34 +10:00
summerscope
5a7df20a2e Update icon font for mixins 2014-05-30 12:32:46 +10:00
summerscope
589188d21e Update icons for Tabs on hub shopping page 2014-05-30 12:32:28 +10:00
summerscope
5c44413ae9 Merge branch 'laura_and_will' into icon_font 2014-05-30 12:18:29 +10:00
summerscope
10418b6035 Merge issues. Removing position fixed on modal window styling. 2014-05-30 12:17:44 +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
Will Marshall
ee785a3498 Merge branch 'master' into laura_and_will 2014-05-30 12:01:33 +10:00
Will Marshall
1a47a7486e Automatically closing the accordion if the form is already valid 2014-05-30 11:58:22 +10:00
summerscope
e064aa3173 Restyling labels for new icons in checkout process 2014-05-30 11:49:32 +10:00
summerscope
a7a8c3ecee Change icon for bullet point for list style 2014-05-30 11:30:52 +10:00
summerscope
0eb4e35ee4 New version of icon font 2014-05-30 11:30:30 +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
e44853346e Dropping current producers, switching to suppliers and using Angular 2014-05-29 16:12:58 +10:00
summerscope
c81631118d Add styling to include the search icon in big input searches for Hubs and Producers 2014-05-29 12:00:16 +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
summerscope
3f36a3785b Adding in icon for list style from new OFN icon font 2014-05-28 17:06:34 +10:00