raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-22 00:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,987 Commits 19 Branches 454 Tags
55f4415c0dbb665dc2d12cb97f76f4dbcfc11208
Commit Graph

2995 Commits

Author SHA1 Message Date
Rafael Schouten
55f4415c0d Merge branch 'master' into cleanup 
Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml
 2014-09-25 19:42:20 +10:00
Rob Harrington
b55b4e9a0c Merge branch 'master' into ent_types_frontend 2014-09-25 17:20:15 +10:00
Rob Harrington
33dff551c7 Removing 'show profiles' from producer and shop pages 2014-09-25 17:19:57 +10:00
Rob Harrington
1e31dd88ee Remove unrequired functions, add has_hub_listing 2014-09-25 17:19:57 +10:00
summerscope
cbc8a62686 STyling for profile only small view 2014-09-25 17:02:41 +10:00
summerscope
3b7cd6d329 Making the styling work for profiles and producers 2014-09-25 16:54:17 +10:00
summerscope
97ae170dd1 Add in profile only use case to styling 2014-09-25 16:40:06 +10:00
summerscope
3812d1eebb Add more greys 2014-09-25 16:39:48 +10:00
summerscope
2e1b2ffe12 Add italics 2014-09-25 16:04:27 +10:00
summerscope
a068411b7d Add in class to show when hub is 2014-09-25 16:00:03 +10:00
Rafael Schouten
f8b083e4b7 fix lost hub link 2014-09-25 14:04:10 +10:00
Rafael Schouten
bab9123ca8 delete unused javascript 2014-09-25 14:01:06 +10:00
Rafael Schouten
096324cf5e bugfix filters 2014-09-25 13:46:08 +10:00
Rafael Schouten
0e2774882f dry enterprise angular 2014-09-25 13:06:02 +10:00
Rob Harrington
f5849e91dc Adding limit reached modal to registration 2014-09-25 12:25:32 +10:00
Rob Harrington
6fa7d9cbcb Registration controller checks number of owned enterpises 2014-09-25 12:10:45 +10:00
Rafael Schouten
3775cd29cb generalise search filter to any enterprise 2014-09-25 11:34:49 +10:00
Rafael Schouten
da620f3723 Merge branch 'master' into ent_types_frontend 2014-09-25 10:09:42 +10:00
Rafael Schouten
f8d5b7ede8 refactor enterprise types to six options 2014-09-24 23:30:43 +10:00
Rob Harrington
5bceb81479 Fixing image upload in onboarding 2014-09-19 23:37:02 +10:00
Rob Harrington
509cf6250a Explicitly sort managed products 2014-09-19 18:32:03 +10:00
Rob Harrington
07275574b6 Manager can't bulk update owner 2014-09-19 18:31:50 +10:00
Rob Harrington
5d2d619d66 Assigning @spree_api_key for store 2014-09-19 18:31:33 +10:00
Rob Harrington
17ce80a417 Allow new user to create enterprises 2014-09-19 18:31:23 +10:00
summerscope
d86c3cff26 Making enterprise header styles show as turquoise when no shopfront to click through to 2014-09-19 17:48:24 +10:00
summerscope
5e4e939087 Return template markup which was accidentally removed in Rafs merge 2014-09-19 17:47:49 +10:00
Rafael Schouten
559d3b0e4b fixup the header but needs some styling 2014-09-19 17:24:41 +10:00
Rafael Schouten
883e5f1095 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend 
Conflicts:
	app/assets/javascripts/templates/partials/enterprise_header.html.haml
 2014-09-19 17:22:29 +10:00
Rafael Schouten
abc5a215a2 add map modals, profile filters and bugfixes 2014-09-19 17:07:07 +10:00
summerscope
919f87df58 change modal styling to improve look of Close button, overall layout for modals 2014-09-19 16:46:19 +10:00
Rafael Schouten
cf13115d57 bugfix is_profile bool 2014-09-19 16:44:51 +10:00
summerscope
408f7b7f10 Modals styling refine for small use cases 2014-09-19 16:44:43 +10:00
Rafael Schouten
e4991d4528 reorganise and document enterprise categories 2014-09-19 16:44:28 +10:00
summerscope
09cc3c6285 Styling for hero image underlay used on enterprises- adjust min heights for different text use cases 2014-09-19 16:44:16 +10:00
summerscope
5a7175e75d Tweak markup to make modals fit headers nicely across small sizes 2014-09-19 16:43:31 +10:00
summerscope
1c0196cf5d Change language for Kirsten 2014-09-19 16:25:34 +10:00
summerscope
4c7fa4eb9f Fix markup so that text is not nested inside icon markup 2014-09-19 15:19:47 +10:00
summerscope
e5fc3c19e3 Working on refining scroll on modals 2014-09-19 14:41:45 +10:00
Rob Harrington
d3e72b5a2a Adding images to registration process 2014-09-19 12:41:24 +10:00
Rafael Schouten
f9cbdcee0a swap profile name 2014-09-19 12:18:02 +10:00
Rafael Schouten
527a139f72 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend 2014-09-18 18:17:41 +10:00
Rafael Schouten
0d5106d571 refactor enterprise type logic and fix icons 2014-09-18 18:15:28 +10:00
summerscope
9a4ba5aa1f Producer page styling and logic for markup 2014-09-18 16:15:14 +10:00
summerscope
e1769e638d More styling for producer page 2014-09-18 16:14:53 +10:00
summerscope
24ca1b064a Tweak language for help popover 2014-09-18 15:34:56 +10:00
summerscope
0b59ca2dc1 Turning Show Profiles checkbox back on ready for logic 2014-09-18 15:33:44 +10:00
summerscope
7f4bccc956 fix anchor angular for link to hub shopfront 2014-09-18 15:22:53 +10:00
summerscope
20a76626b9 Add styling for instance where producer is own shopwfront on producer page 2014-09-18 15:22:29 +10:00
Rafael Schouten
1fdcbbec40 Merge branch 'ent_types_frontend' of https://github.com/openfoodfoundation/openfoodnetwork into ent_types_frontend 2014-09-18 15:15:01 +10:00
Rafael Schouten
bd922085c4 icons and entity category logic 2014-09-18 15:14:55 +10:00