raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,993 Commits 19 Branches 453 Tags
3a14a26bc65edc8f08dfd595beb651e5de48103d
Commit Graph

1625 Commits

Author SHA1 Message Date
Rafael Schouten
3a14a26bc6 refactor wysiwyg 2014-10-01 16:07:10 +10:00
Rafael Schouten
726340fc86 configure textAngular on enterprise edit page 2014-09-30 18:20:45 +10:00
Rob Harrington
d3c8e4a547 Replacing reference to is_profile 2014-09-26 11:20:55 +10:00
summerscope
a6e8d6906f Tweak message on profile label 2014-09-26 11:20:09 +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
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
Rob Harrington
f5849e91dc Adding limit reached modal to registration 2014-09-25 12:25:32 +10:00
Rafael Schouten
da620f3723 Merge branch 'master' into ent_types_frontend 2014-09-25 10:09:42 +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
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
1c0196cf5d Change language for Kirsten 2014-09-19 16:25:34 +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
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
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
Rafael Schouten
b6fd3a11fa remove old mailer 2014-09-17 11:54:06 +10:00
Rafael Schouten
f79dfed6ef use haml for mailer 2014-09-17 11:53:47 +10:00
Rafael Schouten
01c98bf6e4 refactor and bugfix for tests 2014-09-17 01:07:34 +10:00
Rafael Schouten
49476b17e8 fix typos and add missing helper 2014-09-16 16:10:48 +10:00
Rafael Schouten
1aa80e53b1 Merge branch 'master' into currency 
Conflicts:
	app/helpers/injection_helper.rb
	db/suburb_seeds.rb
 2014-09-16 10:25:22 +10:00
summerscope
c365047d0c Short description goes back in producer fat view until we can clean up the HTML formatting 2014-09-12 15:40:12 +10:00
summerscope
42fccd1bdf Merging master into my branch to make it up to date 2014-09-12 14:48:19 +10:00
summerscope
3cff83b7a5 Kill the outside modal close button styling once and for all 2014-09-12 14:42:58 +10:00
Rob H
bcca8c5c0d Merging master into all the things 2014-09-12 13:28:30 +10:00
Rob H
f5048ecf7c Sends confirmation email when Enterprise is created 2014-09-12 13:24:17 +10:00
Rafael Schouten
9a1b524915 fix icon font class 2014-09-12 12:21:40 +10:00
Rohan Mitchell
e50bbeaefb Edit product form shows permitted suppliers 2014-09-12 11:33:47 +10:00
summerscope
bfa71942fe Tweaks to input placeholder label 2014-09-12 11:02:28 +10:00
Rob H
6ee3010fa7 Differentiation of on-boarding process by url 2014-09-12 11:00:34 +10:00
summerscope
9c33be911c Update placeholder label 2014-09-12 10:49:59 +10:00
summerscope
6d7fd6dc94 Add in logic to change right hand label if this is the current hub 2014-09-12 10:48:33 +10:00
Rob H
ef8f611458 Adding countries and states to registration 2014-09-11 17:07:05 +10:00
Rob H
7dc42c9e39 Creating an enterprise works in registration process 2014-09-11 17:07:05 +10:00