Luis Ramos
4a321f200f
Merge pull request #3783 from kristinalim/fix/3782-missing_translation
...
3782 Fix missing translation in subscription update modal
2019-05-23 18:45:20 +01:00
Luis Ramos
12282ad906
Merge pull request #3794 from m-budryte/replace_&_with_OR
...
& replaced by OR when multiple property filters are selected
2019-05-23 14:35:51 +01:00
Luis Ramos
f844ff275b
Merge pull request #3799 from idanceinbetween/product-description-field-text-formatting-3757
...
added buttons to form and updated sanitizer to allow extra formatting
2019-05-10 10:48:55 +01:00
Luis Ramos
19881927e3
Merge pull request #3699 from HugsDaniel/3688-missing-translation-edit-sub
...
Add review & edit sub keys
2019-05-09 16:04:38 +01:00
Masha
5eacf05a45
used string interpolation for clarity
2019-05-08 15:05:15 +01:00
Masha
d5ff733f0b
spaces location swapped
2019-05-08 15:05:13 +01:00
Masha
5470f8d758
new translation key for products_or created
2019-05-08 15:03:28 +01:00
Masha
94cbac00a5
& replaced by OR when multiple property filters are selected
2019-05-08 15:00:59 +01:00
idanceinbetween
7790401d59
added buttons to form and updated sanitizer to allow extra formatting
2019-05-08 14:45:05 +01:00
Luis Ramos
6658f85f59
Merge pull request #3758 from jazzdragon/3292-link-popup-text-translation
...
3292 link popup text translation
2019-05-07 21:11:31 +01:00
Kristina Lim
c3d4288692
Fix translation for closed/closes in subscription update modal
2019-05-07 14:52:03 +08:00
Matt-Yorkley
6bdc5d4438
Fix maps performance
2019-05-07 00:36:08 +01:00
Luis Ramos
6f0d155508
Merge pull request #3742 from openfoodfoundation/2-0-stable
...
Merge 2-0-stable to master
2019-05-04 00:06:27 +01:00
Syed Usama Amer
75a7745736
Closes translation bug for enterprise fee settings
2019-05-01 10:43:35 -05:00
luisramos0
d7e706e6e7
Make text area translations run immeditaly on setup with the t function instead of sending the translation expression down to the textAngular code
2019-04-29 13:40:52 +01:00
jazzdragon
7a27973ae3
Add translation and references in taTranslations (not working in alert)
2019-04-27 19:22:15 -07:00
jazzdragon
f6c0071554
Add reference comment
2019-04-27 17:01:07 -07:00
jazzdragon
35de9077da
Add config for taTranslations (no functional change)
2019-04-27 16:57:02 -07:00
luisramos0
a1905e43f7
Move a group of translations related to customers to the js translations namespace
2019-04-15 18:12:04 +01:00
luisramos0
9662323261
Move a group of translations related to schedules to the js translations namespace
2019-04-15 17:42:45 +01:00
luisramos0
ea52600fc5
Fix split button reappearing when editing line item quantity
2019-04-02 21:58:29 +01:00
Maikel
74aea76c4c
Merge pull request #3609 from luisramos0/2-0-delete-acct-invoices-last-bit
...
[Spree Upgrade] Finish up deleting account invoices
2019-03-28 13:42:01 +11:00
luisramos0
c1d14686a6
Merge branch 'master' into 2-0-stable-Mar22
2019-03-22 10:55:17 +00:00
luisramos0
c0c14b16b6
Remove dynamic monthly pricing description that would come from the deleted business model configurations
2019-03-20 11:19:04 +00:00
Maikel Linke
d129665d43
Wait for orders being loaded in bulk order manage
...
The bulk order management page tried to wait for orders being loaded.
But instead of receiving a request object with an a promise to wait for
the page received a simple array without promise. As a result, the page
didn't wait for orders being loaded.
When loading of orders took longer than loading of line items they or at
least not all of them were enriched with distributors and order cycles
and the line items were missing some orders. That lead to random spec
failures.
2019-03-13 10:37:24 +11:00
luisramos0
7c39c45f79
Stop using inexistent en.order_state translations keys and use existing en.spree.order_state in haml code and new js.admin.orders.order_state in JS code
2019-03-12 19:42:08 +00:00
Maikel Linke
7270a9e8e8
DRY date calculation in BOM js
...
This also minimises the risk of values changing in the meantime.
2019-03-12 18:59:14 +11:00
Maikel Linke
af9e80e55d
Load data after all callbacks are installed
2019-03-12 09:46:27 +11:00
Maikel Linke
4574a770d3
Synchronise dereferencing and initilising
...
This seems to make the spec 4 times more reliable. Still failing from
time to time.
2019-03-08 17:36:25 +11:00
luisramos0
2470830ec8
Fix jquery ui merge mistake, it should be jquery.ui.all in v2, not jquery-ui
2019-03-06 11:28:50 +00:00
luisramos0
b325cea6cb
Merge branch 'master' into 2-0-stable-Mar6
2019-03-06 09:19:53 +00:00
Pau Pérez Fabregat
30bbc5ee6f
Merge pull request #3472 from pacodelaluna/fix-datetime-picker
...
Fix datetime picker on Order Cycle form
2019-03-05 14:50:34 +01:00
Luis Ramos
72e9c1d002
Merge pull request #3321 from luisramos0/2-0-delete-acct-invoices
...
[Spree Upgrade] Delete Accounts and Billing dead feature code until we decide we want to start using it again
2019-03-04 15:54:09 +00:00
luisramos0
a36722cebf
Merge branch '2-0-stable' into 2-0-remove-variant-count-on-hand
2019-02-26 12:47:11 +00:00
François Turbelin
e1953c279b
Move jquery-ui-timepicker libs to vendor dir
2019-02-25 22:48:30 +01:00
François Turbelin
ab86332949
Tune up config and style
2019-02-25 22:22:27 +01:00
François Turbelin
68fd6de39b
Update Jquery datetimepicker lib to v1.6.3
2019-02-25 22:22:27 +01:00
luisramos0
36e2786a1e
Delete Accounts and Billing dead feature code
2019-02-25 14:37:16 +00:00
luisramos0
ee8fe4b6b4
Move registration process translations to lazy lookups to better organize the en.yml file
2019-02-22 14:37:45 +00:00
luisramos0
5d51ad71b0
Merge branch 'master' into 2-0-stable-Feb20
2019-02-20 14:32:36 +00:00
luisramos0
8ee14ccb4b
Make variants_stock_levels return variants on_demand values
2019-02-19 11:56:02 +00:00
luisramos0
f0842fcbe5
Convert all calls to variant.count_on_hand to variant.on_hand
2019-02-18 21:54:07 +00:00
luisramos0
c652cfe4d5
Merge branch 'master' into 2-0-stable-Feb12
2019-02-12 16:03:33 +00:00
Pau Pérez Fabregat
92dca0cdfa
Merge pull request #3194 from HugsDaniel/3109-fix-orders-new
...
[Spree Upgrade] Fix admin new order page
2019-02-12 09:58:29 +01:00
Matt-Yorkley
5582160e73
Add localizeCurrency filter to admin and inject currencyConfig data
2019-02-07 22:55:08 +00:00
Pau Pérez Fabregat
8f63be9519
Merge pull request #2733 from kristinalim/fix-subscription_should_not_require_future_oc
...
Reduce restrictions for adding a variant to a subscription
2019-02-06 21:24:57 +01:00
Pau Pérez Fabregat
433d10c42f
Merge pull request #3386 from leandroalemao/fix-moment-deprecation-warning
...
[ISSUE-3348] LC: Fix moment.js deprecation warning
2019-02-06 21:22:58 +01:00
luisramos0
1b8445eb99
Merge branch 'master' into 2-0-stable-Feb5
2019-02-05 11:16:23 +00:00
luisramos0
d598831d67
Adapt variants auto complete to spree v2 code with shipments
2019-02-04 18:59:41 +00:00
luisramos0
729feb16f1
Merge branch 'master' into 2-0-stable-jan-29th
2019-01-29 12:38:34 +00:00
