raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-21 05:09:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,441 Commits 17 Branches 458 Tags
258573f5a67b328366e041e7d0f4e1846d2efd05
Commit Graph

548 Commits

Author SHA1 Message Date
Rob Harrington
258573f5a6 Remove obsolete text version of user signup_confirmation 2014-11-26 18:58:26 +11:00
Rob Harrington
0cf2df8358 Remove obsolete text version of order confirm_email 2014-11-26 18:54:50 +11:00
Rob Harrington
8a3bffb37d Cart page conforms to convention in rest of checkout, adjusting helpers through checkout 2014-11-26 18:53:29 +11:00
Rob Harrington
8f27c643f1 Move override for cart line item into existing view replacement 2014-11-26 16:08:53 +11:00
Rob Harrington
a8dde3bbb9 Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry 2014-11-26 15:16:53 +11:00
Rob Harrington
f6b0863279 Make cost breakdowns consistent throughout checkout 2014-11-26 13:07:40 +11:00
Rob Harrington
9bd3909449 Merge master into pretty-emails 2014-11-21 14:43:01 +11:00
Rohan Mitchell
0b030a85ff Incrementally load products 2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f Display products in table 2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1 User can select a hub 2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720 Do not show producers in hubs list 2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31 Show list of hubs to select for managing variant overrides 2014-11-21 13:49:09 +11:00
Rohan Mitchell
7e4d337773 Extract DisplayProperties to a service 
Conflicts:

	app/assets/javascripts/admin/bulk_product_update.js.coffee
 2014-11-21 08:41:41 +11:00
Rohan Mitchell
29e49b67cc In BPE, rename producer and category JSON attrs to producer_id and category_id 
Conflicts:

	spec/features/admin/bulk_product_update_spec.rb
 2014-11-21 08:41:41 +11:00
Rob Harrington
ebaaf2a136 Display line items in confirmation email with fees included in item totals 2014-11-20 20:17:18 +11:00
Rob Harrington
46462a1abb Format fiddling in user signup confirm email 2014-11-20 20:13:54 +11:00
Rohan Mitchell
76c300283b Remove CONTACT_STRING config - Rob has an admin-managable override for this coming soon 2014-11-20 15:59:06 +11:00
Rob Harrington
4dd5e51ed5 Stripping out inline styles from user signup email template 2014-11-20 15:48:36 +11:00
Rob Harrington
15d157abc0 Stripping out inline styles from email templates 2014-11-20 15:42:03 +11:00
Rohan Mitchell
8096ca2519 Merge remote-tracking branch 'origin/config' into config 2014-11-20 15:41:15 +11:00
Rob Harrington
fe0bb49baf WIP: Adding templates for different order confirmation emails 2014-11-20 12:06:53 +11:00
Rob Harrington
d182bb7bf7 Add signoff partial for mailer templates 2014-11-14 18:09:48 +11:00
Rob Harrington
b320f71771 Adding revamp for signup confirmation by @summerscope 2014-11-14 17:59:56 +11:00
Rob Harrington
d9d6b7bee4 Adding filtering to Users and Enterprises report 2014-11-14 16:36:22 +11:00
Rob Harrington
79a83ee206 Adding users and enterprises report, controller action and template 2014-11-14 16:36:22 +11:00
Rob Harrington
898af0a55e Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice 2014-11-06 21:19:21 +11:00
Rohan Mitchell
98f434dad3 Merge branch 'i18n' of https://github.com/folklabs/openfoodnetwork into folklabs-i18n 2014-11-05 11:54:42 +11:00
Paul Mackay
543368169f #254: Localisation of home page and welcome email. 2014-10-31 06:59:43 +00:00
Rob Harrington
43d3955627 Change wording of trial option on change_type_form 2014-10-25 19:56:52 +11:00
Rafael Schouten
8395dbb3e9 Merge branch 'master' into config 
Conflicts:
	.gitignore
	Gemfile
 2014-10-25 15:29:53 +11:00
summerscope
928e5dc474 Make styling more specific to single enterprise dashboard user only 2014-10-24 16:39:59 +11:00
Rob Harrington
80b36992f9 Merge in remote branch 2014-10-24 15:28:40 +11:00
Rob Harrington
a157528974 Adding specs for single ent dash and remove product ability for profiles 2014-10-24 15:27:08 +11:00
summerscope
2eb152f63e Change class name for big button; change labels for submit buttons 2014-10-24 14:49:09 +11:00
Rob Harrington
8ac367675f Adding big button class to CTA 2014-10-24 14:24:55 +11:00
Rob Harrington
3e002c6f82 Fiddle with text 2014-10-24 13:34:49 +11:00
Rob Harrington
b0d8290dab Add alert for visibility to single ent dash 2014-10-24 13:28:25 +11:00
Rob Harrington
8603cf685e Merge remote-tracking branch 'origin/onboarding' into onboarding 2014-10-24 13:03:04 +11:00
Rob Harrington
b182c6afc8 Merge in remote changes 2014-10-24 13:02:26 +11:00
summerscope
0d73d8f043 Fix layout add required class 2014-10-24 13:01:56 +11:00
Rob Harrington
498b51cedb Switching out chevron on Change Type button 2014-10-24 12:54:21 +11:00
summerscope
01cb39a93f Error messages specific to use case 2014-10-24 12:54:06 +11:00
summerscope
b3ac06e46c Fix icon type to match nav bar 2014-10-24 12:42:14 +11:00
summerscope
68cb3efc50 Markup fixes for single enterprise dashboard (first state) 2014-10-24 12:39:25 +11:00
Rob Harrington
d0c3502f27 Adding trial progress bar 2014-10-24 12:32:05 +11:00
summerscope
631386ced4 Tweaking markup 2014-10-24 11:48:53 +11:00
summerscope
76c6c260d1 Add row containers to make grid nesting work 2014-10-24 11:48:13 +11:00
summerscope
0b3e293b38 Remove whitespace, add alert box 2014-10-24 11:26:58 +11:00
Rob Harrington
f40b4d9d03 Different text for CTA button depending on context 2014-10-24 11:22:57 +11:00
Rob Harrington
911d1e3dc4 Add down chevron to change type button on single ent dash 2014-10-24 11:02:48 +11:00