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

781 Commits

Author SHA1 Message Date
Julius 0f4614eb31 Add percent sign for tax in forms 2013-06-06 17:58:02 +02:00
Julius b8a23a396c Remove test variable 2013-06-06 17:09:22 +02:00
Julius 0d3c23f814 Improve performance of data-check-all 2013-06-06 17:06:05 +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 c38ce28347 fix i18n bug 2013-06-06 02:13:40 +02:00
Robert Waltemath 82fb6d1dbe Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-06-06 00:37:50 +02:00
wvengen 043fc6391c show header on fax PDF (closes bennibu#109) 2013-06-04 13:08:50 +02:00
Robert Waltemath c194d2545f Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107. 2013-06-04 11:28:25 +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
Robert Waltemath 2a1176c31a Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112. 2013-05-30 10:54:22 +02:00
wvengen 3b7cbf71e0 fix i18n typos 2013-05-16 00:05:47 +02:00
wvengen 0c94ef5912 also translate mail subjects 2013-05-07 13:28:14 +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
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 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 3e9ca336a8 Fixed loosing assignments when updating a task. 2013-04-10 10:55:43 +02:00
Benjamin Meichsner 93f4239db6 Fixed wrong articles total in group_order#show. 
Conflicts:

	app/views/group_orders/show.html.haml
 2013-04-10 10:54:56 +02:00
Benjamin Meichsner d4b9370541 Fixed setting all user setting to false in user profile. 2013-04-10 10:52:41 +02:00
Benjamin Meichsner 79d1c5a66d Allow article price equal to zero. Closes #111 2013-04-10 10:51:36 +02:00
Benjamin Meichsner 5b81c53a73 Fixed setting all user setting to false in user profile. 2013-04-08 15:08:57 +02:00
Benjamin Meichsner 20e439c2a7 Allow article price equal to zero. Closes #111 2013-04-08 14:40:02 +02:00
Benjamin Meichsner 4966aae0ad Fixed modal forms. Submit form when hitting enter. 2013-04-08 14:27:23 +02:00
Benjamin Meichsner 9c21a14c7e Update group results when editing order article in balancing. 2013-04-08 14:26:40 +02:00
Benjamin Meichsner 220343128c Fixed wrong articles total in group_order#show. 2013-04-08 13:39:02 +02:00
Benjamin Meichsner 03ea8e194e Fixed loosing assignments when updating a task. 2013-04-08 01:31:21 +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
Benjamin Meichsner 53518039f1 Fixed error message, when using GET for password reset actions. 2013-03-27 22:20:54 +01:00
Benjamin Meichsner 915e1b9e79 Fixed bug in reset password error handling. 2013-03-27 22:12:46 +01:00
Benjamin Meichsner 18f6cadca2 Ensure mail privacy in message reply and show view. 
Thanks to @JuliusR for reporting.
 2013-03-24 01:37:58 +01:00
Benjamin Meichsner da72d3a61c Only show undeleted articles in delivery/stock_taking forms. 
Fixed 100.
 2013-03-23 18:25:54 +01:00
Benjamin Meichsner 80b203a8da Fixed missing templates in accept invitation action. 2013-03-23 17:51:33 +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 22550029b3 Added missing ajax support for messages index. Fixed #101 2013-03-20 23:31:13 +01:00
Benjamin Meichsner e275403cdd Do not destroy articles in supplier sync. Mark them as deleted. 2013-03-18 19:05:11 +01:00
Benjamin Meichsner 528295884e Allow deleting of category, when there are only deleted articles left. 2013-03-17 20:13:11 +01:00
Benjamin Meichsner 931bb1d7ca Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 2013-03-17 20:03:18 +01:00
Benjamin Meichsner 6745b79bb9 Allow importing articles again, when article was deleted before. 2013-03-17 20:02:14 +01:00
bennibu 28343fc124 Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2 
Prevent sold-out articles from being removed from stock order when editing
 2013-03-17 11:50:56 -07:00
bennibu 033d3459a0 Merge pull request #98 from balkansalat/rails3-stock-taking-article-name 
Prevent article name from being truncated in StockTaking form
 2013-03-17 11:41:32 -07:00
bennibu bd0c251313 Merge pull request #97 from balkansalat/rails3-stockit-increase 
Fix stockit increase formula in javascript
 2013-03-17 11:34:16 -07:00
Benjamin Meichsner 59de2e42a9 Fixed showing deleted articles when asking for available articles. 2013-03-17 18:36:34 +01:00
Benjamin Meichsner dd0bd0ad7e Fixed updating order article in stockit balancing. 2013-03-17 18:33:04 +01:00
Benjamin Meichsner f7e885de7e Fixed bug in fax template when there are missing supplier infos. 2013-03-17 18:10:48 +01:00
Benjamin Meichsner 3a9ec5a3dd Fixed wiki site-map, when there is no homepage. 2013-03-17 17:57:35 +01:00
Benjamin Meichsner 707f989768 Fixed routes in redirect after direct_close of orders. 2013-03-17 17:50:50 +01:00
Benjamin Meichsner 329c451774 Fixed articles sync view. 2013-03-17 17:47:37 +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 9cc98b4662 Added some more eager loading for balancing view. 2013-03-17 15:12:14 +01:00
Benjamin Meichsner 07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
Robert Waltemath 981944b869 Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks 
Conflicts:
	Gemfile
	db/schema.rb
 2013-03-15 17:59:19 +01:00
Julius 6aa0e0b736 Rename and comment new functions for fixing stock ordering 2013-03-15 08:50:55 +01:00
Julius 396e220369 Prevent article names from being truncated in StockTaking form 2013-03-14 22:30:22 +01:00
Julius 3208321319 Fix stockit increase formula for present behavior 2013-03-14 21:55:10 +01:00
Julius 8d0761a6c8 Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2 2013-03-14 21:14:42 +01:00
Benjamin Meichsner 8bafb3f4b2 Show supplier name for articles in stockit order. 2013-03-12 19:08:18 +01:00
Benjamin Meichsner 0d3564492b Fixed bug in sorting articles in balancing view. 2013-03-12 18:54:51 +01:00
Benjamin Meichsner c4376f35bf Removed article from includes in as it does not work with acts_as_paranoid. 
See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62.
Better we remove acts_as_paranoid and filter manually?
 2013-03-12 12:50:56 +01:00
Benjamin Meichsner 6196bdae41 Added some eager loading for balancing new. 2013-03-12 12:38:08 +01:00
Benjamin Meichsner 40d9195eac Fixed broken group_orders after editing order. 
Caution, when using the model.association = models operator,
the after save callbacks are not triggerd! See Order#save_order_articles
 2013-03-12 11:26:14 +01:00
Benjamin Meichsner c18fb20115 Ensure to get also deleted entries in belongs_to assoc. 2013-03-10 19:39:59 +01:00
Benjamin Meichsner b0e12d177e Fixed editing an order and take care of group_orders. 2013-03-10 19:22:26 +01:00
Benjamin Meichsner 762d529894 Added info link for apple restriction feature. 2013-03-09 18:14:53 +01:00
Benjamin Meichsner 50873addf8 Fixed deleting of articles. Added missing id. 2013-03-09 16:46:33 +01:00
wvengen 19527f8425 fix some link handling in i18n (using html_safe) 2013-03-09 00:48:52 +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
Robert Waltemath 63d8a3a1a6 Do not exclude ordered articles (with zero quantity) when editing orders. 2013-03-07 20:43:02 +01:00
Robert Waltemath 93a99c45d8 Revert "Do not subtract articles in open orders when calculating quantity." 
This reverts commit 6bf3b241e6.
 2013-03-07 20:39:35 +01:00
Robert Waltemath 6bf3b241e6 Do not subtract articles in open orders when calculating quantity. 2013-03-06 14:19:06 +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 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
Julius 0e1bd5c75e Improve (AJAX) deletion of StockArticles 2013-02-25 11:12:28 +01:00
Benjamin Meichsner 2d1ae0ad97 Fixed bad syntax (from already dropped meta_where gem). 
Thanks to wvengen, closed #91

Conflicts:

	app/models/workgroup.rb
 2013-02-25 10:51:01 +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
Julius 5dc3fc30ad Revert 099e2b9b06 2013-02-25 10:29:47 +01:00
Julius 8f15cfb446 Revert 396a47b6af 2013-02-25 10:13:44 +01:00
Julius ccf0d010b4 Apply AJAX for deleting a StockArticle 2013-02-25 10:02:21 +01:00
Benjamin Meichsner 6685012a3e Fixed bad syntax (from already dropped meta_where gem). 
Thanks to wvengen, closed #91
 2013-02-24 23:56:56 +01:00
Benjamin Meichsner 82178161fa Show usefull error message for uniqueness_of_name with acts_as_paranoid. 
Fixed #88
 2013-02-24 23:26:16 +01:00
wvengen 569cdce2db finish finance controller i18n 2013-02-22 00:44:39 +01:00
wvengen 8043fd2164 finish foodcoop i18n + controller + model 2013-02-22 00:19:22 +01:00
wvengen c693f697ff workgroups i18n 2013-02-13 01:34:58 +01:00
wvengen 02f04be6e8 finish stock_takings i18n + controller 2013-02-13 01:20:20 +01:00
wvengen 734179a2bd clarify group_orders i18n 2013-02-12 00:06:23 +01:00
wvengen cb2c724abd fix typo 2013-02-11 23:37:52 +01:00
wvengen 20533a5163 fix orders i18n 2013-02-11 15:34:31 +01:00
wvengen a0a974b9ce finish stockit i18n + controllers + model 2013-02-11 11:19:26 +01:00
Manuel Wiedenmann 0065c44b74 i18n finance ordergroups 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann d2cd5b2b02 i18n group order articles 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann 640e9799aa i18n financial_transactions + controller 2013-02-11 10:21:39 +07:00
Manuel Wiedenmann 8be93c33f8 i18n finance + controller 2013-02-10 15:05:31 +07:00
Manuel Wiedenmann 2d58054d1c added order for interpolation 2013-02-10 15:05:31 +07:00
wvengen 22b3f3a491 fix bug in javascript i18n 2013-02-09 10:19:48 +01:00
wvengen 36b18bcfbd finish messages i18n + controller + model 2013-02-09 10:18:52 +01:00
Manuel Wiedenmann 5941bbbf4f i18n feedback + controller 2013-02-09 13:01:44 +07:00
Manuel Wiedenmann 6a564f0a25 admin controllers 2013-02-09 12:47:21 +07:00
wvengen 8d899581bd finish group_orders i18n + controller 2013-02-09 02:01:31 +01:00
wvengen 28c66642f5 finish shared i18n 2013-02-08 19:16:06 +01:00
wvengen e06524ca37 finish ordergroups and orders i18n + controller 2013-02-08 01:52:20 +01:00
wvengen d818ea5d53 finish suppliers controller I18n 2013-02-08 00:31:09 +01:00
wvengen eb1e02015e finish suppliers i18n 2013-02-08 00:11:58 +01:00
wvengen de730808e7 finish mailer i18n 2013-02-06 00:50:59 +01:00
wvengen b12a906a74 finish login i18n + controller 2013-02-05 12:54:55 +01:00
wvengen c5de69bfc5 typo 2013-02-05 12:30:44 +01:00
wvengen 39812bef99 finish layouts i18n, use help url from config, use html language from locale 2013-02-05 12:11:29 +01:00
wvengen 5b53749fe6 fix small format bug in template 2013-02-04 13:13:04 +01:00
wvengen ecce8041a1 invites controller i18n 2013-02-04 13:01:06 +01:00
wvengen 034f6a8f5c finish invites i18n 2013-02-04 12:59:04 +01:00
wvengen 9138f0da03 also internationalize home controller 2013-02-04 02:12:24 +01:00
wvengen 1860e1c4cc also internationalize sessions controller 2013-02-04 02:00:27 +01:00
wvengen 0c09696b2c finish sessions i18n 2013-02-04 01:46:07 +01:00
wvengen 2b11549d33 finished home i18n 2013-02-04 00:46:22 +01:00
Manuel Wiedenmann 64b3d7e17d finished admin/users i18n + dry the admin i18n 2013-02-04 01:38:18 +07:00
Manuel Wiedenmann 75c9338fd9 finished admin/workgroups i18n 2013-02-04 00:36:03 +07:00
Manuel Wiedenmann e949257912 finished admin/ordergroups i18n 2013-02-04 00:10:11 +07:00
Manuel Wiedenmann 42c97520a1 started with admin views 2013-02-03 23:16:42 +07:00
wvengen e0b781fca6 split locales into directory, and load from there 2013-02-01 17:56:34 +01:00
Julius a511da9ae3 Prevent stock_articles from appearing in supplier article index 2013-01-30 21:21:49 +01:00
Julius 2c9fdcd79e Show customer number in fax pdf 2013-01-30 19:46:18 +01:00
Julius 8c7a4f0331 Fix empty dd in horizontal dl 2013-01-29 17:52:44 +01:00
Julius 396a47b6af Improve stock_article_selections 2013-01-28 20:46:35 +01:00
Julius 524819b86f Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3 
Conflicts:
	app/helpers/application_helper.rb
 2013-01-27 22:01:53 +01:00
Benjamin Meichsner 8b2b70f8bf Fixed saving user for new orders. 2013-01-26 16:24:45 +01:00
Benjamin Meichsner 04b611a080 Temporairly deactivated helper in new delivery form. 2013-01-26 15:57:29 +01:00
Benjamin Meichsner 310a97912c Fixed disabling submit_button in group order form. 2013-01-26 15:41:46 +01:00
Benjamin Meichsner 3ab3ff2bc4 Minor speed improvements for group order load. 2013-01-26 15:18:35 +01:00
Benjamin Meichsner 2a66d37c3a Fixed wrong start balance in new group order. 2013-01-26 15:17:56 +01:00
Julius ce0300df43 Fix order.created_by 2013-01-12 16:24:13 +01:00
Julius 099e2b9b06 Add stock_article_selection (deleting multiple stock articles at once) 2013-01-12 16:14:06 +01:00
benni 0364562273 Fixed return_to when authorization gets lost. 2012-12-30 16:34:01 +01:00
benni f6ff422405 Fixed missing line breaks in haml email templates. 2012-12-30 16:24:36 +01:00
benni 349cadd5e9 Renabled mail delivering in invites and login contrller. 2012-12-30 16:11:35 +01:00
benni 28aec7e4d6 Replace ordergroup.account_updated with non database attr. 2012-12-30 15:31:37 +01:00
benni a489079334 Fixed wrong request method in deny_access. 2012-12-30 15:13:50 +01:00
benni ba75a6e328 Fixed accidently switching to english locale in production. 2012-12-29 17:48:14 +01:00
benni cd583cc9b2 Set host infos for urls in emails via app_config. 2012-12-28 13:55:18 +01:00
benni db07b28b1c Fixed bug in accessing foodsoft config. 2012-12-28 13:28:03 +01:00
benni 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni b9138efa79 Fixed floating error in group_order new. 2012-12-22 14:42:19 +01:00
benni d954279d6a Show accept/reject button in task show view. 2012-12-22 14:29:59 +01:00
benni 807d476e44 Fixed missing scoping by ordergroup in financial index. 2012-12-22 14:23:58 +01:00
benni 1298af8377 Small improvement for update price. Removed delayed job. 
Attention, every delayed job has to know its Foodcoop scope. Otherwise
every task will be executed in the default database. See email delivery.
 2012-12-16 21:46:24 +01:00
benni 0dff5ea784 Fixed some bugs in tasks, apple feature: 
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
 2012-12-16 19:07:45 +01:00
benni 9919183cb0 Fixed missing group_order_article in group_order show. 
Also add eager loading for associated objects.
 2012-12-16 16:50:09 +01:00
benni 0fcd5abb3a Fixed strange RecordReadOnly exception in task done. 2012-12-16 14:13:54 +01:00
benni cabcd201a6 Improvements for Ordergroup.avg_jobs_per_euro. 
Tip #2, Avoid initializing hole activerecord object whenever possible.
Use Class.pluck(:attribute) instead of Class.all.map(&:attribute)!
 2012-12-16 13:56:47 +01:00
benni b86172bc62 Performance improvements for ordergroup.update_stats! 
As I have learned today. Let mysql do the counting, calculation stuff.
In most of the cases, it will be much faster!
 2012-12-16 13:48:15 +01:00
benni 0edd29dfd4 Merge branch 'master' into master-to-rails3 
Conflicts:
	Gemfile
	README_DEVEL
	app/controllers/articles_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/tasks_controller.rb
	app/models/task.rb
	app/views/articles/_import_search_results.haml
	app/views/articles/index.haml
	app/views/messages/new.haml
	app/views/ordering/_order_head.haml
	app/views/ordering/my_order_result.haml
	app/views/orders/show.haml
	app/views/stockit/new.html.haml
	db/schema.rb
 2012-12-14 18:10:46 +01:00
benni d9681eaf30 Added validation for article_price. Avoid unit_quantity of 0. 2012-12-11 10:59:50 +01:00
benni bae09624b7 Avoid deleting categories which still have articles. 2012-12-11 10:53:01 +01:00
benni 620ec946f1 Merge branch 'master' into master-rails3-merging 
Conflicts:
	.gitignore
	.rbenv-version
	app/controllers/finance/balancing_controller.rb
	app/views/finance/balancing/_order_article_form.html.haml

Fixed updating current price in finance balancing.
 2012-12-11 10:32:59 +01:00
Robert Waltemath 1cdb9e8501 Outlined new concept for multiple periodically recurring tasks (#3). 2012-11-28 10:13:54 +01:00
benni ddcb4a9b2d Moved acts_as_configurable to gemfile. 2012-11-24 16:49:19 +01:00
benni 7e6ac8c924 Moved acts_as_tree to gemfile. 2012-11-24 16:41:34 +01:00
benni 7fc0462fc4 Upgrade to rails 3.2.9. Moved acts_as_versioned to gem. 2012-11-24 16:36:40 +01:00
benni 7c9d666909 Merge branch 'rails3' of github.com:bennibu/foodsoft into rails3 
Conflicts:
	Gemfile
 2012-11-24 15:27:48 +01:00
benni ecc31641aa Changed header to copy old foodsoft style. 2012-11-24 15:23:12 +01:00
benni e1cb866935 Remove html5 support for IE Browsers. 2012-11-24 13:53:19 +01:00
Robert Waltemath 1822b330d1 Merge remote-tracking branch 'upstream/rails3' into twitter-bootstrap 
Conflicts:
	Gemfile
 2012-11-15 09:53:36 +01:00
Robert Waltemath 2bd52b9270 Corrected config hash index to ':mailing_list_subscribe' 2012-11-13 10:18:40 +01:00
Robert Waltemath c032fdca6e Merge remote-tracking branch 'upstream/master' 2012-11-13 08:55:50 +01:00
Julius d086fe7cc7 Fix task validation again #16; mark assignment validation TODO 2012-11-12 21:31:04 +01:00
Julius e561ddb064 Fix task validation #16 2012-11-12 20:14:06 +01:00
Julius 95efe554fc Add another option for mailing list subscription tip 2012-11-12 18:08:47 +01:00
Julius c17ff281c3 Save and display creator of Order 2012-11-12 14:24:49 +01:00
benni f4f10b1e4c Introduced actionbar. Some fixes for balancing page. 2012-11-12 13:13:01 +01:00
benni 1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni dce79802e0 Fixed feedback. 2012-11-10 17:05:43 +01:00
benni 181695d1bd Small fixes for article_categories. 2012-11-10 16:51:30 +01:00
benni 0236fb5a60 Fixed finance module to work with bootstrap design. 2012-11-10 16:44:05 +01:00
benni 16de9124fe Fixes orders. 2012-10-30 00:20:47 +01:00
benni 8f7e21b918 Fixed stockit. 2012-10-29 18:28:17 +01:00
benni 27c719d8da Fixed article categories. 2012-10-29 17:35:50 +01:00
benni fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni ee3da51ad3 Fixed bug in new stockit article form. 2012-10-24 12:19:53 +02:00
benni f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
benni fd361090b4 Nice breadcrumb 2012-10-18 23:43:31 +02:00
benni 9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +02:00
Robert Waltemath f0bf196934 order group recepient list ascending 2012-10-15 17:33:33 +02:00
benni e9383e0d17 Remove searching shared articles by list. 
This is necessary to go with newest fixes in sharedlists app.
 2012-10-13 22:19:01 +02:00
benni 699fb9b233 Fixed wiki pages. 2012-10-09 02:31:10 +02:00
benni acdb331e36 Improved tasks. 2012-10-08 21:52:03 +02:00
benni 52e62f8ddb Fixed messages. New styling for token input plugin. 2012-10-08 18:19:15 +02:00
benni c0c41a7752 Fixed foodcoop/ordergroups and workgroups views. 2012-10-08 16:20:24 +02:00
benni ab81ef09d5 Replace will_paginate with kaminari. Fixed foodcoop/users page. 2012-10-08 15:24:32 +02:00
benni 1708df3f6c Fixed login, new_password and invitation views. 2012-10-08 11:51:56 +02:00
benni f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +02:00
benni 31735f35ab Reenabled sidebar.. 2012-10-03 20:27:40 +02:00
benni 92649d3053 Removed acts_as_ordered. Fixed bug in group_orders archive. 2012-10-03 20:08:54 +02:00
benni eb532babd6 Refactored pdf generation with newest prawn. 2012-10-02 02:50:48 +02:00
benni 29a6cd8b62 Upgraded to rails 3.1.8. Fixed various bugs in wiki. 2012-09-30 21:15:55 +02:00
benni cd91436f7f Allow ignoring apple restriction for specific ordergroup. 2012-09-30 13:34:16 +02:00
benni ff4ab44bcc Add option to restrict ordering when not enough apples. 2012-09-29 17:52:25 +02:00
benni 971e80b505 Fixed foodsoft rake tasks. 2012-08-27 08:38:43 +02:00
benni ec2e761e7f Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
benni 2860a3ca44 Fixed authentication when User is deleted during session. 2012-08-24 15:20:58 +02:00
benni 8f8d866bb9 Moved notification about negative account balance to background. 2012-08-24 15:04:54 +02:00
benni edadb7d8d1 Moved message delivering into background process. 2012-08-24 14:33:45 +02:00
benni af3875d46b Refactored order finishing. Delay user notifications. 2012-08-24 14:24:36 +02:00
benni 5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni c936813967 Some fixes for mailer module. 2012-08-17 19:08:02 +02:00
benni 6f7682d6a0 Fixed new user invite. 2012-08-06 12:00:40 +02:00
benni fc8418bc8e Some fixes in group forms. 2012-07-31 18:48:41 +02:00
benni f759552022 Fixed user settings. 2012-07-31 18:21:42 +02:00
benni ef2ce98e46 Performance improvement for stockit view. 2012-07-31 17:37:32 +02:00
benni 8a74e7d77f Removed annoate and hirb Gemfiles. 
Annotate: Better look in schema.rb, this reference should be always up
to date.

Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
 2012-07-27 18:07:42 +02:00
benni af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
benni dc0d1b3e46 Fixed bug in apples stats. 2012-07-22 21:12:53 +02:00
davidrabel cda3c37e20 Umlaute eingefügt 2012-07-19 15:37:17 +02:00
davidrabel 2c1385c9ce Preisänderungen beim Abrechnen können auch global angewandt werden. 2012-07-18 22:16:08 +02:00
benni 182742fbec Merge branch 'master' into rails3 
Conflicts:
	.gitignore
	app/models/task.rb
	app/models/workgroup.rb
	app/views/shared/_group_form.html.haml
	config/locales/de.yml
	db/schema.rb
 2012-06-26 11:51:56 +02:00
benni f1b71a5588 Minor refactoring in stats partial. 2012-06-24 21:43:36 +02:00
benni 7d54a416df Allow changing number of automaticly created next weekly tasks. 2012-06-24 11:01:16 +02:00
benni 467874a8a5 Simplify balancing view. Part 1 of ... 2012-06-21 17:19:00 +02:00
benni 6bd4bbec86 Deactivated broken links in balancing. 2012-05-12 11:18:46 +02:00
benni c49edb79a2 Fixed edit_not in balancing. 2012-05-12 10:55:20 +02:00
benni b295f62322 Updated finance/invoices 2012-04-20 18:33:47 +02:00
benni 4a8e286d98 Fixed encoding issues with ruby > 1.9.2.. 2012-04-16 08:49:54 +02:00
benni ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni b3c64ecb85 Fixed order views. 2011-06-20 00:26:17 +02:00
benni 88b268cb0b Refactoring of order comments. 2011-06-19 20:47:27 +02:00
benni 38b5dcba1f Refactored ordering part two. Integrated stock order. 2011-06-19 19:56:04 +02:00
benni eb4705857b Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
benni 45e0048490 Minor refactoring for ordering js data. 2011-06-13 16:45:37 +02:00
benni f3773314a7 Fixed ordering view. 2011-06-13 16:23:56 +02:00