raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 20 Branches 453 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

1728 Commits

Author SHA1 Message Date
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
Rob Harrington
0ed8cf973d Adding an example bill calculator to business model config edit page 
To allow super admin to see the effects of any changes they make to BMC settings
 2015-12-16 19:18:58 +11:00
Rob Harrington
ca3c464fda Reorganising busines model config settings, moving account invoice tax rate in busines model config settings 2015-12-16 19:18:57 +11:00
Rob Harrington
5b72f53738 Adding helper for describing monthly billing charges 2015-12-16 19:18:57 +11:00
Rob Harrington
cb9b61f393 WIP: Adding an edit view for BMC variables 2015-12-16 19:18:56 +11:00
Rob Harrington
e20b06bb97 Adding basic route and controller for business model configuration 2015-12-16 19:18:56 +11:00
Rob Harrington
c91f1301f0 Adding preferences to enterprises for sorting of order cycles in shopfront list 2015-12-16 11:55:23 +11:00
Rob Harrington
e6a51bb49d Adding actions dropdown to admin order view/pages 2015-12-16 11:55:23 +11:00
Rob Harrington
ae0ad73b4a Printable Invoices Improvements for Food Connect 
Adding cusotmer instructions, hiding tax column when not present, order cycle name appears at top of invoice and items are sorted by product name
 2015-12-16 11:55:23 +11:00
Rob Harrington
96aace971f Merge remote-tracking branch 'origin/master' into line_item_naming 2015-11-25 15:13:56 +11:00
Paul Mackay
a2a87cc68f #715: Add missing strings for en-GB locale. 2015-11-23 16:44:39 +00:00
Rob Harrington
75846a4d1f Merge branch 'master' into line_item_naming 2015-11-16 10:38:42 +11:00
Maikel Linke
8bfe459241 i18n fixes of html display 2015-11-13 14:22:17 +11:00
Maikel Linke
5d5fda3a25 Merge remote-tracking branch 'origin/master' into i18n 
Conflicts:
	config/locales/en.yml
 2015-11-13 10:07:29 +11:00
Rob Harrington
a96cdd5ee7 Merge branch 'master' into line_item_naming 
Conflicts:
	app/views/admin/order_cycles/edit.html.haml
 2015-11-13 09:54:26 +11:00
Rob Harrington
be8038e9d0 Merge branch 'master' into line_item_naming 
Conflicts:
	lib/open_food_network/order_cycle_management_report.rb
	lib/open_food_network/packing_report.rb
 2015-11-12 14:40:11 +11:00
Rohan Mitchell
e20d8d3e95 Merge branch 'master' into folklabs-producer-emails 2015-11-11 14:20:25 +11:00
Rohan Mitchell
727ecae62b Admin can modify a taxed adjustment on an order 2015-11-11 11:53:04 +11:00
Rohan Mitchell
d794981ecf Add form field to set tax when creating adjustment on order. Display tax included in adjustments on order interface. 2015-11-11 11:53:04 +11:00