1212 Commits

Author	SHA1	Message	Date
Pau Pérez Fabregat	0a05e6944e	Merge pull request #2625 from kristinalim/translations-rename_entreprise_keys_to_enterprise ... Rename "entreprise" in i18n keys to "enterprise"	2018-09-05 13:23:02 +02:00
Pau Pérez Fabregat	903d70090e	Merge pull request #2636 from luisramos0/heroku_dead_code ... Removed old files that were used with, now unsupported, heroku	2018-09-03 12:49:19 +02:00
Maikel	1b264403e0	Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user ... Subscription emails for customer should not link to order page if customer has no user account	2018-09-03 14:38:56 +10:00
Maikel	3fadd06dc7	Merge pull request #2613 from luisramos0/cookies_better_policy_page ... [Cookies] Updated cookies policy page text	2018-09-03 11:49:14 +10:00
luisramos0	512577768c	Removed old files that were used with, now unsuported, heroku	2018-09-02 22:13:42 +01:00
Kristina Lim	f8244a400a	Custom subscription placement email if non-user ... The order link should not be provided if the order does not have an associated user account.	2018-09-01 23:46:11 +08:00
Kristina Lim	f5c44ef0e6	Rename "entreprise" in i18n keys to "enterprise"	2018-08-31 15:26:30 +08:00
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
luisramos0	02b968b312	Cookies policy page table has a single column now. Also made small updates to the page text, migrated translations to ruby translations and extracted repeated partial from cookies policy page view	2018-08-30 00:27:35 +01:00
Maikel	44faa116db	Merge pull request #2583 from mkllnk/seed-mail-connection-type ... Configure mail TLS or SSL connection when seeding	2018-08-27 09:52:56 +10:00
Matt-Yorkley	666fbf53bf	Validate enterprise.is_primary_producer?	2018-08-24 15:51:37 +10:00
Maikel Linke	b158c92998	Configure mail TLS or SSL connection when seeding ... This allows to seed the secure connection type of the default mail method.	2018-08-24 14:03:21 +10:00
luisramos0	6caa361354	Moved Spree::OrderController.populate to new CartController. ... This was done to make order populate independent of Spree::OrdersController	2018-08-23 12:37:52 +01:00
Maikel	7d40e960f4	Merge pull request #2563 from openfoodfoundation/transifex ... Transifex	2018-08-23 10:06:16 +10:00
Maikel	4417a8f156	Merge pull request #2539 from luisramos0/delete_dead_cart ... removed Cart route, controller, model and specs: dead code	2018-08-22 17:35:58 +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	ccd5147b11	Added angular templates route and controller to serve angular templates from the server, instead of precompiled assets. This was used to fix a problem with the cookies policy page template that was using a Spree configuration	2018-08-14 10:01:48 +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
luisramos0	0b9061df28	removed Cart route, controller, model and specs: dead code	2018-08-11 22:17:12 +01: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