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
Lynne Davis
d17f9dc504
update
2017-01-03 16:35:01 +00:00
Lynne Davis
f62c583130
uk translation updates
2017-01-03 16:12:41 +00:00
Matt-Yorkley
bc5672b5eb
Added translation
2016-12-20 13:30:24 +00:00
Rafael Braz
eef308c4f6
create a pr-br translate file ( #1266 )
2016-12-15 08:39:37 +11:00
Transifex-Openfoodnetwork
70225afa13
Updating translations for config/locales/fr.yml [skip ci]
2016-12-12 05:53:28 +11:00
Matt-Yorkley
287e0b5b55
Enterprise switcher and navigation check
2016-12-09 15:15:42 +00:00
Continuous Integration
c6a1560845
Auto-merge from CI [skip ci]
2016-12-10 01:42:26 +11:00
Lynne Davis
45dc1341d3
translation updates
2016-12-09 14:41:16 +00:00
Continuous Integration
14ee7a06ae
Merge remote-tracking branch 'origin/master' into HEAD
2016-12-07 17:03:27 +11:00
Maikel Linke
6cd8289b27
Correct more typos
2016-12-02 16:50:54 +11:00
Lynne Davis
ee905cad5f
Translation updates
2016-11-29 15:07:35 +00:00
Transifex-Openfoodnetwork
01efb63ad3
Updating translations for config/locales/en_GB.yml [skip ci]
2016-11-30 01:07:53 +11:00
Rohan Mitchell
071ba5285d
Put timecop config in spec support
2016-11-25 14:28:05 +11:00
Rohan Mitchell
6795237a2d
Put timecop into safe mode and fix leaky Timecop.freeze
2016-11-25 14:14:42 +11:00
Rohan Mitchell
f4f38b4183
Re-apply shop property filters - including performance regression
...
This reverts commit 7d149ed198
2016-11-25 14:14:42 +11:00
Levent Ali
63e815c7fc
Correct spelling of further in translations
2016-11-24 08:31:01 +00:00
Rohan Mitchell
5913004e14
Fix datepicker error parsing date
2016-11-09 11:47:57 +11:00
Rohan Mitchell
a0b740f52d
Generalise fix for missing EnterpriseFee::Calculator to any use of calculated_adjustments
2016-11-04 09:39:17 +11:00
Maikel Linke
b66cf14bcb
Merge remote-tracking branch 'origin/master' into transifex
...
Conflicts:
config/locales/en_GB.yml
2016-10-28 15:21:03 +11:00
Transifex-Openfoodnetwork
b78739f777
Updating translations for config/locales/it.yml [skip ci]
2016-10-21 22:51:27 +11:00
Bing Xie
63617f80c5
Add confirm when delete customer
2016-10-21 10:51:36 +11:00
Bing Xie
bc798504e0
Add new enterprise customers search API
2016-10-21 10:51:36 +11:00
Bing Xie
8afbdcaf79
Move phone down
2016-10-21 10:51:36 +11:00
Bing Xie
3e590f92ff
Set default billing address and shipping address
2016-10-21 10:51:36 +11:00
Transifex-Openfoodnetwork
7cfb25ace9
Updating translations for config/locales/en_GB.yml [skip ci]
2016-10-15 01:48:24 +11:00
Transifex-Openfoodnetwork
33d940c736
Updating translations for config/locales/fr.yml [skip ci]
2016-10-12 01:03:42 +11:00
Maikel Linke
08b9b50f33
Re-phrase shop options
2016-10-07 13:17:28 +11:00
Maikel Linke
c59cd21698
Add option 'allow guest orders' to enterprise
...
An enterprise manager can choose to allow guest orders (default) or
require a valid login for checkout.
2016-10-05 14:04:08 +11:00
Maikel Linke
92694c729f
Move 'shopfront requires login' setting
...
Move 'shopfront requires login' setting to 'shop preferences' tab in
Profile Edit.
Solves issue #901 .
2016-10-05 14:04:08 +11:00
Lynne Davis
a3722dee80
delete file - fix conflict
2016-10-04 15:29:57 +01:00
Transifex-Openfoodnetwork
b349c28b9b
Updating translations for config/locales/nb.yml [skip ci]
2016-10-02 00:38:02 +10:00
Maikel Linke
fba72498e3
Merge remote-tracking branch 'origin/master' into transifex
2016-09-21 16:36:22 +10:00
Lynne Davis
c533f6a15e
Updates to UK translations
2016-09-19 20:33:58 +01:00
Transifex-Openfoodnetwork
23a216004e
Updating translations for config/locales/en_GB.yml [skip ci]
2016-09-20 01:02:27 +10:00
Rob Harrington
7d149ed198
Revert shop property filters - causing 10x slowdown
...
This commit reverts commits 7eeee78c4ee8f96e4818
2016-09-18 17:46:43 +10:00
Rohan Mitchell
38d5682762
Add property filters for shops
2016-09-16 11:28:45 +10:00
Rob Harrington
b2e14711ac
Gateway providers inherit from decorated Gateway and PaymentMethod classes in production
...
Achieved by requiring payment method and gateway decorators in Spree initializer
2016-08-31 12:43:22 +10:00
Rohan Mitchell
509564819a
Remove FlatPercentPerItem calculator for shipping methods and payment methods to reduce confusion
2016-08-26 10:26:50 +10:00
Rohan Mitchell
308c24caf4
Add FlatPercentPerItem calculator for shipping methods, remove FlatPercentItemTotal for enterprise fees (causes shopfront cart discrepencies).
2016-08-26 09:29:09 +10:00
