raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,967 Commits 18 Branches 452 Tags
da620f372328c033d76f09dc8f5dfa65ac8a85e1
Commit Graph

3967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ed91cd6463 Make sure d1 != d2 2014-09-24 20:48:52 +10:00
Rob Harrington
b5ef24bacb table matchers use capybara matchers rather than wait_until with micro-sleep 2014-09-24 16:18:59 +10:00
Rob Harrington
f0f165a129 Explicitly create enterprises in order_cycle factory to fix intermittent fail 2014-09-24 14:00:08 +10:00
Rob Harrington
1a86206e1f Fixing super annoying server reload bug 2014-09-24 13:01:40 +10:00
Rob Harrington
c6d463bf25 Revert "Pending bulk order mgmt specs" 
This reverts commit eead8d665f.
 2014-09-20 18:06:42 +10:00
Rob Harrington
b86848269b Merge branch 'specs' into reg_images 2014-09-19 23:44:31 +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
Rob Harrington
c6acbc6810 Assigning @spree_api_key for store 2014-09-19 16:09:26 +10:00
Rob Harrington
eeb54f3f76 Allow new user to create enterprises 2014-09-19 15:30:53 +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
544e6e074a Stop being lazy 2014-09-19 14:38:59 +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
64fdbcf04f update enterprise type spec 2014-09-18 18:17:31 +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
summerscope
c42f83b6b1 Tweak markup to show producer name and write logic for link around producer if also own shopfront 2014-09-18 15:13:48 +10:00
Rafael Schouten
d75076e1c9 producer icons and inital link logic 2014-09-18 13:59:47 +10:00
Rafael Schouten
21628ed069 Merge branch 'master' into ent_types_frontend2 2014-09-17 17:45:55 +10:00
Rafael Schouten
e9dd863462 Merge branch 'master' into payment_description 
Conflicts:
	app/views/spree/order_mailer/confirm_email.text.erb
 2014-09-17 17:07:43 +10:00
Rafael Schouten
83b19ee632 fix haml and formatting on confirm email 2014-09-17 16:56:44 +10:00
Rafael Schouten
79fd8ed98b dubug mail template 2014-09-17 15:37:38 +10:00
Rafael Schouten
e618c4c2c0 add payment description to checkout 2014-09-17 14:56:29 +10:00