3549 Commits

Author	SHA1	Message	Date
luisramos0	6fc3562a73	Merge branch 'master' into 2-0-stable-dec-18th	2018-12-18 23:32:45 +00:00
Maikel	84f2f9af3c	Merge pull request #3156 from HugsDaniel/3121-deface-payment-methods-new ... [Defacepocalypse] De-deface payment methods new and form	2018-12-19 09:44:57 +11:00
Pau Pérez Fabregat	1876ec42dc	Merge pull request #3201 from kevinchristianson/add-missing-stars ... Add missing 'required field' stars in new product form	2018-12-17 10:36:51 +01:00
Pau Pérez Fabregat	554d650b8c	Merge pull request #3176 from kevinchristianson/button-translation-fix ... Fix untranslated buttons at image step of registration modal	2018-12-17 10:36:07 +01:00
Pau Pérez Fabregat	fe0c56c800	Merge pull request #3174 from kevinchristianson/footer-url-fix ... Fix broken registration link in footer	2018-12-14 15:42:08 +01:00
luisramos0	5183c90c89	Add missing spree translations related to insufficient stock	2018-12-12 15:34:48 +00:00
Maikel	1819fc8493	Merge pull request #3199 from luisramos0/2-0-stable-dec-10th ... [Spree Upgrade] Merging master into 2-0-stable (second run in Dec2018)	2018-12-11 18:50:24 +11:00
Pau Pérez Fabregat	7834fa4d00	Merge pull request #3190 from luisramos0/2-0-new-product ... [Spree Upgrade] Fix "new product" page specs and an html issue	2018-12-11 08:35:26 +01:00
haseleyi	835617159e	Add missing 'required field' stars in new product form	2018-12-10 18:02:39 -08:00
luisramos0	cdee7c0422	Merge branch 'master' into 2-0-stable-dec-10th	2018-12-10 16:41:29 +00:00
luisramos0	8fb103ce8d	Fix new_product div in new product page	2018-12-08 14:53:50 +00:00
Maikel Linke	cac4fa4816	Use I18n.t instead of Spree's JS t function	2018-12-07 23:38:05 +11:00
haseleyi	3f6e96dd5d	Fix comment	2018-12-06 14:07:45 -08:00
haseleyi	4a0744dd94	Add comment to explain hard-coded link	2018-12-06 11:49:39 -08:00
Maikel	da6dc20fcf	Merge pull request #3165 from coopdevs/fix-send-confirmation-instructions-specs ... [Spree Upgrade] Fix send confirmation instructions specs	2018-12-06 16:24:40 +11:00
Maikel	883e9bbdd8	Merge pull request #3166 from luisramos0/2-0-orders-tab-without-shipments ... [Spree Upgrade] Remove shipments option from orders tab (gone in spree 2)	2018-12-06 15:39:14 +11:00
haseleyi	75277e92e4	Lazy-load the translations for images step of registration	2018-12-05 11:36:27 -08:00
luisramos0	460e010408	Removed shipments from orders tab. This option is removed in spree 2	2018-12-05 11:38:16 +00:00
Pau Perez	5845f80af0	Remove commented out code ... Because git keeps it for you.	2018-12-05 10:05:39 +01:00
Pau Pérez Fabregat	3b56212290	Merge pull request #3151 from coopdevs/remove-frontoffice-enterprises-n+1 ... Remove frontoffice enterprises n+1	2018-12-05 08:12:19 +01:00
haseleyi	94d12217de	Fix untranslated buttons at image step of registration modal	2018-12-04 21:30:42 -08:00
haseleyi	e863c3dec8	Fix broken link in register call partial	2018-12-04 10:23:46 -08:00
luisramos0	7f7e7ea65e	Remove hide class from the hide button in the inventory list ... The hide button should not be hidden. The hide css class was no active in v1 but it is in v2, so we need to remove it	2018-12-04 10:55:55 +00:00
luisramos0	3776b891ce	Merge branch 'master' into 2-0-stable-dec-3rd	2018-12-03 15:30:16 +00:00
Hugo Daniel	24dab58de7	Lazy load translations and add keys	2018-11-30 10:49:36 +01:00
Pau Pérez Fabregat	08297863be	Merge pull request #3047 from mllocs/feature/expand-all-steps-in-checkout-page ... Expand all steps in the checkout page by default	2018-11-29 16:28:42 +01:00
Hugo Daniel	aa948552e1	Import payment_methods edit view and apply overrides	2018-11-29 14:58:14 +01:00
Hugo Daniel	34bc79c7f6	Import payment_methods form partial and apply overrides	2018-11-29 14:58:06 +01:00
Hugo Daniel	29bc4c52a5	Import payment_methods#new view and apply overrides	2018-11-29 14:56:28 +01:00
Pau Pérez Fabregat	3ea7fac25f	Merge pull request #3095 from luisramos0/admin-users-transl ... In admin/users, convert Spree.t calls to t calls and use lazy lookup	2018-11-28 17:37:42 +01:00
Pau Pérez Fabregat	64c12c7a65	Merge pull request #2955 from HugsDaniel/import-spree-views-for-orders#edit ... Import Spree views for orders#edit in our codebase	2018-11-28 17:02:40 +01:00
Pau Perez	41d988176c	Pass enterprises to inject method from controller	2018-11-28 13:54:42 +01:00
Pau Pérez Fabregat	438cff6e6d	Merge pull request #3080 from Matt-Yorkley/pi/french_issue ... Pi/french issue	2018-11-28 13:39:04 +01:00
Hugo Daniel	69e186f482	Define dynamic classes in variables as a turnaround to HAML bug	2018-11-28 10:31:47 +01:00
Hugo Daniel	65dd3eb5b9	Change line items controller HTML response spec to look for form order_edit class	2018-11-28 10:31:47 +01:00
Hugo Daniel	60214b9a90	Fix failing specs	2018-11-28 10:31:47 +01:00
Hugo Daniel	422a68630f	Remove data-hook tags	2018-11-28 10:31:47 +01:00
Hugo Daniel	652191a4c5	Fixing missing variable none	2018-11-28 10:31:47 +01:00
Hugo Daniel	c233ea38cf	Import Spree views for orders#edit in our codebase and integrate deface modifications	2018-11-28 10:31:47 +01:00
Pau Pérez Fabregat	5c8a638320	Merge pull request #3055 from HugsDaniel/3051-products-edit-views ... [Defacepocalypse] Import products#edit and form partial in our codebase and apply overrides	2018-11-27 17:32:25 +01:00
luisramos0	e153510a71	Merge branch 'master' into 2-0-stable-nov-24th	2018-11-24 15:19:38 +00:00
Matt-Yorkley	a5407d780c	Include unexpected validation errors	2018-11-21 19:16:07 +00:00
Pau Pérez Fabregat	6a1776b84a	Merge pull request #3053 from HugsDaniel/3050-products-new-views ... [Defacepocalypse] Import products#new view into our codebase and apply overrides	2018-11-21 14:43:22 +01:00
luisramos0	783e0eed3c	In admin/users, convert Spree.t calls to t calls using lazy lookup and move translations to ofn's en.yml	2018-11-21 11:46:14 +00:00
luisramos0	d282823d3a	Fix missing translation in user transaction history	2018-11-18 16:15:35 +00:00
Maxim Colls	3301b5850a	Improved UX in the accordion steps in the checkout page	2018-11-17 18:48:10 +01:00
Pau Perez	23bda74ecb	Match name of filter and db column for consistency	2018-11-15 19:09:17 +01:00
Hugo Daniel	1309d80f65	Import products#edit and form partial in our codebase and apply overrides	2018-11-15 17:39:36 +01:00
Hugo Daniel	094d88d03a	Import products#new view into our codebase and apply overrides	2018-11-15 16:35:31 +01:00
Pau Perez	52e58a1c31	Remove unused @show_only_completed from view ... Now there's no difference in behavior. In both cases we sort by completed_at in the second column of the orders page.	2018-11-15 15:40:13 +01:00