raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-18 00:17:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,608 Commits 17 Branches 453 Tags
20c41ce69e04299a6bf821094de21f63f678dcc2
Commit Graph

2396 Commits

Author SHA1 Message Date
Steve Pettitt
ec3e158781 Merge current master 2016-02-20 17:24:57 +00:00
Steve Pettitt
23e774bede Styling, fewer columns in small/medium screen, logo resize 2016-02-20 17:20:43 +00:00
Maikel Linke
82182d24e7 Merge remote-tracking branch 'origin/master' into discourse-sso 2016-02-19 11:02:59 +11:00
stveep
83d248469f Running balances 2016-02-16 20:32:09 +00:00
Lynne Davis
2d620071f0 Fxing conflicts 2016-02-11 16:14:44 +00:00
Paul Mackay
50c657133a Change "&" to "and" 
There are very few places where ampersands are appropriate.

Minor typo in footer.
 2016-02-09 10:01:51 +00:00
Rob Harrington
2ebad800b2 Try again: using :site_meta_description for translation of global site meta description 2016-02-05 14:57:18 +11:00
Rob Harrington
dbe7fbc760 Using :meta_description for translation of global site description 2016-02-05 14:17:42 +11:00
Transifex-Openfoodnetwork
ad2e10c33e Updating translations for fr.yml and nb.yml 2016-02-05 14:17:42 +11:00
Maikel Linke
f5ff5bd5b0 Merge remote-tracking branch 'origin/master' into groups 2016-02-04 16:12:57 +11:00
Steve Pettitt
0ad3d8f351 WIP: styling updates 2016-02-02 23:21:04 +00:00
Nicolas Blanc
2be005d344 i18n from berlin hackathon 2016-01-31 12:16:33 +00:00
Nicolas Blanc
fb557dd682 Merge branch 'hackweek/i18n' of https://github.com/elf-pavlik/openfoodnetwork into elf-pavlik-hackweek/i18n 2016-01-31 09:16:33 +00:00
Steve Pettitt
4438cbd5d0 Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances 2016-01-30 19:53:53 +00:00
Steve Pettitt
ccd66bba9c Credit/debit formatting, use filters for money formatting, use full page width for table 2016-01-28 22:42:45 +00:00
Lynne Davis
02616a8ac7 Updates based on testing on staging 2016-01-27 18:43:01 +00:00
Lynne Davis
a9c37c162e Update email footer to use instance email and social media contacts 2016-01-26 13:14:29 +00:00
Maikel
3dd3cfa7ec Auto-merged master into uk/account-balances on deployment. 2016-01-25 04:43:25 +11:00
Maikel Linke
d562f6537e Cleaner opengraph meta tags 2016-01-20 15:42:01 +11:00
Maikel Linke
8c1a16b371 groups blurb text 2016-01-20 14:00:46 +11:00
ludivinecp
a611e73bed Opengraph facebook: images and description for shops and groups and home => ok 2016-01-15 14:03:33 +11:00
Maikel Linke
aea766327c Add say_no and say_yes to locale 2016-01-15 12:07:43 +11:00
Maikel
ddf6eef370 Auto-merged master into ng-vo-inventory-reset on deployment. 2016-01-15 09:21:54 +11:00
Rob Harrington
53d97dab08 WIP: Adding view and routes for resetting variant_overrides count_on_hand 2016-01-15 09:07:48 +11:00
Continuous Integration
e070168c4a Auto-merge from CI [skip ci] 2016-01-15 03:30:02 +11:00
Maikel Linke
c33835e751 fixup whitespace 2016-01-13 16:23:14 +11:00
stveep
81b688f0e8 Merge branch 'master' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances 2016-01-07 13:26:13 +00:00
Maikel Linke
46382e669f more verbose example of Discourse config 2016-01-07 22:44:03 +11:00
Maikel Linke
217fa9a57c UI integration of Discourse login 2016-01-07 19:01:09 +11:00
Christian
01bf64e6b0 Allow delayed_job to use the locale defined for application 
delayed_job requires a different configuration variable for locale than
the application.

See
https://stackoverflow.com/questions/8478597/rails-3-set-i18n-locale-is-not-working
for reference
 2016-01-07 07:15:18 +01:00
Christian
839bf8794f Fix a hard cocded string on Order summary screen 
Created an order_pickup_time entry in locale files.
 2016-01-07 07:06:26 +01:00
Maikel Linke
030f4f63ed SingleSignOn controller with routes and config 2016-01-07 12:58:30 +11:00
Maikel Linke
9342ceb968 Adding translation notes to en.yml 2015-12-24 11:44:13 +11:00
Maikel
324f58a636 Updating translations for es.yml, fr.yml and nb.yml 2015-12-24 11:44:12 +11:00
Maikel Linke
59c51f9e7c Fixing typo in locale: email_payment_method 2015-12-24 11:09:37 +11:00
stveep
f9435a3c34 Starting i18n 2015-12-23 14:39:56 +00:00
Emmanuel
5e081ce3ee Translations of validation messages in app/models 2015-12-21 10:11:08 +01:00
elf Pavlik
2a4f3f9ae4 making test pass 2015-12-21 10:11:08 +01:00
knopfler81
ed48b691e1 translations in app/assets/javascripts/admin 2015-12-21 10:11:08 +01:00
Emmanuel
30141bd488 few translations in app/assets/javascripts/admin/ 2015-12-21 10:11:08 +01:00
victor goutay
e16e3fba40 translations in app/assets/javascripts/admin/ 2015-12-21 10:11:08 +01:00
ludivinecp
69ab113201 translations in app/assets/javascripts/admin/ 2015-12-21 10:11:07 +01:00
elf Pavlik
8a390dd237 fixing test failing after i18n changes 2015-12-21 10:11:07 +01:00
julienFR88
5290d0be6b add translation in /cache/code/ofn/openfoodnetwork/app/views/spree/admin 2015-12-21 10:11:07 +01:00
Edem
6cd7fbb455 all string translated in admin bulk orders management 2015-12-21 10:11:07 +01:00
Edem
8ccf527e01 all strings in app/views/spree/admin/overview/* translated! 2015-12-21 10:11:06 +01:00
Edem
d2ec4fcf88 Everything string translated in admin/entreprise_relationships 2015-12-21 10:11:06 +01:00
julienFR88
8fa293f561 my admin interface translations 2015-12-21 10:10:58 +01:00
apprenti
b58306aad8 my first translations 2015-12-21 09:47:18 +01:00
Edem
2a2f8f3531 admin entreprise_group are translated! 2015-12-21 09:47:18 +01:00