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
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
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
Matt-Yorkley
57c6530e46
DRY code and use more flexible I18n
2018-10-11 16:38:14 +01:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
1bafa0cb7d
Merge pull request #2853 from mkllnk/remove-parallel-tests
...
Remove parallel tests
2018-10-10 16:01:44 +02:00
Transifex-Openfoodnetwork
c2c492cd6b
Updating translations for config/locales/es.yml
2018-10-09 21:57:06 +11:00
Maikel Linke
4cbc449a51
Remove unused parallel_tests gem
...
Reverts db47c01784
2018-10-09 16:54:08 +11:00
Maikel
68c58dcb68
Merge pull request #2770 from openfoodfoundation/transifex
...
Transifex
2018-10-09 15:18:17 +11:00
Matt-Yorkley
3e39f3e749
Disable logout on password change
2018-10-08 23:06:54 +01:00
Transifex-Openfoodnetwork
8b59943256
Updating translations for config/locales/de_DE.yml
2018-10-08 16:58:01 +11:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
Aditya Sridhar
372ae8e4aa
updated the spacing to be consistent.
2018-09-30 16:10:57 -04:00
Aditya Sridhar
06b28c1ab4
Better docs for Stripe.publishable_key and Stripe.endpoint_secret.
2018-09-30 15:50:33 -04:00
Maikel Linke
17d951f99d
Rescue from any sign-up errors
...
The most common failure would happen when sending the confirmation email
triggered by `user.save`. We rescue any errors here and give feedback to
the user.
This allows for immediate feedback when the user types an email address
that is not accepted by our mail server or the email setup is not
configured properly.
2018-09-27 13:33:08 +10:00
luisramos0
921105301c
Move angular-templates route and controller into Web engine
...
The route and controller were in the main app and the views in the engine, with this commit they stay all inside the engine
This is done to keep it simple and remove the unnecessary dependency between main app and engine
If we use this mechanism in the future for other things in the main app or other engines, we can find a way to extract/abstract this
2018-09-26 12:39:51 +01:00
luisramos0
b1c7e6c091
Fix assets precompilation by including web/all.js and web/all.css in the assets precompilation list in application.rb
2018-09-26 12:30:45 +01:00
Maikel
51f9a0afa1
Merge pull request #2562 from Matt-Yorkley/pi/product_attributes
...
[Product Import] Product attributes
2018-09-25 11:36:03 +10:00
Transifex-Openfoodnetwork
97775c0bc1
Updating translations for config/locales/fr_CA.yml
2018-09-25 06:12:48 +10:00
Matt-Yorkley
6f2760cf92
Move translations into their namespace and use '.key' format
2018-09-24 15:54:05 +01:00
Transifex-Openfoodnetwork
7175434910
Updating translations for config/locales/en_US.yml
2018-09-22 01:25:48 +10:00
Maikel Linke
5763bf0518
Update all translations
2018-09-20 10:33:02 +10:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
Transifex-Openfoodnetwork
454cd8bfbf
Updating translations for config/locales/nb.yml
2018-09-19 22:30:06 +10:00
Matt-Yorkley
68f0c80016
Add loading message and spinner
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
Matt-Yorkley
93d273f94a
Convert orders index table to use angular ng-repeat
2018-09-19 09:33:25 +01:00
Transifex-Openfoodnetwork
f0d015be0d
Updating translations for config/locales/de_DE.yml
2018-09-19 08:34:42 +10:00
Transifex-Openfoodnetwork
258347bc63
Updating translations for config/locales/fr.yml
2018-09-19 01:45:12 +10:00
Pau Pérez Fabregat
9f7d24934d
Merge pull request #2671 from kristinalim/translations-any_enterprise_in_oc_filters
...
Translate "Any Enterprise" and "Any Schedule" in OC filters
2018-09-18 11:42:19 +02:00
luisramos0
d170a4d489
New domain Web (rails engine) with the following features extracted from the main app:
...
- cookies banner
- cookies policy page
- cookies policy and privacy policy links in the footer
2018-09-17 16:05:32 +01:00
Pau Pérez Fabregat
0f627cdf39
Merge pull request #2661 from kristinalim/translations-copy_of_order_cycle
...
Translate "COPY OF" when cloning an OC
2018-09-17 12:38:29 +02:00
