Matt-Yorkley
0eb4c7f7ba
Require https for embedding sites
2017-07-26 13:56:36 +10:00
Matt-Yorkley
782a812596
Basic Embedded Shopfronts
2017-07-26 13:56:36 +10:00
Matt-Yorkley
113f6565be
Enable iframes for embedded shopfronts
2017-07-26 13:56:36 +10:00
Maikel Linke
b1452f097d
Add spanish translations manually
...
A change in the Transifex API made the automated commit fail. Hence
doing it manually here.
2017-07-26 13:38:35 +10:00
Transifex-Openfoodnetwork
6384b5abb3
Updating translations for config/locales/fr.yml [skip ci]
2017-07-26 13:38:35 +10:00
Transifex-Openfoodnetwork
2c14ed848f
Updating translations for config/locales/nb.yml [skip ci]
2017-07-26 13:38:35 +10:00
Maikel Linke
5dfac10599
Mention upgrade_bundler.sh in README
2017-07-26 13:37:42 +10:00
Maikel Linke
250062bd2f
Upgrade bundler according to Gemfile.lock on CI
2017-07-26 13:37:42 +10:00
Maikel Linke
3f2299e52e
Add script to upgrade bundler to Gemfile version
...
Useful to sync your bundler version or the CI bundler version with the
rest of the team.
2017-07-26 13:37:42 +10:00
Rob Harrington
327753b7ca
Remove zeus and guard-zeus from the bundle
...
Having guard-zeus specified as a dependency is problematic because
it also pulls in the zeus gem as a dependency. This makes it impo-
ssible to update or switch zeus versions locally without affecting
other developers.
The maintainers of zeus say that it is designed to be installed and
run outside of the bundle: https://github.com/burke/zeus
2017-07-26 13:36:58 +10:00
Matt-Yorkley
ba447b547d
Order tooltip localisation
2017-07-26 13:36:16 +10:00
Matt-Yorkley
8ebd49ec0f
Company number localisation
2017-07-26 13:35:46 +10:00
Maikel Linke
155a2574bb
Fix typo to display email address
2017-07-21 12:17:14 +10:00
Maikel Linke
b8c2e54194
Fix i18n key and spec
2017-07-21 12:17:14 +10:00
Maikel Linke
9f243e6d3c
Fix title of /admin/content/edit
...
Spree uses the global i18n key `contents` to print the title. A previous
change made that an object containing other i18n keys which was then
displayed as title.
This change moves the i18n content to the scope of the view where they
are displayed.
2017-07-21 12:17:13 +10:00
Maikel Linke
ece8d8b518
Fix typo to display "Producer signup page"
2017-07-21 12:17:13 +10:00
Maikel Linke
0624c49a4f
Fix typo to display "Tax Rates" report
2017-07-21 12:17:13 +10:00
Maikel Linke
71742a80b5
Make two more strings translatable
2017-07-21 12:17:13 +10:00
Maikel Linke
f4b1667005
Replace global translations by local ones
2017-07-21 12:17:13 +10:00
Maikel Linke
e5c9845b10
Remove duplicate haml code
2017-07-21 12:17:13 +10:00
Maikel Linke
d3fc89f42a
Unify haml code for colouring
2017-07-21 12:17:13 +10:00
Maikel Linke
9c6454b47a
Remove duplicated code
...
A label was accidentally inserted twice. Also removed some duplicate
translation.
2017-07-21 12:17:13 +10:00
Maikel Linke
7d2484c8bf
Remove superfluous string interpolation
2017-07-21 12:17:13 +10:00
Maikel Linke
9723c8b82b
Move translation into the right place
...
The dashboard couldn't find a translation, because it is in the spree
namespace.
Also simplified the translation using the `count` feature.
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
8b2b51d511
Fix code style for Rubocop
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
872a150c7d
Refactor some translations to use interpolation
2017-07-21 12:17:13 +10:00
Julius Pabrinkis
3a0c0fd638
Fix failing tests
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
739d06cf03
Extract translations from javascript
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
9fa7a30c7e
Fix failing tests and extract validation message Procs into methods
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
ba0b17e168
Extract translations from controllers
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
5caaec8ef3
Extract translations from mailers and helpers
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
9971c9f923
Extract translations from models
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
974099747b
Fix failing specs after text extraction
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
1920ee7e88
Extract translations from serializers and overrides
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
55b2c19b64
Extract translations from lib folder
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
60060a7017
Start admin/reports extract translations
2017-07-21 12:17:12 +10:00
Julius Pabrinkis
ef488133e8
Add missing translations from files list.
2017-07-21 12:17:12 +10:00
clairezed
5c66a2fc9d
Fix wrong key replacement for producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
5f8890e963
update producers pack translation key from sell_description_text to producer_shop_description_text
2017-07-21 11:15:03 +10:00
clairezed
58c463497a
#1541 fixing wrong translation key in producers packs
2017-07-21 11:15:03 +10:00
Rob Harrington
3bb6d68adf
Exclude node_modules from rubocop analysis
...
I don't need to see offences for node modules when I run rubocop locally
2017-07-21 11:06:16 +10:00
Duende13
705295049e
Improved test for variant serializer
2017-07-21 10:18:55 +10:00
Duende13
a07fd854f6
New test for variant serializer
2017-07-21 10:18:55 +10:00
Duende13
b2bae242d9
Sorting variants by name_to_display and unit_value. Issue 1604.
2017-07-21 10:18:55 +10:00
Maikel Linke
1a57a0b3ca
Revert changes in fr.yml
2017-07-19 09:46:23 +10:00
François Turbelin
a0595bc45a
Add missing translations on views
2017-07-19 09:45:11 +10:00
Enrico Stano
8853340fa1
Merge pull request #1655 from oeoeaio/update-eventmachine
...
Bump eventmachine version to resolve openssl issue on macOS
2017-07-13 13:04:28 +02:00
Enrico Stano
bde3fa4ce6
Merge pull request #1671 from coopdevs/multiline-method-calls
...
Use indented style for multiline method calls
2017-07-12 18:40:34 +02:00
Pau Perez
cee24dcca7
Use indented style for multiline method calls
...
This enables the Rubocop's Style/MultilineMethodCallIndentation cop with
indentend enforced style. Which makes you split multiline method calls like:
orders = Spree::Order
.an_scope
.another_scope
.where(id: list_of_ids)
It also autofixes the current violations and updates the
rubocop_todo.yml
2017-07-12 10:40:53 +02:00
Maikel
6fbf902562
Merge pull request #1680 from mkllnk/entreprise-typo
...
Correct typo raised by Sergi
2017-07-12 15:14:06 +10:00