raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-17 04:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,706 Commits 15 Branches 457 Tags
4f751eb3e38be44715e89cd8fcb497c36084cee3
Commit Graph

1182 Commits

Author SHA1 Message Date
Transifex-Openfoodnetwork
4f751eb3e3 Updating translations for config/locales/nb.yml 2018-08-13 17:08:33 +10:00
Transifex-Openfoodnetwork
6c306aa1dd Updating translations for config/locales/fr.yml 2018-08-10 21:09:21 +10:00
luisramos0
3b1bd53d3a Added basic integration with Matomo 
Added matomo script and added a new matomo settings menu entry under configuration. Improved organization of en.yml by grouping configuration screens.
 2018-08-10 16:12:58 +10:00
Kristina Lim
17978f58c7 Rename edit link in admin enterprise index 
Change "Edit Profile" link to "Settings".
 2018-08-10 12:17:31 +10:00
Kristina Lim
295604b689 Change heading for edit enterprise page 
Change the start of the heading from "Editing:" to "Settings:".
 2018-08-10 12:17:31 +10:00
Kristina Lim
0b4fcf8a14 Change enterprise "Manage" button to "Settings" 2018-08-10 12:17:30 +10:00
Kristina Lim
b91019ad64 Split translation key for enterprise manage button 
The ".manage" key is still used by the column header for the "Manage"
buttons.
 2018-08-10 12:12:26 +10:00
Maikel
33f6dc21e7 Merge pull request #2516 from kristinalim/cleanup-move_admin_and_spree_from_routes 
Separate admin and Spree routes from main file
 2018-08-09 10:10:49 +10:00
Maikel
03468efa7e Merge pull request #2346 from oeoeaio/subs-totals 
Subs: totals in backend are consistent and include fee breakdown
 2018-08-07 18:17:13 +10:00
Kristina Lim
b67c8cc9f1 Improve requiring of additional routes 
This is more appropriate, and allows changes the separate route files to
be loaded automatically in the development environment.
 2018-08-06 17:04:03 +08:00
Kristina Lim
4d34693c05 Move Spree route customizations from main file 2018-08-06 09:57:29 +08:00
Kristina Lim
72036a4993 Move admin routes from main file 2018-08-06 09:57:24 +08:00
Maikel Linke
b736560d63 Inform about inaccurate subscription totals 
https://github.com/openfoodfoundation/openfoodnetwork/pull/2346#issuecomment-409822038
 2018-08-03 14:59:27 +10:00
Matt-Yorkley
c8397024e4 Streamline Product Import UX flow 2018-08-03 14:33:35 +10:00
Maikel Linke
c48889f368 Remove duplicate translation key 2018-08-03 12:15:50 +10:00
Maikel
02331221ef Merge pull request #2471 from Matt-Yorkley/pi/post_save 
PI: post-save UI changes
 2018-07-26 11:26:51 +10:00
Matt-Yorkley
bd200c885b Move options to first page 2018-07-23 01:46:32 +01:00
Maikel
add250b30f Merge pull request #2473 from Matt-Yorkley/pi/stop_if_invalid 
PI: Don't allow save if invalid entries are present
 2018-07-23 08:54:01 +10:00
Maikel
23964b2542 Merge pull request #2422 from luisramos0/1667_email_validation_fix 
1667 manage validations emails
 2018-07-20 12:19:23 +10:00
luisramos0
8246893652 Added notice for unexpected mail in confirmation instructions mail (HugsDaniel) 2018-07-19 09:26:29 +10:00
Matt-Yorkley
583f16b38d Add guest label to admin customers index 2018-07-18 22:56:10 +01:00
Pau Pérez Fabregat
4fe1e1fc9f Merge pull request #2482 from Matt-Yorkley/uk/mail_config 
Allow preferred_mails_from and preferred_mail_bcc to be set from configs
 2018-07-18 19:20:55 +02:00
Pau Pérez Fabregat
fac8e26d8b Merge pull request #2475 from Matt-Yorkley/pi/landing_page 
PI: landing page
 2018-07-18 16:47:17 +02:00
