Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
714 commits 22 branches 1 tag 31 MiB
Commit graph

253 commits

Author SHA1 Message Date
Lippe
ea83baa676 Changes copy, grammar, typos in en.shared.yml 2013-04-16 02:03:01 -04:00
Lippe
e7a3390371 Changes copy, grammar, typos in en.login.yml 2013-04-16 01:59:36 -04:00
Lippe
c958fe4aac Changes copy, grammar, typos in en.invites.yml 2013-04-16 01:53:36 -04:00
Lippe
c0437c5145 Changes copy, grammar, typos in en.home.yml 2013-04-16 01:50:12 -04:00
Lippe
fd8d73b768 Changes copy, grammar, typos in en.group_orders.yml 2013-04-16 01:46:17 -04:00
Lippe
ffd6da2d61 Changes copy, grammar, typos in en.foodcoop.yml 2013-04-16 01:44:04 -04:00
Lippe
df6371c4b6 Changes copy, grammar, typos in en.finance.yml 2013-04-16 01:42:45 -04:00
Lippe
c41a849be3 Changes copy, grammar, typos in en.feedback.yml 2013-04-16 01:38:35 -04:00
Lippe
29bb2413aa Changes copy, grammar, typos in en.defaults.yml 2013-04-16 01:36:23 -04:00
Lippe
022c26f580 Changes copy, grammar, typos in en.articles.yml 2013-04-16 01:36:01 -04:00
Lippe
5362eab4ad Changes copy, grammar, typos in en.admin.yml 2013-04-16 01:34:57 -04:00
wvengen
5e2a3fb3f0 fix articles controller i18n 
Conflicts:

	app/controllers/articles_controller.rb
 2013-04-12 16:17:12 +02:00
wvengen
f6ba21832d Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/articles_controller.rb
	app/views/articles/_form.html.haml
	app/views/articles/sync.html.haml
	app/views/finance/balancing/_edit_note.html.haml
	app/views/finance/group_order_articles/_form.html.haml
	app/views/finance/order_articles/_edit.html.haml
	app/views/finance/order_articles/_new.html.haml
	app/views/group_orders/show.html.haml
	app/views/invites/_modal_form.html.haml
 2013-04-12 15:45:24 +02:00
wvengen
70542c1ad7 update en translation 2013-04-12 01:30:02 +02:00
wvengen
ccb116f504 add documents en translation 2013-04-12 01:15:11 +02:00
wvengen
368d44e26b fix tasks error reference 2013-04-12 01:08:35 +02:00
wvengen
692c70d324 finish pages i18n 2013-04-12 00:59:45 +02:00
wvengen
1a8c8537a4 finish tasks i18n 2013-04-12 00:00:02 +02:00
wvengen
6c65799025 use more beautiful close mark 2013-04-10 17:34:24 +02:00
wvengen
a501fac76f helpers i18n 2013-04-10 17:29:06 +02:00
wvengen
3f82138d84 finish deliveries i18n 2013-04-10 17:02:16 +02:00
wvengen
ee5f7ff1b8 small i18n/translation fixes 2013-04-10 14:07:59 +02:00
Benjamin Meichsner
13e921a632 Fixed some errors in articles#sync. Show better error messages. 2013-04-08 01:00:49 +02:00
wvengen
f1d6df9ecc move commonly used verbs to common i18n identifier 2013-04-04 02:49:52 +02:00
wvengen
4aa40b387a finish article_categories controllers i18n + translation 2013-04-04 02:10:52 +02:00
wvengen
8c8778459e finish documents i18n 2013-04-04 02:04:31 +02:00
wvengen
24d04b25db fix some small i18n errors 2013-04-04 00:56:45 +02:00
wvengen
ec1ef0289b finish i18n of article_categories + translation 2013-04-04 00:44:07 +02:00
wvengen
0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/login_controller.rb
	app/models/message.rb
	app/views/sessions/new.html.haml
 2013-04-04 00:29:50 +02:00
wvengen
e1f5969719 use short form plus title for unit quantity 2013-04-04 00:24:14 +02:00
wvengen
f55a0955d3 add articles, workgroups translation plus other translation updates 2013-04-04 00:13:16 +02:00
Benjamin Meichsner
915e1b9e79 Fixed bug in reset password error handling. 2013-03-27 22:12:46 +01:00
wvengen
f81e315d6f finish i18n of models without view 2013-03-22 01:21:44 +01:00
wvengen
75a1051668 finish articles i18n, controller+model 2013-03-22 00:59:42 +01:00
wvengen
aabeb1a332 finish articles i18n 2013-03-22 00:20:37 +01:00
wvengen
7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/controllers/admin/ordergroups_controller.rb
	app/controllers/finance/balancing_controller.rb
	app/controllers/suppliers_controller.rb
	app/views/articles/_article.html.haml
	app/views/finance/balancing/_summary.haml
	app/views/finance/balancing/new.html.haml
	app/views/group_orders/_form.html.haml
	app/views/home/_apple_bar.html.haml
	app/views/suppliers/index.haml
 2013-03-21 22:08:09 +01:00
Benjamin Meichsner
c05b3e0e19 Balancing: Do not update oder summary automaticly when changing group orders. 2013-03-17 15:47:50 +01:00
Benjamin Meichsner
1cbf663b39 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 2013-03-09 16:31:00 +01:00
Benjamin Meichsner
2f109c376d Fixed bug when submitting huge forms. (stock taking etc) 2013-03-09 16:14:20 +01:00
wvengen
cb537bc11c start articles i18n 2013-03-09 00:40:07 +01:00
wvengen
b81f414ae5 finish finance/order_articles i18n + en translation 2013-03-08 23:35:50 +01:00
wvengen
c9b2d01fa5 i18n last merge 2013-03-06 01:24:57 +01:00
wvengen
2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3 
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
	app/controllers/stockit_controller.rb
	app/models/ordergroup.rb
	app/models/workgroup.rb
	app/views/stockit/index.html.haml
 2013-03-06 01:01:12 +01:00
wvengen
2b03a15a9a finish finance invoice i18n and en translation 2013-02-27 12:31:01 +01:00
wvengen
d3d4bf1e2b add en translation of finance 2013-02-27 12:11:48 +01:00
wvengen
d9949681a2 localize invite model 2013-02-27 11:59:03 +01:00
Julius
467b53c009 Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete 2013-02-25 11:14:48 +01:00
Benjamin Meichsner
3fb5c313ee Show usefull error message for uniqueness_of_name with acts_as_paranoid. 
Fixed #88

Conflicts:

	app/models/ordergroup.rb
 2013-02-25 10:49:55 +01:00
wvengen
0b66fe6d62 add en translation foodcop, navigation 2013-02-25 10:36:15 +01:00
wvengen
ae727576dd en translation update 2013-02-25 10:35:14 +01:00