Maikel Linke
21337a5b50
Merge tag 'v1.8.9' into transifex
2017-04-06 10:36:14 +10:00
Maikel Linke
ec36a843cf
Merge tag 'v1.8.8' into transifex
2017-04-06 10:31:26 +10:00
Transifex-Openfoodnetwork
e99dbaf4d8
Updating translations for config/locales/es.yml [skip ci]
2017-04-05 19:40:18 +10:00
Pierre de Lacroix
268bea25d0
add qz/ folder from ofn-qz gem to list of assets
2017-03-30 20:37:20 +02:00
Maikel Linke
a94961c0a7
Fixup merge conflicts and remove unused text
2017-03-29 14:58:19 +11:00
Lynne Davis
e8999d23e1
Updated translations
2017-03-29 13:12:29 +11:00
Transifex-Openfoodnetwork
6defb09d2e
Updating translations for config/locales/fr.yml [skip ci]
2017-03-21 09:03:15 +11:00
Transifex-Openfoodnetwork
2774c09d7a
Updating translations for config/locales/nb.yml [skip ci]
2017-03-20 07:10:53 +11:00
Matt-Yorkley
c0c6cd1a60
Product Import feature
2017-03-17 16:11:52 +11:00
Maikel Linke
8107f49373
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/fr.yml
2017-03-16 09:30:22 +11:00
Rob Harrington
bea0b2b1e5
Adding feature toggle for receipt printing using qz
2017-03-15 16:39:04 +11:00
Rob Harrington
9a69951136
Using correct key for invoice_settings title translation
2017-03-15 16:12:50 +11:00
Rob Harrington
e19bab1aa2
Fixing translations for invoice settings edit template
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
70707969f3
Add Qz integration
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
2fe25c6219
Allow both invoice layouts to coexist
...
Add a new "Invoice" page in the admin backend
with a checkbox to toggle between layouts
2017-03-15 15:06:28 +11:00
Pierre de Lacroix
cc1ef5b28b
fixes on invoice and tax report
2017-03-15 15:04:57 +11:00
Pierre de Lacroix
88a09da325
fix for pull request #1374
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
8570471c00
add tax rates report
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
7925af30d6
add enterprise logo and custom text on invoices
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
6f59751582
change i18n fallbacks parameter to EN in production settings
2017-03-15 15:03:18 +11:00
Pierre de Lacroix
2d2792225a
change invoice layout to include amount for each relevant tax rate
2017-03-15 15:03:18 +11:00
Maikel Linke
a079a64cbe
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into i18n2
2017-03-15 12:35:39 +11:00
Maikel Linke
656be690a3
Remove space from permalink tip
2017-03-15 12:11:56 +11:00
Maikel Linke
167045f695
Remove forgotten " character
2017-03-15 12:01:31 +11:00
François Turbelin
dbe968afbb
Fixing translated interpolation in fr locale
2017-03-12 12:42:00 +01:00
François Turbelin
179b995fa0
Fixing wrong string interpolation in i18n files
2017-03-12 12:41:06 +01:00
François Turbelin
4791086207
Fixing i18n multiline issues
2017-03-12 12:39:29 +01:00
François Turbelin
be6b09a6e0
Adding i18n keys on JS templates
2017-03-12 12:22:13 +01:00
Transifex-Openfoodnetwork
f235099859
Updating translations for config/locales/fr.yml [skip ci]
2017-03-11 16:50:17 +11:00
Matt-Yorkley
a62998e5f1
Enterprise Terms of Service
2017-02-22 13:40:17 +11:00
François Turbelin
ebcb8ff3e7
Finishing Translations keys implemtentation on Admin ERB views
2017-02-19 22:08:34 +01:00
Maikel Linke
da8c107331
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/fr.yml
2017-02-15 15:47:25 +11:00
Transifex-Openfoodnetwork
e008a154e5
Updating translations for config/locales/sv.yml [skip ci]
2017-02-09 02:36:14 +11:00
Continuous Integration
a2d01b5144
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-08 16:53:53 +11:00
Maikel Linke
b8622e95b7
Re-use NavigationCheck logic
...
The enterprise switcher now uses the same code as NavigationCheck to
confirm leaving a changed form. This makes FormState obsolete.
Conflicts:
app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee
2017-02-02 10:58:32 +11:00
Continuous Integration
f8341dccd4
Merge remote-tracking branch 'origin/master' into HEAD
2017-02-01 10:35:53 +11:00
Lynne
6d19613ecc
Revert "translate ABN and ACN to company number, charity number"
2017-01-30 12:53:01 +00:00
Lynne
67730e82c3
Update en-GB.yml
2017-01-30 12:04:24 +00:00
OliverUK
940ca7ade1
translate ABN and ACN to company number, charity number
2017-01-27 15:02:38 +00:00
Matt-Yorkley
27903ab744
Merge branch 'master' into uk/switcher
2017-01-22 18:57:25 +00:00
Continuous Integration
52e4722dcb
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-18 11:19:57 +11:00
Continuous Integration
20d01c3047
Merge remote-tracking branch 'origin/master' into HEAD
2017-01-13 11:44:47 +11:00
Maikel Linke
44970a13bb
Fix translation of email confirmation notice
...
The `_html` suffix was missing leading to `<br />` being displayed in
plain text. The new version also integrates the email address as a
variable in the translation.
2017-01-13 10:21:25 +11:00
Maikel Linke
e899633aff
Merge duplicate locale entry admin.enterprises.index
2017-01-11 14:48:05 +11:00
Maikel Linke
a9f01c0f0d
Fix typos in en.yml
2017-01-11 11:15:44 +11:00
François Turbelin
88dea0f2b8
Adding i18n keys on Admin side (Rails views)
2017-01-11 10:00:06 +11:00
Paul Mackay
5cb2194f5e
#1027 : Add sitemap.xml generation
2017-01-10 11:39:17 +00:00
Transifex-Openfoodnetwork
64f6a794fc
Updating translations for config/locales/nb.yml [skip ci]
2017-01-08 23:36:57 +11:00
elf Pavlik
764c95488c
made api key optional (google maps)
2017-01-07 10:25:32 -06:00
elf Pavlik
bd1cd527d3
configurable google maps api key
2017-01-03 20:57:10 -06:00
