Foodsoft
/
foodsoft
1
1
Fork 0
Code Issues 36 Pull Requests 5 Projects 1 Releases Wiki Activity
1,028 Commits 22 Branches 1 Tag 31 MiB
Commit Graph

370 Commits

Author SHA1 Message Date
wvengen 76645ebd12 add default tax percentage to app_config 2013-07-06 23:11:50 +02:00
wvengen 9ef208fa13 small translation changes 2013-06-29 03:02:05 +02:00
wvengen b807e9d059 beautify order mail 2013-06-29 02:54:00 +02:00
wvengen 9b0db5bb0b translation updates: capitalisations, order_result mail 2013-06-29 02:46:20 +02:00
Robert Waltemath e5d790021c Add repeated symbol to task list. 2013-06-27 10:22:22 +02:00
Julius d0ccf07bc5 Merge latest changes in master of http://github.com/foodcoops/foodsoft 2013-06-26 20:23:11 +02:00
Julius 8a79dfd167 Add tooltip for article prices 2013-06-26 20:06:38 +02:00
Julius 2ee7f716ae Improve delivery validation: StockArticles must not be associated more than once 2013-06-26 17:58:55 +02:00
Julius 5df4c8f8a6 Update locales for delivery form 2013-06-26 15:21:11 +02:00
Julius dd70b84ef0 Linearize and clean up delivery form 2013-06-26 15:16:52 +02:00
wvengen e450cf404e harmonize order cycle translations 2013-06-25 00:16:30 +02:00
Robert Waltemath c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath 2e1a3eb47f Removed unused I18n strings. 2013-06-22 11:23:08 +02:00
Robert Waltemath 990397a7f0 Delete only the FOLLOWING tasks. 2013-06-21 22:04:36 +02:00
wvengen cab6ada8b8 small invoice i18n cleanup/refactoring 2013-06-21 14:24:05 +02:00
wvengen c5c4b1f93f small translation updates 2013-06-21 13:54:36 +02:00
wvengen 906093b3ce small i18n fixes and clarifications 2013-06-21 13:49:34 +02:00
Robert Waltemath 6b62fc90d8 Now creating periodic task via button 2013-06-21 13:48:48 +02:00
wvengen 3cfd8b2d44 fix i18n key 2013-06-21 13:25:52 +02:00
Julius bf32e72414 Improve delivery form validation 2013-06-19 11:21:55 +02:00
wvengen c48ce138f3 cleanup of profile layout 2013-06-18 12:25:05 +02:00
Julius 04c9770e80 Complete I18n 2013-06-18 10:59:53 +02:00
Julius 9502ca28dd Merge latest changes in master 2013-06-17 15:47:08 +02:00
wvengen 713c030213 i18n and translate missing entry 2013-06-15 18:43:42 +02:00
wvengen 8c08de9eae translation fixes, clarifications and additions 2013-06-15 17:59:15 +02:00
Manuel Wiedenmann 6569579c02 styles the preferences in user profile 2013-06-14 22:38:07 +02:00
Julius b5acd9b116 Merge master branch of base 2013-06-14 18:59:17 +02:00
Julius 885b11dba8 Add english translations for novel delivery functionality 2013-06-14 12:33:16 +02:00
Manuel Wiedenmann ba923a8f16 updates locale files 2013-06-14 02:53:17 +02:00
Manuel Wiedenmann 5b7ec86ed6 Merge branch master into i18n 2013-06-14 02:02:57 +02:00
Julius 65f61e09d5 Improve delivery workflow; introduce sortable tables; use js.erb for deliveries 2013-06-13 23:36:22 +02:00
wvengen ca9841dd02 fixup translation string order for localeapp roundtrip 2013-06-13 00:09:04 +02:00
wvengen e3e1b5a1b3 add start of Dutch translation 2013-06-13 00:08:15 +02:00
wvengen d63e1f8066 translation updates previously missed 2013-06-12 23:20:02 +02:00
wvengen 848ef67e40 update documentation urls in config after repository move 2013-06-12 22:57:44 +02:00
wvengen a9c3d538d0 use rfc2606 compliant domains in sample config 2013-06-12 22:56:37 +02:00
wvengen 3d1847fabb small i18n and translation updates 2013-06-12 22:44:51 +02:00
Robert Waltemath 4037ef12da Users may delete all tasks of a group, i.e. delete the whole group. 2013-06-12 12:02:13 +02:00
Robert Waltemath 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks 
Conflicts:
	config/locales/de.yml
 2013-06-12 10:00:11 +02:00
Julius 49cfa9aded Cleanup StockArticle creation during delivery 2013-06-11 15:05:19 +02:00
Julius e28f3eda65 Fix StockArticle creation during delivery; small cleanups 2013-06-11 13:10:18 +02:00
wvengen ad29a238f2 finish English translation 2013-06-10 10:02:33 +02:00
Manuel Wiedenmann 0061e45198 removes routes locale constrain and fixes some bugs 2013-06-06 04:29:53 +02:00
Manuel Wiedenmann 60c4c5510a adds a new user settings system + migration + rake task/worker updates 2013-06-06 03:40:15 +02:00
wvengen 8929f69dc4 add missing i18n text 2013-06-06 02:42:38 +02:00
wvengen 3d05900067 make translation roundtrip over localeapp work without changes 2013-06-06 02:28:58 +02:00
wvengen fb6196b78b fix translation errors and inconsistencies between German and English 2013-06-06 01:54:50 +02:00
wvengen 75c4e7d6f7 move English translations to single file 2013-06-06 01:33:41 +02:00
wvengen bf94a4b472 remove superfluous newlines in German translation 2013-06-06 01:33:04 +02:00
wvengen c4b5a658c0 move German translations to single file 2013-06-06 01:15:56 +02:00
Manuel Wiedenmann c2c1961bd0 adds i18n support to routes and application controller; default_locale is set to :en 2013-05-31 18:42:28 +02:00
Manuel Wiedenmann c42c00b5f1 adds mailcatcher to foodsoft:setup_development 2013-05-29 12:35:16 +02:00
Manuel Wiedenmann 21c7fa40c1 adds a foodsoft:setup_development rake task 2013-05-26 14:02:16 +02:00
Manuel Wiedenmann ec74b642a0 adds sqlite3 to Gemfile to test deployment 2013-05-25 20:16:49 +02:00
Manuel Wiedenmann 4024329474 adds doc/DEPLOYMENT instructions 2013-05-25 20:03:53 +02:00
Manuel Wiedenmann 92d9a57f3f adds capistrano for deployment 2013-05-25 19:38:14 +02:00
wvengen d0c74b394e i18n and translate page number text too 2013-05-20 17:14:42 +02:00
wvengen 0c94ef5912 also translate mail subjects 2013-05-07 13:28:14 +02:00
wvengen 305ae9b5c0 translate missing defaults 2013-05-07 00:15:00 +02:00
wvengen 8b559269c9 add deliveries, pages, tasks translation in English 2013-05-06 12:43:57 +02:00
wvengen 53d5eabf79 fix login i18n 2013-04-26 21:35:23 +02:00
Manuel Wiedenmann 98b729eb71 i18n SimpleForm uses AR as attribute name fallback 2013-04-21 18:22:56 +07:00
wvengen f95652c756 fix multiline i18n fields 2013-04-19 11:16:21 +02:00
Lippe cb39a4e587 Corrects typo in en.workgroups.yml 2013-04-16 02:08:47 -04:00
Lippe f9a87d65a7 Changes copy, grammar, typos in en.simple_form.yml 2013-04-16 02:05:58 -04:00
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