raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-27 21:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,595 Commits 18 Branches 451 Tags
aaf9b765077b7ef20e27eaafe081cdc8d2ae85bd
Commit Graph

124 Commits

Author SHA1 Message Date
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
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
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
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
8595359d4d Fixing a missing reference to Navigation 2014-05-09 11:03:03 +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
50f5a1c46f Hash toggling 2014-05-08 13:19:44 +10:00
Will Marshall
d5648bd993 Removing some garbage, adding admin link 2014-05-08 11:50:57 +10:00
Will Marshall
1756479c85 Patching a regression bug with login on checkout 2014-05-06 18:28:20 +10:00
Will Marshall
3542799349 Removing pointless foundation crud, reworking the login 2014-05-06 18:28:20 +10:00
Will Marshall
1774bc1e19 Adding producers filtering and more Angular magic 2014-05-05 15:43:11 +10:00
Will Marshall
3d06caf1e3 Merging in master 2014-05-02 13:10:31 +10:00
Will Marshall
794d7b69ae Restoring our toggle option 2014-05-02 12:50:32 +10:00
Will Marshall
0f6bd7049c Starting to build out producers Angular page 2014-04-30 12:52:47 +10:00
Will Marshall
9117b1f516 Adding some notes for future refactoring and a couple of pending integration tests for the new home 2014-04-25 17:14:18 +10:00
Will Marshall
28230f0436 Adding a current user service, refactoring various consequences of this change: 2014-04-25 16:59:46 +10:00
Will Marshall
8f539aca1f Removing some console logs 2014-04-25 16:20:01 +10:00
Will Marshall
b0ecadcb28 Moving our sidebar to a service for maximum awesomesauce 2014-04-25 13:49:44 +10:00
Will Marshall
b7f28c8d82 Popup dialog when changing hub: 2014-04-25 12:11:09 +10:00
Will Marshall
22dc8cbfa0 Unbreaking karma karma lama 2014-04-25 12:04:15 +10:00
Will Marshall
2212156f00 Adding handling of 'current hub' 2014-04-25 11:32:02 +10:00
Will Marshall
9ef7023600 Adding template cache injection 2014-04-24 17:05:10 +10:00
Will Marshall
8027af2bb7 Adding active boolean and sorting 2014-04-23 13:22:30 +10:00
Will Marshall
f5b32ebd3f Better handling of the home page hubs 2014-04-23 12:58:34 +10:00
Will Marshall
6753b96f29 Adding darkswarm variant of home page, getting Angular skeleton into place, taking shit off window 2014-04-18 13:01:36 +10:00
Will Marshall
e2d3207a51 Namespacing accordion state by ID 2014-04-17 15:34:57 +10:00
Will Marshall
3b440ed027 Minor JS tweaks 2014-04-17 11:47:59 +10:00
Will Marshall
2b9b51de60 Don't cache things in window 2014-04-16 11:55:16 +10:00
Will Marshall
19b8cee38e Patching up some more bugs, adding workflow 2014-04-11 17:58:32 +10:00
Will Marshall
2d9be9ea06 Fixing the scope issue 2014-04-11 17:49:51 +10:00
Will Marshall
2e0485c064 Getting the entire order into localStorage: one bug with radio boxes 2014-04-11 17:24:32 +10:00
Will Marshall
c8012e7045 Improving panel workflow, moving back to simple format for Order service 2014-04-11 16:43:21 +10:00
Will Marshall
6e35dc7168 Merging with master 2014-04-11 13:09:22 +10:00
Will Marshall
33cf05ab83 Manually bringing over the login links for checkout 2014-04-11 12:37:32 +10:00
Will Marshall
cf3681b934 Moving over the new checkout authentication 2014-04-11 12:26:36 +10:00