Continuous Integration
b43b92dcfd
Merge remote-tracking branch 'origin/master' into HEAD
2017-08-11 18:16:25 +10:00
Pau Perez
649c25622a
Add doc to method
2017-08-11 14:41:02 +10:00
Pau Perez
1f2820f6d4
Add #delivery? in ShippingMethod
2017-08-11 14:41:02 +10:00
Pau Perez
22f018f2bc
Fix all specs of LastUsedAddress
2017-08-11 14:41:02 +10:00
Lynne
b9ff5674af
Correction for Transifex name mismatch
2017-08-04 16:18:57 +01:00
Lynne
f0968109c6
Copy transifex updates to en-GB
2017-08-03 20:33:26 +01:00
Transifex-Openfoodnetwork
eeb41ccfdd
Updating translations for config/locales/en_GB.yml [skip ci]
2017-08-04 04:30:40 +10:00
Continuous Integration
587a53d36d
Merge remote-tracking branch 'origin/master' into HEAD
2017-08-04 03:56:40 +10:00
Transifex-Openfoodnetwork
ec7b7e0391
Updating translations for config/locales/sv.yml [skip ci]
2017-08-03 17:43:53 +10:00
Enrico Stano
936355d54b
Merge pull request #1681 from coopdevs/release-notes-in-template
...
Add release notes section in github template
2017-08-02 10:59:30 +02:00
Enrico Stano
07620c2e62
Merge pull request #1707 from oeoeaio/mirror-db-session-data
...
Exclude session data when mirroring data
2017-08-02 10:45:46 +02:00
Maikel Linke
686a8f3af9
Add legacy and default values for LOCALE
...
This makes sure there is a value in `config.i18n.available_locales` so
that i18n-js doesn't crash.
2017-08-02 10:44:55 +10:00
Maikel Linke
199bfe531e
Correct typo in comment
2017-08-02 10:01:12 +10:00
Julius Pabrinkis
e4627fe0d0
Update README
2017-08-02 09:57:33 +10:00
Julius Pabrinkis
ec6a365227
Add test coverage for switching language in darkswarm and admin
2017-08-02 09:57:33 +10:00
Julius Pabrinkis
c6f6f5bc55
Adapt karma js tests for i18n-js
2017-08-02 09:57:33 +10:00
Julius Pabrinkis
5166a3d958
Add available_locales config feature
2017-08-02 09:57:33 +10:00
Julius Pabrinkis
9429695e15
Add i18n helper for controllers to switch language by params
2017-08-02 09:57:32 +10:00
Julius Pabrinkis
f396d30747
Render i18n-js config inside darkswarm and admin layouts
2017-08-02 09:57:32 +10:00
Julius Pabrinkis
2637574c93
Require new i18n-js translations in darkswarm and admin
2017-08-02 09:57:32 +10:00
Julius Pabrinkis
d2ba4650e5
Add temporary i18n-js workaround for Spree translations until upgrade
2017-08-02 09:57:32 +10:00
Julius Pabrinkis
3adb13e62c
Add i18n-js gem
2017-08-02 09:57:32 +10:00
Transifex-Openfoodnetwork
f69d86ab8f
Updating translations for config/locales/nb.yml [skip ci]
2017-07-31 20:50:37 +10:00
Rob Harrington
7c0feab08f
Fix #1526 : add descriptions for reports *before* they are filtered
2017-07-28 17:15:57 +10:00
Matt-Yorkley
ea784d6362
Invoice date and translation adjustments
2017-07-28 16:34:43 +10:00
Maikel
6e57f917d2
Merge pull request #1736 from oeoeaio/fix-zeus-crash
...
Fix zeus issue caused by location of iframe_test.html
2017-07-28 16:31:41 +10:00
Maikel Linke
ba97f61c9e
Move translations into right scope
2017-07-28 15:23:18 +10:00
Maikel Linke
c5eca68d79
Remove unused translation
2017-07-28 15:23:18 +10:00
Maikel Linke
92814162dc
Remove unused translation
2017-07-28 15:23:18 +10:00
Maikel Linke
44374e8499
Display "+1 More" correctly
2017-07-28 15:23:18 +10:00
Rob Harrington
2ca04bb84e
Revert translations of LettuceShare report headers
2017-07-28 12:07:58 +10:00
Rob Harrington
66a85bb99f
Revert translations of Xero report headers
2017-07-28 12:07:52 +10:00
Rob Harrington
9f6931ba18
Move embedded shopfronts iframe view into spec/support/views
...
Was causing issues with zeus where it was (in spec/dummy)
Didn't get to the bottom of what was happening, this was
just a quick, simple and zero-cost solution
2017-07-28 11:54:48 +10:00
Rob Harrington
8fe6800151
Add documentation to the top of mirror_db script
2017-07-27 12:58:54 +10:00
Rob Harrington
e86122cb3e
Exclude session data when mirroring data
...
Probably a better long term solution would be to add a job to clean
up old session data on the server, but this is a quick & dirty fix
to speed mirroring up on a slow connection.
2017-07-27 12:58:54 +10:00
Laura Turk
7641dcc1be
Add media query to panepadding mixin
2017-07-26 16:29:44 +10:00
Leta Keane
8648070a05
Add disabled class to shopfront property selectors
2017-07-26 15:46:00 +10:00
Matt-Yorkley
5200937165
Safari/iOS iframe issue fix
2017-07-26 13:56:36 +10:00
Matt-Yorkley
6215777986
Shopfront review adjustments
2017-07-26 13:56:36 +10:00
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
