raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-04-08 07:46:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,628 Commits 16 Branches 461 Tags
1d5cc5dcedc39efe0fe13fea67ca90b30f61e5aa
Commit Graph

204 Commits

Author SHA1 Message Date
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
2c1ca15393 Some tweaks to visual stuff 2014-05-29 15:37:19 +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
33829d9044 Only rendering images if they exist 2014-05-28 16:03:42 +10:00
Rohan Mitchell
bb1b7cfa90 Revert "Adding fields to product supplier" 
This reverts commit 6d24a6555e.
 2014-05-24 09:07:58 +10:00
Will Marshall
6d24a6555e Adding fields to product supplier 2014-05-23 15:59:06 +10:00
Will Marshall
1a7c6f87ed Adding fields to product supplier 2014-05-22 14:47:27 +10:00
Will Marshall
34c31afabe Adding large image 2014-05-22 11:34:46 +10:00
Will Marshall
2d0a42b2c2 Adding working modals 2014-05-22 10:42:44 +10:00
summerscope
601281ced7 Add button style to shop page 2014-05-20 16:04:26 +10:00
summerscope
0957edee5d Styling for shopping cart page 2014-05-20 15:50:03 +10:00
Will Marshall
685ba3f63a Fixing my modal and the tests 2014-05-20 12:18:28 +10:00
summerscope
1dd9f6326b Tweaking the markup and styling for shop page. 2014-05-16 15:59:53 +10:00
Will Marshall
eab9c28d2e Adding groups to this branch, also tidying up the shop stuff for Laura 2014-05-16 14:00:33 +10:00
Will Marshall
7c213a061b Getting working taxon sorting and icon rendering in 2014-05-16 10:23:32 +10:00
Will Marshall
91fe8e18d3 Taxon sorting 2014-05-16 10:23:32 +10:00
Will Marshall
c9fea79d19 Printing the primary taxon name 2014-05-16 10:23:32 +10:00
Will Marshall
9f169e6ef8 Adding a basic stub of the primary taxon 2014-05-16 10:23:31 +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
3ce196e042 Starting on the new shop 2014-05-16 10:23:31 +10:00
Will Marshall
b907616749 Renaming our partials 2014-05-02 14:47:12 +10:00
Will Marshall
6ad30d901d Tidying down shop/checkout test 2014-05-01 16:22:11 +10:00
Will Marshall
22aaa24962 Disabling scroll increment/decrement on Number inputs 2014-04-30 10:57:30 +10:00
Will Marshall
fb072ad1a5 Tweaking debounce, adding it to Shop 2014-04-18 16:56:14 +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
f2a048bf6e Adding another autofocus 2014-04-17 10:50:49 +10:00
Will Marshall
a7c2849e6b Moving icons around, adding a useful comment 2014-04-16 16:24:03 +10:00
Will Marshall
171c8c6ed1 Merging in with master 2014-04-16 16:16:15 +10:00
Will Marshall
20e1392736 Focusing appropriate fields as we move through the form 2014-04-16 16:13:04 +10:00
Will Marshall
d83367486b Adding icons to checkout, focusing on first input in each panel when selected 2014-04-16 16:07:19 +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
65c15ca20b Changing message for order cycle selector popup 2014-04-11 13:12:40 +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
Will Marshall
da241a4eee Removing some debugging 2014-04-10 17:26:00 +10:00
Will Marshall
831e53dc6e Displaying server errors as well 2014-04-10 17:21:34 +10:00
Will Marshall
acd8d2d8a2 Adding payment controller for consistency 2014-04-10 16:35:03 +10:00
Will Marshall
5f62cb7ddb Working with ngForm and subcontrollers. Also fixing bulk order specs 2014-04-10 16:32:08 +10:00
Will Marshall
00f5d09d65 Moving our inputs to magical helpers 2014-04-10 14:48:22 +10:00
Will Marshall
8b40092310 Starting to reflow the controllers 2014-04-10 14:27:32 +10:00
Will Marshall
621e58f67a First stab at a DRY implementation 2014-04-10 12:54:18 +10:00
Will Marshall
873de1d118 Able to submit Checkout form via Ajax 2014-04-09 15:31:15 +10:00
Will Marshall
36a4e34dff Preprocessing order attributes, returning path 2014-04-09 15:04:17 +10:00
Will Marshall
09d22f74ec Renaming some methods in our experimental 2014-04-09 11:51:12 +10:00
Will Marshall
b293efd110 Fixing issue at https://github.com/angular/angular.js/wiki/Understanding-Scopes - hiding our attributes inside objects so child scopes can access them safely 2014-04-08 18:39:50 +10:00