luisramos0
0460e7fc6c
Merge branch 'master' into 2-0-stable-jan-17th
2019-01-17 22:51:25 +00:00
Luis Ramos
a8998fad79
Merge branch 'master' into headless-chrome
2019-01-17 18:22:25 +00:00
Maikel Linke
520ec5d047
Fix whenever upgrade by declaring dependency
...
Whenever doesn't depend on ActiveSupport any more. So we can't rely on
YAML being automatically loaded for us. We have to require it.
2019-01-17 10:41:11 +11:00
Rob Harrington
6608655e9a
Use headless chrome for karma specs instead of PhantomJS
...
PhantomJS is no longer being maintained
2019-01-16 16:21:30 +00:00
Maikel
54311c2d1b
Merge pull request #3304 from HugsDaniel/3288-3291-translation-issues
...
Add I18n keys for order state and order firstname and lastname filters
2019-01-16 09:43:28 +11:00
luisramos0
9ab99f13c4
Merge branch 'master' into 2-0-stable-jan-11th
2019-01-11 11:58:24 +00:00
Hugo Daniel
026fe55f1d
Add I18n keys for order state and order firstname and lastname filters
2019-01-10 15:32:23 +01:00
Transifex-Openfoodnetwork
e70b8c03ce
Updating translations for config/locales/nb.yml
2019-01-10 22:18:58 +11:00
Transifex-Openfoodnetwork
15e197b3b0
Updating translations for config/locales/en_GB.yml
2019-01-10 07:31:46 +11:00
Pau Pérez Fabregat
399cc5f796
Merge pull request #3224 from alvaro-chalar/footer-message
...
Add custom footer message in reports section
2019-01-09 16:01:02 +01:00
Maikel
abe4f78e5c
Merge pull request #2988 from Matt-Yorkley/pi/utf8
...
Pi/utf8
2019-01-09 15:39:05 +11:00
Transifex-Openfoodnetwork
f05f4ce0b1
Updating translations for config/locales/en_GB.yml
2019-01-09 07:06:27 +11:00
Pau Perez
f1f1ab9daf
Update all locales with the latest Transifex translations
2019-01-08 17:17:35 +01:00
luisramos0
e28f9a7c84
Merge branch 'master' into 2-0-stable-jan-8th
2019-01-08 14:29:50 +00:00
Maikel
abbbfd6191
Merge pull request #3286 from luisramos0/2-0-order-spec
...
[Spree Upgrade] Fix specs in admin orders spec
2019-01-08 16:35:59 +11:00
luisramos0
42eb92c40a
Add missing translation related to capture payments in the backoffice
2019-01-07 12:16:28 +00:00
luisramos0
d3325ed7bb
Add translation entries for admin menu tabs.
...
This was moved to new namespace tab in spree 2, see 4c82bfdf48
2019-01-07 12:15:36 +00:00
Pau Pérez Fabregat
34876cc255
Merge pull request #3275 from openfoodfoundation/transifex
...
Transifex
2019-01-07 11:43:06 +01:00
Maikel
1024fc1f34
Merge pull request #3273 from coopdevs/fix-fr-BE-link
...
Fix menu_1_url translation for fr_BE
2019-01-04 09:52:44 +11:00
Transifex-Openfoodnetwork
9da7ff5698
Updating translations for config/locales/fr.yml
2019-01-04 02:15:57 +11:00
Transifex-Openfoodnetwork
89bf819b37
Updating translations for config/locales/en_US.yml
2019-01-03 00:33:56 +11:00
Pau Perez
112080d8c6
Fix menu_1_url translation for fr_BE
...
The first menu item in OFN BE is currently broken.
2019-01-02 13:10:33 +01:00
Alvaro Chalar
6dccbeca70
Add custom footer message in reports section
2018-12-27 12:22:48 +01:00
albarnaz
5d515712ed
Fix for instagram links ( #2849 )
...
* Add new attribute instagram_placeholder to local yml
* Add placeholder to instagram link input
* Add migration to fix wrong instagram links
* Add new attribute facebook_placeholder to local yml
* Add placeholder to facebook link input
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
* Change each for find_each in migration
* Add new attribute instagram_placeholder to local yml
* Add migration to fix wrong instagram links
* Add new attribute linkedin_placeholder to local yml
* Add placeholder to linkedin link input
2018-12-21 14:42:28 +11:00
Maikel
073f88b1c2
Merge pull request #3198 from kristinalim/fix-variant_override_stock_settings_validation
...
Validation and others for keeping variant override "On Demand" and "Count on Hand" compatible
2018-12-20 14:05:20 +11:00
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
Matt-Yorkley
d34b8c52b8
Update all locales with the latest Transifex translations
2018-12-17 11:17:54 +00: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
luisramos0
5183c90c89
Add missing spree translations related to insufficient stock
2018-12-12 15:34:48 +00:00
luisramos0
cdee7c0422
Merge branch 'master' into 2-0-stable-dec-10th
2018-12-10 16:41:29 +00:00
Kristina Lim
1bfdb708c1
Add app/models/concerns to autoload path
2018-12-09 23:29:36 +08:00
Kristina Lim
83b6973bc2
Require compatible VO on_demand and count_on_hand
2018-12-07 14:39:36 +08:00
haseleyi
75277e92e4
Lazy-load the translations for images step of registration
2018-12-05 11:36:27 -08:00
Kristina Lim
842a8e3654
Move null option for VO use_producer_settings to JS
2018-12-05 17:40:32 +08:00
Kristina Lim
d8908bdf4b
Remove unused translation keys js.yes and js.no
2018-12-05 17:40:31 +08:00
Kristina Lim
4f2d96d763
Use correct placeholders for VO count_on_hand
2018-12-05 17:40:29 +08:00
Kristina Lim
a32bb0445f
Change translation for variant override use_producer_settings
2018-12-05 17:40:28 +08:00
Kristina Lim
7ae555cd9c
Translate variant override on_demand yes and no
2018-12-05 17:40:27 +08:00
Kristina Lim
4b3198a2b4
Allow reset of "on demand" for variant overrides
...
Change the UI control for "on demand" in the Inventory page from a
checkbox to a SELECT field with three options: nil, true, and false.
This resolves the following issues:
* There is no way to tell between nil and false - both are represented
by an unticked checkbox.
* There is no way to go back to nil.
2018-12-05 17:40:24 +08:00
Transifex-Openfoodnetwork
18a5f53330
Updating translations for config/locales/fr.yml
2018-12-05 09:17:00 +11:00
Transifex-Openfoodnetwork
9bedc69df8
Updating translations for config/locales/en_GB.yml
2018-12-05 04:52:44 +11:00
Maikel Linke
66585e93a8
Update all locales with the latest Transifex translations
2018-12-04 14:48:03 +11: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
9f17acd63c
Merge pull request #3136 from kevinchristianson/dashboard-translation
...
Add missing translation for 'Has Shopfront' in single-enterprise dashboard
2018-11-29 16:27:05 +01:00
Pau Perez
957c38e4f2
Add missing translations causing a test failure
2018-11-28 18:38:09 +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
8df781887a
Merge pull request #3111 from kevinchristianson/pay-list-translation
...
Add translation for 'Back to Payments List' button in new payment form
2018-11-28 17:03:29 +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
