Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Commit graph

  • d4b9370541 Fixed setting all user setting to false in user profile. Benjamin Meichsner 2013-04-08 15:08:57 +0200
  • 79d1c5a66d Allow article price equal to zero. Closes #111 Benjamin Meichsner 2013-04-08 14:40:02 +0200
  • 5b81c53a73 Fixed setting all user setting to false in user profile. Benjamin Meichsner 2013-04-08 15:08:57 +0200
  • 77d4caea68 Added quiet_assets gem to have cleaner log file in developing. Benjamin Meichsner 2013-04-08 15:08:18 +0200
  • 20e439c2a7 Allow article price equal to zero. Closes #111 Benjamin Meichsner 2013-04-08 14:40:02 +0200
  • 4966aae0ad Fixed modal forms. Submit form when hitting enter. Benjamin Meichsner 2013-04-08 14:27:23 +0200
  • 9c21a14c7e Update group results when editing order article in balancing. Benjamin Meichsner 2013-04-08 14:26:40 +0200
  • 220343128c Fixed wrong articles total in group_order#show. Benjamin Meichsner 2013-04-08 13:39:02 +0200
  • 03ea8e194e Fixed loosing assignments when updating a task. Benjamin Meichsner 2013-04-08 01:30:31 +0200
  • 13e921a632 Fixed some errors in articles#sync. Show better error messages. Benjamin Meichsner 2013-04-08 01:00:49 +0200
  • f1d6df9ecc move commonly used verbs to common i18n identifier wvengen 2013-04-04 02:49:52 +0200
  • 4aa40b387a finish article_categories controllers i18n + translation wvengen 2013-04-04 02:10:52 +0200
  • 8c8778459e finish documents i18n wvengen 2013-04-04 02:04:31 +0200
  • 24d04b25db fix some small i18n errors wvengen 2013-04-04 00:56:45 +0200
  • ec1ef0289b finish i18n of article_categories + translation wvengen 2013-04-04 00:42:46 +0200
  • 0bb080526a Merge remote-tracking branch 'bennibu/rails3' into rails3 wvengen 2013-04-04 00:29:50 +0200
  • e1f5969719 use short form plus title for unit quantity wvengen 2013-04-04 00:24:14 +0200
  • f55a0955d3 add articles, workgroups translation plus other translation updates wvengen 2013-04-04 00:11:11 +0200
  • 53518039f1 Fixed error message, when using GET for password reset actions. Benjamin Meichsner 2013-03-27 22:18:58 +0100
  • 915e1b9e79 Fixed bug in reset password error handling. Benjamin Meichsner 2013-03-27 22:12:46 +0100
  • 18f6cadca2 Ensure mail privacy in message reply and show view. Benjamin Meichsner 2013-03-24 01:36:50 +0100
  • da72d3a61c Only show undeleted articles in delivery/stock_taking forms. Benjamin Meichsner 2013-03-23 18:25:54 +0100
  • 80b203a8da Fixed missing templates in accept invitation action. Benjamin Meichsner 2013-03-23 17:51:33 +0100
  • f81e315d6f finish i18n of models without view wvengen 2013-03-22 01:21:44 +0100
  • 75a1051668 finish articles i18n, controller+model wvengen 2013-03-22 00:50:30 +0100
  • aabeb1a332 finish articles i18n wvengen 2013-03-22 00:20:30 +0100
  • 7af796c09c Merge remote-tracking branch 'bennibu/rails3' into rails3 wvengen 2013-03-21 22:08:09 +0100
  • 22550029b3 Added missing ajax support for messages index. Fixed #101 Benjamin Meichsner 2013-03-20 23:31:13 +0100
  • 957dbc7202 Updated to rails 3.2.13 Benjamin Meichsner 2013-03-19 13:18:48 +0100
  • e275403cdd Do not destroy articles in supplier sync. Mark them as deleted. Benjamin Meichsner 2013-03-18 19:05:11 +0100
  • 528295884e Allow deleting of category, when there are only deleted articles left. Benjamin Meichsner 2013-03-17 20:11:57 +0100
  • 931bb1d7ca Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 Benjamin Meichsner 2013-03-17 20:03:18 +0100
  • 6745b79bb9 Allow importing articles again, when article was deleted before. Benjamin Meichsner 2013-03-17 20:02:14 +0100
  • 28343fc124 Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2 bennibu 2013-03-17 11:50:56 -0700
  • 033d3459a0 Merge pull request #98 from balkansalat/rails3-stock-taking-article-name bennibu 2013-03-17 11:41:32 -0700
  • bd0c251313 Merge pull request #97 from balkansalat/rails3-stockit-increase bennibu 2013-03-17 11:34:16 -0700
  • 59de2e42a9 Fixed showing deleted articles when asking for available articles. Benjamin Meichsner 2013-03-17 18:36:17 +0100
  • dd0bd0ad7e Fixed updating order article in stockit balancing. Benjamin Meichsner 2013-03-17 18:33:04 +0100
  • f7e885de7e Fixed bug in fax template when there are missing supplier infos. Benjamin Meichsner 2013-03-17 18:10:48 +0100
  • 3a9ec5a3dd Fixed wiki site-map, when there is no homepage. Benjamin Meichsner 2013-03-17 17:57:35 +0100
  • 707f989768 Fixed routes in redirect after direct_close of orders. Benjamin Meichsner 2013-03-17 17:50:50 +0100
  • 329c451774 Fixed articles sync view. Benjamin Meichsner 2013-03-17 17:47:37 +0100
  • c05b3e0e19 Balancing: Do not update oder summary automaticly when changing group orders. Benjamin Meichsner 2013-03-17 15:47:50 +0100
  • 9cc98b4662 Added some more eager loading for balancing view. Benjamin Meichsner 2013-03-17 15:12:14 +0100
  • 07581b7ecf Removed acts_as_paranoid. Implemented own version. Benjamin Meichsner 2013-03-16 17:53:24 +0100
  • 981944b869 Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks Robert Waltemath 2013-03-15 17:59:19 +0100
  • 6aa0e0b736 Rename and comment new functions for fixing stock ordering Julius 2013-03-15 08:50:55 +0100
  • 396e220369 Prevent article names from being truncated in StockTaking form Julius 2013-03-14 22:30:22 +0100
  • 3208321319 Fix stockit increase formula for present behavior Julius 2013-03-14 21:55:10 +0100
  • 8d0761a6c8 Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2 Julius 2013-03-14 21:14:42 +0100
  • a096b3618c Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3 Julius 2013-03-14 20:54:59 +0100
  • 8bafb3f4b2 Show supplier name for articles in stockit order. Benjamin Meichsner 2013-03-12 19:08:18 +0100
  • 0d3564492b Fixed bug in sorting articles in balancing view. Benjamin Meichsner 2013-03-12 18:54:51 +0100
  • c4376f35bf Removed article from includes in as it does not work with acts_as_paranoid. Benjamin Meichsner 2013-03-12 12:50:56 +0100
  • 6196bdae41 Added some eager loading for balancing new. Benjamin Meichsner 2013-03-12 12:34:05 +0100
  • 40d9195eac Fixed broken group_orders after editing order. Benjamin Meichsner 2013-03-12 11:26:14 +0100
  • c18fb20115 Ensure to get also deleted entries in belongs_to assoc. Benjamin Meichsner 2013-03-10 19:39:59 +0100
  • b0e12d177e Fixed editing an order and take care of group_orders. Benjamin Meichsner 2013-03-10 19:22:26 +0100
  • 762d529894 Added info link for apple restriction feature. Benjamin Meichsner 2013-03-09 18:14:53 +0100
  • 50873addf8 Fixed deleting of articles. Added missing id. Benjamin Meichsner 2013-03-09 16:46:33 +0100
  • 1cbf663b39 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 Benjamin Meichsner 2013-03-09 16:31:00 +0100
  • 2f109c376d Fixed bug when submitting huge forms. (stock taking etc) Benjamin Meichsner 2013-02-26 10:59:05 +0100
  • 19527f8425 fix some link handling in i18n (using html_safe) wvengen 2013-03-09 00:48:52 +0100
  • cb537bc11c start articles i18n wvengen 2013-03-09 00:40:07 +0100
  • b81f414ae5 finish finance/order_articles i18n + en translation wvengen 2013-03-08 23:35:50 +0100
  • 63d8a3a1a6 Do not exclude ordered articles (with zero quantity) when editing orders. Robert Waltemath 2013-03-07 20:43:02 +0100
  • 93a99c45d8 Revert "Do not subtract articles in open orders when calculating quantity." Robert Waltemath 2013-03-07 20:39:35 +0100
  • 6bf3b241e6 Do not subtract articles in open orders when calculating quantity. Robert Waltemath 2013-03-06 14:19:06 +0100
  • c9b2d01fa5 i18n last merge wvengen 2013-03-06 01:24:57 +0100
  • 2d382df1f1 Merge remote-tracking branch 'bennibu/rails3' into rails3 wvengen 2013-03-06 01:01:12 +0100
  • 2b03a15a9a finish finance invoice i18n and en translation wvengen 2013-02-27 12:31:01 +0100
  • d3d4bf1e2b add en translation of finance wvengen 2013-02-27 12:11:48 +0100
  • d9949681a2 localize invite model wvengen 2013-02-27 11:59:03 +0100
  • 5032fbb63d Merge pull request #30 from bennibu/rails3 JuliusR 2013-02-27 00:06:29 -0800
  • c4ce5dea98 Fixed bug when submitting huge forms. (stock taking etc) Benjamin Meichsner 2013-02-26 10:59:05 +0100
  • c0c2954f92 Merge pull request #92 from balkansalat/rails3-ajaxArticleDelete bennibu 2013-02-26 01:41:42 -0800
  • 7e0a4acf59 No need to track specific ruby version. Benjamin Meichsner 2013-02-26 10:05:37 +0100
  • 467b53c009 Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3-ajaxArticleDelete Julius 2013-02-25 11:14:48 +0100
  • 0e1bd5c75e Improve (AJAX) deletion of StockArticles Julius 2013-02-25 11:12:28 +0100
  • 2d1ae0ad97 Fixed bad syntax (from already dropped meta_where gem). Benjamin Meichsner 2013-02-24 23:54:59 +0100
  • 3fb5c313ee Show usefull error message for uniqueness_of_name with acts_as_paranoid. Benjamin Meichsner 2013-02-24 23:26:16 +0100
  • 0b66fe6d62 add en translation foodcop, navigation wvengen 2013-02-25 10:36:15 +0100
  • ae727576dd en translation update wvengen 2013-02-25 10:35:14 +0100
  • 5dc3fc30ad Revert 099e2b9b06 Julius 2013-02-25 10:29:47 +0100
  • 8f15cfb446 Revert 396a47b6af Julius 2013-02-25 10:13:44 +0100
  • ccf0d010b4 Apply AJAX for deleting a StockArticle Julius 2013-02-25 10:02:21 +0100
  • 6685012a3e Fixed bad syntax (from already dropped meta_where gem). Benjamin Meichsner 2013-02-24 23:54:59 +0100
  • 82178161fa Show usefull error message for uniqueness_of_name with acts_as_paranoid. Benjamin Meichsner 2013-02-24 23:26:16 +0100
  • b308442b3c Also validate article price attributes. Benjamin Meichsner 2013-02-24 19:59:29 +0100
  • 877a55a614 Avoid sending mails twice via concurrent background processes. Benjamin Meichsner 2013-02-24 19:15:54 +0100
  • c8c269e66a update en translation after small additions wvengen 2013-02-22 00:51:58 +0100
  • 569cdce2db finish finance controller i18n wvengen 2013-02-22 00:44:39 +0100
  • 922a6f3a2a finish navigation i18n wvengen 2013-02-22 00:37:17 +0100
  • 8043fd2164 finish foodcoop i18n + controller + model wvengen 2013-02-22 00:19:22 +0100
  • fe632abf2c Fixed missing recipients when Message.send_emails. Benjamin Meichsner 2013-02-17 22:04:08 +0100
  • 7ca561a17a Installed rdoc to avoid messages in rake tasks. Benjamin Meichsner 2013-02-17 22:01:48 +0100
  • 16ba5fa0ca Comment out rake/rdoctask due to rake update. Benjamin Meichsner 2013-02-17 21:29:48 +0100
  • 35dbb58e67 Damn'it. Forget to update environment file after rails update. Benjamin Meichsner 2013-02-17 21:19:03 +0100
  • 6a0bab58f1 Temporairly deactivated ruby spec in Gemfile. Benjamin Meichsner 2013-02-17 21:01:08 +0100
  • ccdf3c0bf1 Updated rails to 2.3.17. Benjamin Meichsner 2013-02-17 21:00:12 +0100