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
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 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
Pau Pérez Fabregat
869f17256d
Merge pull request #3011 from HugsDaniel/3000-api-endpoint-enterprise-fee
...
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-27 17:28:43 +01:00
haseleyi
691de9199f
Add missing translation for 'Has Shopfront' in single-enterprise dashboard
2018-11-23 11:23:28 -08:00
haseleyi
d4b49a662f
Add translation for 'Back to Payments List' button in new payment form
2018-11-21 15:33:45 -08:00
Matt-Yorkley
b3a9b502fa
Add missing translation key
2018-11-21 19:16:08 +00: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
0189cefd1c
Update all locales with the latest Transifex translations
2018-11-20 22:40:11 +00:00
Pau Pérez Fabregat
4c6dec6203
Merge pull request #3082 from coopdevs/remove-travis-leftovers
...
Remove all database.travis.yml
2018-11-20 09:35:12 +01:00
Pau Perez
9301c5e1d5
Remove all database.travis.yml
...
We no longer use this file since we started with Semaphore CI.
2018-11-19 17:16:04 +01:00
Pau Perez
c7a1c4b253
Change order date column translation in BOM
...
This makes it consistent with the order page. In both cases we use the
`completed_at` column underneath.
2018-11-15 19:09:17 +01:00
Hugo Daniel
7b33712f7a
Add an API endpoint for EnterpriseFeesController#destroy
2018-11-15 14:05:08 +01:00
Pau Pérez Fabregat
605f84d30a
Merge pull request #3010 from openfoodfoundation/transifex
...
Transifex
2018-11-14 11:27:01 +01:00
Pau Pérez Fabregat
8ee193dbcf
Merge pull request #2984 from Matt-Yorkley/email_https_links2
...
Specify only email link protocol setting
2018-11-14 11:26:14 +01:00
Transifex-Openfoodnetwork
f9fae06a7a
Updating translations for config/locales/en_BE.yml
2018-11-10 07:09:02 +11:00
Pau Pérez Fabregat
72a9d39ee1
Merge pull request #2932 from luisramos0/2931-weight-calculator
...
2931 Refactor and prepare weight calculator for spree 2
2018-11-07 18:40:38 +00:00
Pau Pérez Fabregat
ecc69c2c58
Merge pull request #2948 from pfac/pfac-config-time-zone
...
Fix default time zone config
2018-11-07 18:39:25 +00:00
Matt-Yorkley
5b16353938
Specify only link protocol setting
2018-11-07 11:22:24 +00:00
luisramos0
9490da329a
Move Calculator::Weight from models/open_food_network/calculator to models/calculator
2018-11-07 09:54:30 +00:00
Transifex-Openfoodnetwork
98d79ec939
Updating translations for config/locales/fr_BE.yml
2018-11-05 18:46:40 +11:00
Maikel
3259b3ecf1
Merge pull request #2912 from Matt-Yorkley/admin_orders_refactor
...
Admin orders refactor
2018-11-02 16:57:28 +11:00
Pau Pérez Fabregat
1fbeb43c3a
Merge pull request #2958 from coopdevs/pull-translations
...
Update all locales with the latest Transifex translations
2018-10-31 10:52:02 +01:00
Pau Perez
f16897a0b8
Fix DE translations manually
...
We don't want 🇩🇪 to have a broken menu.
2018-10-31 08:39:25 +01:00
Pedro Costa
1ddbc24a8b
Fix default time zone config
...
Why:
* Starting the environment, even with just `bundle exec rake`, results
in the following error:
```sh
Value assigned to config.time_zone not recognized.Run "rake -D time"
for a list of tasks for finding appropriate time zone names.
```
This change addresses the issue by:
* Adding the time zone setting to environment specific configurations,
defaulting to UTC in development, and using Melbourne in tests.
2018-10-30 23:50:23 +00:00
Pau Perez
2e2c7c56cb
Move default_url_options set up to an initializer
...
For some reason running `bundle exec rake db:migrate RAILS_ENV=staging`
fails with:
```
rake aborted!
NameError: uninitialized constant Spree::Config
```
Running `bundle exec rails server` for instance, does not. There must be
a difference on the way a rake task and the rails commands load the app.
Moving this configuration to an initializer, at the end of the
initialization process, fixes it. The constant `Spree::Config` is
already loaded.
**This is preventing the release v1.22.0 from being staged and tested**
2018-10-30 19:45:04 +01:00
Pau Pérez Fabregat
7ffa3a2ca1
Merge pull request #2913 from HugsDaniel/2905_password_reset_missing_translations
...
Add password confirmation, token and expired keys
2018-10-30 17:34:01 +01:00
Pau Pérez Fabregat
3d88199257
Merge pull request #2896 from Matt-Yorkley/email_https_links
...
Use https on all links in emails in production
2018-10-30 17:33:32 +01:00
Pau Perez
7f177598f2
Update all locales with the latest Transifex translations
2018-10-30 15:13:57 +01:00
Maikel
d63670d675
Merge pull request #2846 from Matt-Yorkley/pi/rename_enterprise_fields
...
[Product Import] Rename enterprise fields and update template
2018-10-30 15:11:02 +11:00
Matt-Yorkley
f3124e5472
Explicitly add :host to actionmailer config
2018-10-26 22:42:47 +01:00
Matt-Yorkley
334eebeab1
Move json to API and strip index action
2018-10-26 21:38:57 +01:00
Transifex-Openfoodnetwork
c17939631f
Updating translations for config/locales/en_US.yml
2018-10-25 09:31:36 +11:00
Pau Pérez Fabregat
ce93c52dfe
Merge pull request #2850 from Matt-Yorkley/password_change_logout
...
Password change logout
2018-10-24 11:43:09 +02:00
Pau Pérez Fabregat
7651ee0909
Merge pull request #2798 from as1729/as1729-update-docs-Stripe-publishable_key-for-pr
...
Better docs for Stripe.publishable_key and Stripe.endpoint_secret.
2018-10-24 11:23:21 +02:00
Hugo Daniel
c5f6af95c7
Add password confirmation, token and expired keys
2018-10-23 10:40:20 +02:00
Maikel
6f5289c730
Merge pull request #2894 from openfoodfoundation/transifex
...
Transifex
2018-10-23 16:21:20 +11:00
Pau Pérez Fabregat
a1bbf5328e
Merge pull request #2872 from mkllnk/2765-fix-geocoding
...
2765 Fix geocoding to display enterprises on map
2018-10-22 16:44:30 +02:00
Matt-Yorkley
c3cef699ca
Use https on all links in emails in production
2018-10-19 17:03:51 +01:00
Transifex-Openfoodnetwork
c911462737
Updating translations for config/locales/en_GB.yml
2018-10-20 02:04:33 +11:00
Pau Pérez Fabregat
590091c42a
Merge pull request #2842 from Matt-Yorkley/pi/missing_variable
...
Fix missing local variable in EntryProcessor
2018-10-16 13:19:23 +02:00
Maikel Linke
8fb81bb6a7
Configure Geocoder with API key as required by Google
2018-10-16 16:49:52 +11:00
Pau Pérez Fabregat
8946fe3ce8
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
...
Add per_page controls to admin orders index
2018-10-15 12:17:39 +02:00
Pau Pérez Fabregat
fe149967e4
Merge pull request #2521 from luisramos0/cookies_in_engine
...
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
2018-10-15 10:03:30 +02:00
Matt-Yorkley
e7a909e828
Rename supplier to enterprise
2018-10-12 16:57:13 +01:00
