657 Commits

Author	SHA1	Message	Date
luisramos0	1b4e0cd73a	Made the menu config default values more user friendly	2018-08-31 11:23:11 +10:00
luisramos0	e573a3fc2b	The main menu is now translatable and configurable using Content configuration and translations. Added 7 menu entries to the translations file (each with text and url) and 7 content configuration points to enable/disable these. The mobile menu icons can also be configured.	2018-08-31 11:23:11 +10:00
Maikel	1b88edea1f	Merge pull request #2420 from stveep/stripe-admin-2 ... Stripe admin 2	2018-08-30 15:48:49 +10:00
Matt-Yorkley	666fbf53bf	Validate enterprise.is_primary_producer?	2018-08-24 15:51:37 +10:00
Transifex-Openfoodnetwork	1bbc615496	Updating translations for config/locales/fr_CA.yml	2018-08-22 08:37:41 +10:00
Transifex-Openfoodnetwork	39b3a964dd	Updating translations for config/locales/fr.yml	2018-08-22 04:25:59 +10:00
stveep	c0f41b6833	PR changes - erb to haml, don't update en_GB translations	2018-08-19 10:43:53 +01:00
stveep	ff7dc811e9	Add translations for messages and remove old placeholder translation	2018-08-19 10:43:53 +01:00
Maikel	e0d13010bb	Merge pull request #2543 from openfoodfoundation/transifex ... Transifex	2018-08-17 17:36:22 +10:00
Transifex-Openfoodnetwork	d76112e072	Updating translations for config/locales/de_DE.yml	2018-08-14 17:18:51 +10:00
luisramos0	4b64369ddb	Added GA and Matomo toggle in Legal Settings in the global settings in the BO and added GA and Matomo cookies details to the cookies policy page (according to what is configured in the BO)	2018-08-14 10:01:48 +10:00
luisramos0	ca35c59e52	Moved the footer TOS URL from the content settings to the new section legal settings in the global settings	2018-08-14 10:01:48 +10:00
luisramos0	d920c32376	Added cookies banner toggle and privacy URL to a new section called Legal Settings in the global settings in the BO	2018-08-14 10:01:48 +10:00
luisramos0	92f9cbd00a	Added new cookies banner (with link to cookie policy page and the accept cookies button)	2018-08-14 10:01:48 +10:00
luisramos0	08c5d8f3ab	Added new cookies policy page and added a link to it in the footer (cookies policy link)	2018-08-14 10:01:48 +10:00
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	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
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	fac8e26d8b	Merge pull request #2475 from Matt-Yorkley/pi/landing_page ... PI: landing page	2018-07-18 16:47:17 +02: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	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	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
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	c71a5ec0df	Update subscription form to use new card validations for Stripe payment method	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