raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,778 Commits 18 Branches 451 Tags
92eca72f4f03fe58e429db027da031fb30a43390
Commit Graph

216 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
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
69e5459afd Finishing off the merge with localStorage refactoring with sekrets 2014-06-04 17:22:10 +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
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
Will Marshall
1a47a7486e Automatically closing the accordion if the form is already valid 2014-05-30 11:58:22 +10:00
Will Marshall
e26a61c31f Adding back sanitize 2014-05-29 16:49:20 +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
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
Will Marshall
fcfda13a73 Patching a couple of minor regressions 2014-05-28 16:10:28 +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
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
Rohan Mitchell
e119192cf1 Manually revert merge commit "Hack patching the modals" 2014-05-24 09:23:12 +10:00
Will Marshall
fb7b9a051a Hack patching the modals 2014-05-23 17:22:27 +10:00
Will Marshall
d1b27edefe Reworking the JS specs 2014-05-22 12:40:46 +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
685ba3f63a Fixing my modal and the tests 2014-05-20 12:18:28 +10:00
Will Marshall
0958602418 Starting on migrations and admin forms 2014-05-20 12:18:27 +10:00
Will Marshall
91fe8e18d3 Taxon sorting 2014-05-16 10:23:32 +10:00
Will Marshall
8c6e884563 Further improvements, fixing my directive, re-arranging partial 2014-05-16 10:23:31 +10:00
Will Marshall
12ddbb6a32 Reworking the shop page 2014-05-16 10:23:31 +10:00
Will Marshall
c0ba560fa6 Moving empties cart to a magic directive 2014-05-15 14:47:16 +10:00
Will Marshall
1c98f10c20 Adding indexing by user id 2014-05-14 11:08:21 +10:00
Will Marshall
f25617dde7 Tweaks for laura, reworking authentication workflow, tidying up checkout 2014-05-09 16:42:51 +10:00
Will Marshall
9241178fe2 Making modal medium man 2014-05-09 12:23:34 +10:00
Will Marshall
c52457505e Fixing issues with offcanvas 2014-05-09 12:18:05 +10:00
Will Marshall
8595359d4d Fixing a missing reference to Navigation 2014-05-09 11:03:03 +10:00
Will Marshall
aff33a1f61 Disabling autoscroll 2014-05-08 17:10:29 +10:00
Will Marshall
f5ca01d344 Removing the generic handling on hashes 2014-05-08 17:10:29 +10:00
Will Marshall
ab64de5838 And patching bugs in nav 2014-05-08 17:10:29 +10:00
Will Marshall
5fa0d845a4 Reworking the checkout 2014-05-08 16:38:21 +10:00
Will Marshall
998fb07330 Splitting out the accordion stuff for checkout 2014-05-08 16:07:56 +10:00
Will Marshall
457c9be0f3 Patching a conflict with Foundation JS 2014-05-08 15:14:09 +10:00
Will Marshall
50f5a1c46f Hash toggling 2014-05-08 13:19:44 +10:00