Rob Harrington
|
b320f71771
|
Adding revamp for signup confirmation by @summerscope
|
2014-11-14 17:59:56 +11:00 |
|
Rob Harrington
|
27d1886d53
|
Fix mailto link
|
2014-11-14 17:58:13 +11:00 |
|
Rob Harrington
|
15559b2388
|
Merge branch 'master' into pretty-emails
|
2014-11-14 16:54:50 +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 |
|
Lynne Davis
|
15f29f4c8e
|
266: Adding ability to search by distribution
|
2014-11-12 18:52:25 +00:00 |
|
Lynne Davis
|
932d571d2c
|
266: Updating to incorporate Rohans suggestions. Searching on payment method name rather than id
|
2014-11-12 11:47:26 +00:00 |
|
Rob Harrington
|
7282c7174f
|
Moving alert box to top of section
|
2014-11-12 15:55:48 +11:00 |
|
Rob Harrington
|
7a719952fc
|
Adding informative messages about email confirmations to enterprise form
|
2014-11-12 15:20:52 +11:00 |
|
Rob Harrington
|
2c67066366
|
Add alert to enterprise edit page to remind user that confirmation email has been sent
|
2014-11-12 15:20:52 +11:00 |
|
Rob Harrington
|
ee2ee5dba7
|
Adding an enterprise welcome email
|
2014-11-12 15:20:51 +11:00 |
|
Paul Mackay
|
9b7fd1c16b
|
#275: small tweaks.
|
2014-11-09 11:19:26 +00:00 |
|
Paul Mackay
|
05437e2a56
|
#275: start on producer email.
|
2014-11-09 11:17:46 +00:00 |
|
Rob Harrington
|
66bbaabf79
|
Adding loading gif to shop page
|
2014-11-07 16:50:31 +11:00 |
|
summerscope
|
791cc9b301
|
Hide pricing table until language is sorted
|
2014-11-07 13:56:28 +11:00 |
|
summerscope
|
2166fbc8a0
|
Tweak wording for kirsten
|
2014-11-07 13:56:07 +11:00 |
|
summerscope
|
9f74e8ff03
|
Add caret to right on register buttons, kill commented out text
|
2014-11-07 12:05:35 +11:00 |
|
summerscope
|
4795de5ab0
|
Adding new partial into homepage
|
2014-11-07 08:49:09 +11:00 |
|
summerscope
|
9a2e510f2c
|
Add Producers register link to footer
|
2014-11-07 08:48:37 +11:00 |
|
summerscope
|
cd34aedbb9
|
New partial for producer register pricing table
|
2014-11-07 08:48:24 +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 |
|
Rob Harrington
|
70c4b7082d
|
Split ent confirmation email out into layout and partial
|
2014-11-06 21:19:21 +11:00 |
|
Rohan Mitchell
|
4389389d44
|
Checkout: Display error when shipping or payment method is not selected
|
2014-11-06 18:29:49 +11:00 |
|
Rohan Mitchell
|
f2c6ee87d3
|
Extract duplicated checkout accordion heading to partial
|
2014-11-06 18:29:48 +11:00 |
|
Rohan Mitchell
|
519aea2d9b
|
Extract checkout shipping ship address to partial
|
2014-11-06 18:29:48 +11:00 |
|
Rohan Mitchell
|
433cf9dd9b
|
Checkout: Use validated_select for shipping address fields
|
2014-11-06 18:29:48 +11:00 |
|
Rohan Mitchell
|
7a0c291fc1
|
Checkout: Use validated_select for country
|
2014-11-06 18:29:48 +11:00 |
|
Rohan Mitchell
|
06a9110e95
|
Extract checkout select options to helpers
|
2014-11-06 18:29:48 +11:00 |
|
Rohan Mitchell
|
900a98b4bb
|
Display errors on checkout State field
|
2014-11-06 18:29:48 +11:00 |
|
Rohan Mitchell
|
cbb968d87f
|
Pass checkout form to controller method
|
2014-11-06 18:29:48 +11:00 |
|
Rohan Mitchell
|
75b250d3fe
|
When submitting checkout, if field is invalid, show errors
|
2014-11-06 18:29:48 +11:00 |
|
Rohan Mitchell
|
e8e5f7033c
|
Improve all the syntax
|
2014-11-06 18:29:48 +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 |
|
Lynne Davis
|
6f6ae309c6
|
266 UK: Adding first UK report - Payment Methods Report - to find balances per ordercycle for multiple payment method options. Working, but not complete to spec yet
|
2014-11-02 11:26:39 +00:00 |
|
Paul Mackay
|
543368169f
|
#254: Localisation of home page and welcome email.
|
2014-10-31 06:59:43 +00:00 |
|
Rohan Mitchell
|
1d9a3f33e0
|
Order cycle distributors must have shipping and payment methods
|
2014-10-31 12:22:02 +11:00 |
|
Rohan Mitchell
|
fc1c3abb9f
|
Remove duplicate data injection (duplicated in darkswarm layout)
|
2014-10-31 12:22:02 +11:00 |
|
Rohan Mitchell
|
433806aca8
|
Remove unused helpers and standardise naming
|
2014-10-31 12:22:02 +11:00 |
|
summerscope
|
34f47cedae
|
Fix markup for better layout and getting column padding sitting where it should
|
2014-10-30 17:03:09 +11:00 |
|
summerscope
|
733b249b12
|
making tabs break down better for responsive and small devices
|
2014-10-30 17:03:09 +11:00 |
|
summerscope
|
38e6575781
|
Move first and last name fields to top of shipping address accordion
|
2014-10-30 17:03:08 +11:00 |
|
summerscope
|
799c894bd3
|
Tweak logo embedding to use new version, and use srcset with src as a fallback
|
2014-10-30 17:03:08 +11:00 |
|
Rob Harrington
|
6596e14e5d
|
Use shared partial for errors on EnterpriseFeeSet
|
2014-10-30 13:02:16 +11:00 |
|
Rob Harrington
|
65d13e0490
|
Show error messages on enterprise index page
|
2014-10-30 13:02:16 +11:00 |
|
Rafael Schouten
|
2b0757e96f
|
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork
|
2014-10-25 20:23:25 +11:00 |
|
Rob Harrington
|
43d3955627
|
Change wording of trial option on change_type_form
|
2014-10-25 19:56:52 +11:00 |
|
Rafael Schouten
|
095dd28505
|
Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork
|
2014-10-25 18:53:46 +11:00 |
|
Rafael Schouten
|
8395dbb3e9
|
Merge branch 'master' into config
Conflicts:
.gitignore
Gemfile
|
2014-10-25 15:29:53 +11:00 |
|
Rafael Schouten
|
33fc7e0fc9
|
Merge branch 'master' into checkout
|
2014-10-25 15:12:24 +11:00 |
|
summerscope
|
928e5dc474
|
Make styling more specific to single enterprise dashboard user only
|
2014-10-24 16:39:59 +11:00 |
|