12722 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kristina Lim	ff634bd870	Test ship method when advancing subscription order	2019-08-22 21:30:21 +08:00
Luis Ramos	34ed86cf2d	Merge pull request #4132 from Matt-Yorkley/import_launch ... Product Import beta	2019-08-19 17:17:16 +01:00
Luis Ramos	d5b37a5171	Merge pull request #4079 from HugsDaniel/defacepocalypse-payments ... [Defacepocalypse] De-deface payments v2.2.3	2019-08-14 19:30:33 +01:00
Luis Ramos	3efe2f878d	Merge pull request #4156 from coopdevs/fix-styling-in-paypal-tests ... Fix Rubocop violations in PayPal tests	2019-08-14 15:59:14 +01:00
Luis Ramos	064fee79b3	Merge pull request #4151 from Matt-Yorkley/datadog_apm ... Enable (optional) APM with Datadog	2019-08-14 15:58:48 +01:00
Luis Ramos	d13f182801	Merge pull request #4154 from Matt-Yorkley/fix_deployments2 ... Adjust user creation syntax	2019-08-14 15:56:32 +01:00
Luis Ramos	ee34935223	Fix a typo in docker.md	2019-08-14 13:55:58 +01:00
Pau Perez	0b7ce0d6db	Fix Rubocop violations in PayPal tests	2019-08-14 13:33:53 +02:00
Matt-Yorkley	9dd02044a5	Fix "can't modify frozen string" error in validation callbacks	2019-08-14 10:24:30 +01:00
Matt-Yorkley	d8a7190f43	Adjust user creation syntax ... #skip_confirmation! can't be chained...	2019-08-14 09:22:11 +01:00
Matt-Yorkley	e5e0fcc887	Enable DelayedJob APM	2019-08-14 08:20:47 +01:00
Pau Pérez Fabregat	6635a89af7	Merge pull request #4153 from Matt-Yorkley/fix_deployments ... Fix deployments	2019-08-14 08:59:23 +02:00
Matt-Yorkley	8c95399292	Don't prompt if admin user already exists	2019-08-13 21:02:12 +01:00
Matt-Yorkley	14c1abb861	Skip confirmation email on initial admin user creation	2019-08-13 21:00:30 +01:00
Matt-Yorkley	be844253eb	Enable (optional) Rails APM with Datadog	2019-08-13 18:57:49 +01:00
luisramos0	b4ffd4dcc2	Update all locales with the latest Transifex translations	2019-08-13 18:25:23 +01:00
Pau Pérez Fabregat	9eabbb8dab	Merge pull request #4140 from openfoodfoundation/transifex ... Transifex	2019-08-13 12:00:48 +02:00
Pau Pérez Fabregat	d4f2fcb98a	Merge pull request #4126 from Matt-Yorkley/cart_dropdown ... Cart dropdown now closes when clicking outside it.	2019-08-13 10:57:56 +02:00
Matt-Yorkley	0b2417849c	Merge pull request #4142 from mkllnk/seed-user ... Seed user	2019-08-13 08:42:07 +01:00
Matt-Yorkley	3e8369c8f5	Merge pull request #4123 from Matt-Yorkley/navigation-css ... Navigation css	2019-08-13 08:41:47 +01:00
Maikel Linke	cbaedcec92	Fix seeding of default user without asking	2019-08-13 09:47:54 +10:00
Matt-Yorkley	0284eebf35	Fix cart dropdown positioning	2019-08-09 11:50:33 +01:00
Maikel Linke	e4ba515109	Seed admin user without asking by default	2019-08-09 14:16:01 +10:00
Maikel Linke	af1f6f6c6d	Skip confirmation when creating first admin user	2019-08-09 14:16:01 +10:00
Maikel Linke	b0e8ee42c1	Restore spree_auth_devise user seeding	2019-08-09 13:48:50 +10:00
Maikel	86aeb6a3c7	Merge pull request #4135 from coopdevs/remove-bugherd-tests ... Remove bugherd specs	2019-08-09 12:53:23 +10:00
Matt-Yorkley	5d83414e9b	Disable rubocop for spree tabs helper	2019-08-08 20:09:35 +01:00
Transifex-Openfoodnetwork	9820d7de38	Updating translations for config/locales/ca.yml	2019-08-09 02:36:02 +10:00
Pau Pérez Fabregat	910eca810a	Merge pull request #4124 from Matt-Yorkley/order_email ... Add SKU to order confirmation email	2019-08-08 18:35:20 +02:00
Transifex-Openfoodnetwork	6feaddf747	Updating translations for config/locales/es.yml	2019-08-09 02:33:35 +10:00
Transifex-Openfoodnetwork	10f6fb91f6	Updating translations for config/locales/ca.yml	2019-08-09 02:32:54 +10:00
Pau Pérez Fabregat	c7bd4b94b8	Merge pull request #4137 from openfoodfoundation/transifex ... Transifex	2019-08-08 18:31:47 +02:00
Transifex-Openfoodnetwork	dd223a21f2	Updating translations for config/locales/nb.yml	2019-08-08 20:58:24 +10:00
Transifex-Openfoodnetwork	549366ff15	Updating translations for config/locales/fr.yml	2019-08-08 20:52:28 +10:00
Transifex-Openfoodnetwork	e92f60fb1c	Updating translations for config/locales/fr.yml	2019-08-08 20:49:20 +10:00
Pau Pérez Fabregat	92b05c76a3	Merge pull request #4068 from luisramos0/replace_oc_rabl ... Convert order_cycle.rabl to Api::OrderCycleSerializer	2019-08-08 12:23:09 +02:00
Hugo Daniel	fa6fa0be64	Add missing translation	2019-08-08 11:11:32 +02:00
Kristina Lim	752efac7cf	Merge pull request #4051 from luisramos0/subs_unpause ... Sync subscription (create/update orders) when subscription is unpaused	2019-08-08 01:09:09 +08:00
Pau Perez	2b1f1f748b	Remove bugherd specs ... I don't think these are worth the time it takes to execute them every time but most importantly I believe we are not using Bugherd anymore.	2019-08-07 16:49:32 +02:00
Pau Pérez Fabregat	798cd9e778	Merge pull request #4114 from kristinalim/fix/4103-add_specs ... 4103 Add specs for referencing of shipments to deleted variants	2019-08-07 12:52:11 +02:00
Matt-Yorkley	2f5b0a5afb	Remove product import FeatureFlag	2019-08-07 09:59:55 +01:00
Maikel	de2d4a5870	Merge pull request #4125 from Matt-Yorkley/variant_overrides ... Variant overrides with on_demand	2019-08-07 10:25:32 +10:00
Matt-Yorkley	b3728568a8	Enable product import for non-superadmin users ... This class_eval hack for premissions on the #tab method was really hard to find, and is obviously quite ugly, but refactoring it is maybe outside of the scope here...	2019-08-06 18:59:12 +01:00
Matt-Yorkley	6ba98b4b2c	Add beta notice to Product Import	2019-08-06 17:02:38 +01:00
Matt-Yorkley	d3d6921a0f	Use light grey colour with transparency.	2019-08-06 08:23:38 +01:00
Maikel	68393f1444	Merge pull request #4037 from luisramos0/subs_stock ... Subscriptions - When editing subscriptions, check stock levels when changing orders in current OC	2019-08-06 15:16:00 +10:00
Maikel	229e6fa0a3	Merge pull request #4073 from luisramos0/kill_more_rabl ... Replace update_prod_image.rabl with ImageSerializer in api/product_image_controller	2019-08-06 15:00:33 +10:00
Matt-Yorkley	8a069787d1	Cart dropdown now closes when clicking outside it.	2019-08-05 21:48:37 +01:00
Matt-Yorkley	29ed38a6cc	Add unit tests for overriding #move	2019-08-05 17:01:56 +01:00
Matt-Yorkley	4c7d3a491a	Don't decrement variant stock if override is on_demand	2019-08-05 17:01:56 +01:00