Commit Graph

209 Commits

Author SHA1 Message Date
wvengen 13768285e4 localeapp roundtrip 2015-05-15 14:26:08 +02:00
wvengen beee5a1245 Localeapp roundtrip 2015-05-02 15:27:06 +02:00
Patrick Gansterer 700eed27b8 Add last user login and activity 2015-03-03 14:55:30 +01:00
Patrick Gansterer 55e8ff481c Add reply_to and group_id to messages schema 2015-02-27 17:30:26 +01:00
wvengen 26c364bf4b Merge pull request #354 from foodcoop1040/recipients
Show recipients of messages
2015-02-18 23:28:29 +01:00
Patrick Gansterer e57fd500fc Add possibility to copy an order
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
Patrick Gansterer 23f0a1613a Show recipients of messages 2015-02-18 17:45:20 +01:00
wvengen cfdfe5f23e Improve header+footer in PDFs 2015-01-03 00:24:33 +01:00
wvengen 6272816358 Localeapp roundtrip 2014-12-31 13:11:39 +01:00
wvengen 0aa098e75b localeapp roundtrip 2014-12-15 21:11:41 +01:00
wvengen 5c78bdde7e Cleanup old task-related i18n 2014-11-23 01:42:15 +01:00
wvengen e9dcaadb06 localeapp roundtrip 2014-10-14 18:39:05 +02:00
wvengen 9a7b3378c3 Make invalid login message depend on use_nick (closes foodcoops#321) 2014-10-09 09:42:13 +02:00
wvengen 418a8b5806 fix i18n issues + localeapp roundtrip
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
wvengen 94e100b78b localeapp roundtrip 2014-06-23 17:51:20 +02:00
wvengen 873e8d44a2 harmonize foodsoft capitalisation 2014-06-23 17:51:20 +02:00
wvengen 6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen e7a476e6b6 remove unused season import fields 2014-06-23 17:51:19 +02:00
wvengen c54e15dc04 localeapp roundtrip 2014-06-23 17:51:18 +02:00
wvengen a7ebf78fd4 hide insignificant zeroes for percentage 2014-05-17 14:20:48 +02:00
wvengen cf0558b1ff localeapp roundtrip 2014-05-13 17:01:27 +02:00
wvengen 9743a9f112 localeapp roundtrip 2014-05-13 17:01:25 +02:00
wvengen fe0b17cdb0 cleanup email footer 2014-05-13 17:01:25 +02:00
wvengen 9214fff5a1 localeapp roundtrip (mostly formatting changes) 2014-03-15 17:17:25 +01:00
wvengen 346bf00b67 localeapp roundtrip (includes updated German translation) 2014-02-19 11:42:25 +01:00
wvengen 286c96196c localeapp roundtrip 2014-02-15 12:37:01 +01:00
wvengen f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +01:00
wvengen 3b2d4dfd08 localeapp roundtrip 2014-01-20 12:59:57 +01:00
wvengen 6c0de3dc74 Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
Conflicts:
	config/locales/de.yml
	config/locales/en.yml
2014-01-20 12:12:00 +01:00
wvengen bab28d2770 i18n update 2014-01-13 23:23:37 +01:00
wvengen 45e529b008 revert i18n attributes pluralisation
until plataformatec/simple_form#974 has a solution
(reverts parts of ce17bf33e0 and 9db8cb72df)
2014-01-11 16:30:17 +01:00
wvengen cb3e2f7ca0 Merge branch 'master' into feature-receive
Conflicts:
	config/locales/de.yml
2014-01-11 15:56:33 +01:00
Julius 9db8cb72df Synchronize German and English locales 2014-01-10 20:50:58 +01:00
wvengen 063ec61753 localeapp roundtrip 2014-01-10 00:00:57 +01:00
wvengen b30b424540 Merge branch 'master' into feature-receive
Conflicts:
	app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
Julius 563993fffa Complete I18n of current receive screen 2014-01-08 00:06:50 +01:00
Julius d7c771d10a Continue I18n of receive screen 2014-01-06 23:48:39 +01:00
Julius f83f6971e8 Rename update_current_price to update_global_price to avoid confusion 2014-01-04 21:35:19 +01:00
Robert Waltemath 2f02f89089 Allow login through link in message (and remember requested page). 2014-01-03 15:27:15 +01:00
Julius 01264bc0ac Clean up OrderArticle#new form and related stuff 2014-01-02 19:14:46 +01:00
Julius baa5f16cfc Free order_article resource from finance namespace; also unlock for role_orders 2014-01-02 19:14:41 +01:00
Julius 3336065218 Add missing translations for ArticlePrice attributes 2013-12-30 12:38:26 +01:00
Julius f3c3b7af34 Fix StockArticle#derive title i18n 2013-12-28 20:07:28 +01:00
Julius 3bf1392251 Show clearer error message on WikiCloth exception 2013-12-22 23:34:54 +01:00
Julius 42e983f7ee Move html markup of WikiCloth exception from locales to controller 2013-12-22 18:09:40 +01:00
Julius 496a250495 Rescue on WikiCloth exception 2013-12-22 12:17:02 +01:00
wvengen a02ca1b9c0 localeapp roundtrip [ci skip] 2013-12-17 18:54:05 +01:00
wvengen 94b2c8eac3 Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
Conflicts:
	app/views/deliveries/_stock_article_form.html.haml
	config/locales/de.yml
	config/locales/en.yml
2013-12-17 15:58:47 +01:00
wvengen 5af82eb55c Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch
Publish/subscribe pattern for DOM updates after AJAX database manipulation
2013-12-17 06:28:25 -08:00
wvengen a91c97526e complete German translations (thanks @fsmanuel) [ci skip] 2013-12-16 10:55:45 +01:00