raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-22 05:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,117 Commits 17 Branches 458 Tags
e4c8c19fea02db8a3297d7cb677391cb9ed24042
Commit Graph

224 Commits

Author SHA1 Message Date
Will Marshall
e4c8c19fea Tweaking the producer modal 2014-06-27 14:39:50 +10:00
Will Marshall
2c6e239962 Adding some basic animations, upgrading Angular Foundation 2014-06-25 13:59:22 +10:00
Will Marshall
b3f0cb1e74 Bunch of minor bugfixes 2014-06-24 17:14:01 +10:00
Will Marshall
3fc337299b Adding ponies and filtering 2014-06-20 17:14:05 +10:00
Will Marshall
ba842be5b8 Loading enterprises per-view again 2014-06-20 12:03:51 +10:00
Will Marshall
17521516b4 Patching up some regressions with the tabs 2014-06-20 11:33:30 +10:00
Will Marshall
7f4816c9a5 Adding new producer modal and dereferencing shopfront 2014-06-19 14:00:37 +10:00
Will Marshall
8905b45333 Fixing a minor regression 2014-06-19 12:10:05 +10:00
Will Marshall
c02c7cf7ca Further patches to the damned RABL system, patching everything up to use our new Service structure 2014-06-18 17:54:13 +10:00
summerscope
80f26c7457 Tweak label until shipping methods are available 2014-06-17 10:50:47 +10:00
summerscope
5f155df42a Making input label in shopfront small to distinguish from variant name and price 2014-06-13 14:32:06 +10:00
Will Marshall
bc93ce57e6 Smooth scrolling, svg support via directive 2014-06-13 11:00:28 +10:00
summerscope
f9ded4c616 Markup change for taxon to be spat out correctly in shopfront view 2014-06-12 16:22:54 +10:00
Will Marshall
a55e58d50c Adding working scrolling to anchors 2014-06-12 16:13:51 +10:00
Will Marshall
7a062b0310 Reworking the variant display of units and names 2014-06-12 16:13:51 +10:00
Rob H
1a91b5a728 Move option value naming logic into separate lib class 2014-06-12 12:55:53 +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
d944c31d77 Showing a loading products thing 2014-06-04 17:12:16 +10:00
summerscope
c2a2f2b3b8 Adding icon for producers. Remove styling summary-header to distinguish between product and producer 2014-06-04 16:51:43 +10:00
Rob H
bf4d83aecc Fix master options_text display on front end 2014-05-30 18:39: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
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