Luis Ramos
db0c874622
Merge pull request #3669 from luisramos0/2-0-without-spree-fe-views
...
[Spree Upgrade] Remove dependency to spree frontend - views and assets
2019-05-24 14:37:34 +01:00
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
luisramos0
d9438cb082
Add spinner.gif from spree_frontend, this makes ofn completely independent of spree_frontend assets
2019-05-21 12:39:29 +02: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
6d62f4c4b4
Merge pull request #3817 from kristinalim/fix/1218-remove_oc_debug_information
...
1218 Remove OC "Debug Information" which appears in non-production environments
2019-05-09 16:05:18 +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
Luis Ramos
dffa50468b
Merge pull request #3801 from Matt-Yorkley/need_for_speed
...
Fix /maps performance
2019-05-07 21:08:34 +01:00
Kristina Lim
12b28fdc32
Remove "Debug Information" in edit OC page
2019-05-08 01:33:58 +08: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
Eelco de Vlieger
4b2114c1e4
issue 3777 - Make all map icons green
2019-05-04 14:44:16 +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
Luis Ramos
eeac75ade1
Merge pull request #3689 from luisramos0/2-0-fix-split-button-bug
...
[Spree Upgrade] Fix split button reappearing when editing line item quantity
2019-04-16 15:28:43 +01: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
Pau Pérez Fabregat
6d0ecdc4a6
Merge pull request #3721 from Matt-Yorkley/subs_styles
...
Subs styles
2019-04-15 12:53:27 +02:00
Luis Ramos
984155013c
Merge pull request #3648 from luisramos0/2-0-fix-ui-issue
...
[Spree Upgrade] Fix "back to list" button overlap and remove configurations menu from payments methods list
2019-04-10 21:46:40 +01:00
Matt-Yorkley
14fd821283
Rename states SCSS file for clarity
2019-04-10 13:12:44 +01:00
Matt-Yorkley
9e0f35d635
Re-adjust buttons. Much better!
2019-04-10 12:15:21 +01:00
Matt-Yorkley
e13db873b0
Fix subs panel button vertical alignment
2019-04-10 12:15:21 +01:00
Matt-Yorkley
896a45c399
Fix subs state buttons
2019-04-10 12:15:21 +01:00
Matt-Yorkley
3968cfd238
Fix chevron horizontal position
2019-04-10 12:15:21 +01:00
luisramos0
ea52600fc5
Fix split button reappearing when editing line item quantity
2019-04-02 21:58:29 +01:00
luisramos0
5c69d6c9dc
Fix page action in the backoffice when translations are long
2019-04-02 16:58:45 +01:00
Matt-Yorkley
4a0e5a42a3
Fix admin menu items different heights
2019-04-01 12:11:29 +01:00
Matt-Yorkley
082be15df2
Fix admin menu mixed font weights
2019-04-01 12:00:29 +01:00
Matt-Yorkley
fa91a66de6
Fix button padding after Spree 2 font changes increased the vertical height
2019-04-01 11:48:18 +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
Pau Pérez Fabregat
87f0ddabe7
Merge pull request #3548 from luisramos0/2-0-remove-unused-new-v2-features
...
[Spree Upgrade] Remove unused spree v2 features
2019-03-22 10:35:15 +01: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
luisramos0
2295981375
Merge branch '2-0-stable' into 2-0-remove-unused-new-v2-features
2019-03-12 16:55:48 +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
6f875e83ec
Remove unconventional and unused ng:cloak selector
2019-03-12 09:10:39 +11:00
Maikel Linke
9e33ef8140
Style ng-cloak directive
2019-03-12 09:09:52 +11:00
