raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-06 02:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,590 Commits 16 Branches 455 Tags
c0cb9857cc04e1090be97bda557d39b0562fdfbb
Commit Graph

722 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
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
5eb54d1ac3 Merge branch 'groups_page' into fixing_modals 2014-05-28 16:04:55 +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
summerscope
1a79b966e9 Adding in links to homepage buttons for Groups & Producers 2014-05-28 12:21:25 +10:00
summerscope
3c3409bc1f Tweaks to styling on groups page 2014-05-27 18:03:12 +10:00
summerscope
9fe4bef7df Adding groups icon into background for visual consistency 2014-05-27 17:55:51 +10:00
summerscope
2130470eaf Styling for groups page 2014-05-27 17:11:42 +10:00
Rohan Mitchell
403e957111 Further removal of references to 'Admin' from global namespace 2014-05-24 17:15:20 +10:00
Rohan Mitchell
e951f80070 Merge branch 'new-product-form' 
Conflicts:
	app/assets/javascripts/admin/admin.js.coffee
 2014-05-24 17:14:32 +10:00
Rohan Mitchell
e119192cf1 Manually revert merge commit "Hack patching the modals" 2014-05-24 09:23:12 +10:00
Rohan Mitchell
69e0e71eb6 Revert "Styling for shop page product modal" 
This reverts commit 84b6f99321.

Conflicts:

	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-24 09:12:24 +10:00
Rob H
14611896c0 Simplify new product form 2014-05-23 18:08:29 +10:00
Will Marshall
fb7b9a051a Hack patching the modals 2014-05-23 17:22:27 +10:00
Will Marshall
40f116783c Merge branch 'new_shop' 
Conflicts:
	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-23 16:02:20 +10:00
summerscope
84b6f99321 Styling for shop page product modal 2014-05-23 15:59:06 +10:00
Rob H
e85c144e87 Remove reference to 'Admin' from global namespace 2014-05-23 11:22:12 +10:00
summerscope
4657285769 Producers modal styling and markup 2014-05-22 16:35:48 +10:00
Rob H
47f6d32055 Make list items the same height 2014-05-22 15:47:50 +10:00
Rob H
f8776fecff Move enterprises dashboard controller 2014-05-22 15:46:26 +10:00
Rob H
ed3c23cd90 Split 'My Enterprises' dashboard item into Hubs and Producers 2014-05-22 15:28:25 +10:00
summerscope
d7bc1a9b95 Styling for shop page product modal 2014-05-22 14:40:35 +10:00
Will Marshall
015403c282 Merge branch 'new_shop' 2014-05-22 12:40:48 +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
d6512a78d4 Removing position fixed 2014-05-22 12:39:52 +10:00
Rohan Mitchell
06955a024f Enterprise user can only create relationships with their own enterprises as parent 2014-05-22 11:02:03 +10:00
Will Marshall
250b76ec79 Merge branch 'master' into new_shop 2014-05-22 10:43:02 +10:00
Will Marshall
f997026796 Reworking the JS specs 2014-05-22 10:42:44 +10:00
Will Marshall
67e72f4504 Setting up after_login redirects 2014-05-22 10:42:44 +10:00
Will Marshall
2d0a42b2c2 Adding working modals 2014-05-22 10:42:44 +10:00
Rohan Mitchell
0c647841a6 Add dynamic filter to enterprise relationships 2014-05-21 16:18:07 +10:00
Rohan Mitchell
18886c931f Extract create EnterpriseRelationship to service 2014-05-21 11:29:11 +10:00
Rohan Mitchell
5d0680234d Admin can delete enterprise relationships 2014-05-21 11:29:11 +10:00
Rohan Mitchell
aa965e3752 Show a CSS3 animation when a row is added 2014-05-21 11:29:11 +10:00
Rohan Mitchell
b9a9937541 Attempting to create a relationship with invalid data shows an error message 2014-05-21 11:29:11 +10:00
Rohan Mitchell
9b2a80c6b5 Admin can create enterprise relationships 2014-05-21 11:29:11 +10:00
Rohan Mitchell
5f4e4ebeb0 Admin can list enterprise relationships 2014-05-21 11:29:11 +10:00
Rohan Mitchell
f7de504d89 Add stub angular controller for managing enterprise relationships 2014-05-21 11:29:11 +10:00
summerscope
d874855aa1 Update styling on empty cart 2014-05-20 16:40:23 +10:00
summerscope
0957edee5d Styling for shopping cart page 2014-05-20 15:50:03 +10:00
summerscope
52345d9bb3 Improvements to shoptfront page styling 2014-05-20 14:11:41 +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
summerscope
1dd9f6326b Tweaking the markup and styling for shop page. 2014-05-16 15:59:53 +10:00