Matt-Yorkley
23cbcda0c3 Allow preferred_mails_from and preferred_mail_bcc to be set from configs 2018-07-18 15:43:02 +01:00
Matt-Yorkley
b37bea35fa Use relative translation keys 2018-07-18 11:43:31 +01:00
Kristina Lim
c16f4203f9 Rename enterprise "Relationships" to "Permissions" 
This only updates en* translations, and does not affect URLs and other
back-end references.
 2018-07-17 16:03:48 +10:00
Matt-Yorkley
c4af50e95c Add sidebar to Import index page 2018-07-15 23:12:26 +01:00
Matt-Yorkley
f344b7893d Remove Product Import guide page 2018-07-15 20:49:55 +01:00
Matt-Yorkley
8aed78b0e6 Don't allow save if invalid entries are present 2018-07-15 10:21:36 +01:00
Matt-Yorkley
a4210a1cab PI post-save UI changes 2018-07-15 00:27:21 +01:00
Maikel Linke
43883d1ab4 Simplify email confirmation directive 
Making better use of Angular features.
Adding a spec for this functionality.
 2018-07-13 09:04:42 +10:00
Maikel Linke
60b66540df Add resend email button to admin user form 
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1589
 2018-07-13 09:04:41 +10:00
Maikel Linke
6a58deb436 Add message about unconfirmed email to user form 2018-07-13 09:04:41 +10:00
Maikel
b65578fdc5 Merge pull request #2408 from mkllnk/cleanup-route 
Remove impossible route
 2018-07-13 09:01:33 +10:00
Maikel
0bd40f498a Merge pull request #2447 from mkllnk/update-translation-documentation 
Move i18n locale doc to wiki and reference that
 2018-07-12 10:07:39 +10:00
Maikel Linke
86f2d7a344 Remove impossible route 
Hash fragments are not part of the http request and not sent to the
server. So the routes will never see a hash fragment which means that
this route is never used.
 2018-07-12 10:05:08 +10:00
luisramos0
b302a1d03d added Enterprise registration exit message and moved step TYPE translations to a new structure on en.yml (test if transifex picks up the existing translations) 2018-07-12 08:53:06 +10:00
Maikel Linke
24f77184cf Move i18n locale doc to wiki and reference that 2018-07-11 11:31:27 +10:00
Pau Pérez Fabregat
deb04c3075 Merge pull request #2444 from openfoodfoundation/transifex 
Transifex
 2018-07-10 12:12:05 +02:00
Transifex-Openfoodnetwork
15db5e1d50 Updating translations for config/locales/en_GB.yml 2018-07-09 20:23:01 +10:00
Rob Harrington
0afa9fae8e Check authorisation before attempting to charge credit cards on order cycle close 2018-07-05 19:26:12 +10:00
Rob Harrington
a902af42a3 Update attribute that errors are added to from credit_card to payment_method 2018-07-05 19:26:12 +10:00
Rob Harrington
21c3f7d21c Remove unrequired #cards and #addresses actions from Admin::CustomerController 2018-07-05 19:26:12 +10:00
Rob Harrington
c71a5ec0df Update subscription form to use new card validations for Stripe payment method 2018-07-05 19:26:11 +10:00
Rob Harrington
cf8ca1f8c1 Add show action to Admin::CustomersController 2018-07-05 19:26:11 +10:00
Rob Harrington
d1d9c5a092 Add help button to saved cards list on account page 
Describes the purpose of the default card
 2018-06-22 15:39:47 +10:00
Rob Harrington
7db7084008 Use help-modal to display help text for authorised shops 
Also updated the text slightly to make it more clear when the purpose of authorised shops are
 2018-06-22 15:39:47 +10:00
Rob Harrington
6457a17fde Add basic view allowing customers to authorise shop use of their credit cards 2018-06-22 15:39:47 +10:00
Rob Harrington
ffa8a8c7d6 Create Api::BaseController to allow use of ActiveModelSerializers 
Also add index action to Api::CustomersController
 2018-06-22 15:39:47 +10:00
Rob Harrington
6e76fd8164 Add Api::CustomersController with update action 2018-06-22 15:39:46 +10:00