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

258 Commits

Author SHA1 Message Date
wvengen 1860e1c4cc also internationalize sessions controller 2013-02-04 02:00:27 +01:00
Julius a511da9ae3 Prevent stock_articles from appearing in supplier article index 2013-01-30 21:21:49 +01:00
Julius 396a47b6af Improve stock_article_selections 2013-01-28 20:46:35 +01:00
Benjamin Meichsner 8b2b70f8bf Fixed saving user for new orders. 2013-01-26 16:24:45 +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 349cadd5e9 Renabled mail delivering in invites and login contrller. 2012-12-30 16:11:35 +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 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +01:00
benni 807d476e44 Fixed missing scoping by ordergroup in financial index. 2012-12-22 14:23:58 +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 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 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 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 c17ff281c3 Save and display creator of Order 2012-11-12 14:24:49 +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 fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni f30e57dd49 Fixed articles views. 2012-10-19 01:12:47 +02:00
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +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 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 ff4ab44bcc Add option to restrict ordering when not enough apples. 2012-09-29 17:52:25 +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 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 ef2ce98e46 Performance improvement for stockit view. 2012-07-31 17:37:32 +02:00
benni af3c07f031 Simplifiying balancing view part 2. Lets call it finished. 2012-07-27 18:03:46 +02:00
davidrabel 2c1385c9ce Preisänderungen beim Abrechnen können auch global angewandt werden. 2012-07-18 22:16:08 +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 5b2df07378 Fixed ordering before filter. 2011-06-10 13:58:50 +02:00
benni 9ad93e9c06 Catch exceptions when deleting ordegroups. 2011-06-10 13:33:10 +02:00
benni 172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +02:00
benni 6ddef7267a Refactored items_per_page. Start on admin/workgroups. 2011-06-10 12:18:55 +02:00
benni c173cf4a6a my_profile and admin/ordergroups. 2011-06-10 01:36:04 +02:00
benni a787b3cf24 Admin/users refactored. 2011-06-09 22:03:27 +02:00
benni ea6348bc5c Refactored finance/ordergroups|transactions module. 2011-06-09 21:35:05 +02:00
benni fc1d130113 Refactored stockit, delivery an stock_takings. 2011-05-27 14:09:01 +02:00
benni 3f133bb8c3 Added client side validations. Fixed shared sync. 2011-05-19 22:35:13 +02:00
benni 013637a4fc Refactored shared article import. Added meta search gem. 2011-05-19 22:22:05 +02:00
benni 1e33411516 refactored some js stuff. Fixed forms in article modul. 2011-05-19 19:49:37 +02:00
benni 9388e918a7 Implemented fancy box for ajax forms. Refactored articles modul. 2011-05-18 17:37:10 +02:00
benni 0decbb36e1 Refactored article_categories. 2011-05-18 16:10:30 +02:00
benni 0b1682af7c Fixed suppliers module. 2011-05-18 15:52:06 +02:00
benni 772cf87c92 Fixed wiki module. 2011-05-18 15:29:38 +02:00
benni d5552059ce Refactored messages modul, but refactoring is still neccessary. 2011-05-18 14:47:17 +02:00
benni 6ac04d5e19 Fixed foodcoop/ordergroups view. 2011-05-18 11:47:00 +02:00
benni 2ee30fee16 Refactored home/ordergroup. 2011-05-16 11:00:52 +02:00
benni 1cf63fc40b Some fixes to home view. 2011-05-16 10:34:14 +02:00
benni 06f2cc2007 Fixed and refactored foodcoop/workgroups. 2011-05-16 00:34:43 +02:00
benni c87ead8da9 Added meta where and jquery observe field. Fixed members view. 2011-05-15 23:43:23 +02:00
benni 6c98c7c755 Some fixes for task module. 2011-05-15 22:06:54 +02:00
benni 5d028ccf3a Added new autocomplete for task assignments. 
Introduced the cool jquery token plugin.
 2011-05-14 19:41:46 +02:00
benni 2e56bfe895 Some fixes for tasks. 2011-05-14 19:02:52 +02:00
benni 2a72263bd3 Replaced protoype with jquery. Some fixes in mailer class. 2011-05-11 15:14:39 +02:00
benni e40f865c45 Refactored login module. Implemented standard sessions controller. 2011-05-11 13:38:46 +02:00
benni 2d7d0d3b94 Updated actionmailer classes and API. 2011-05-11 10:54:02 +02:00
Benjamin Meichsner be321798a7 Fixed some links in tasks module. 2010-06-10 23:25:13 +02:00
Benjamin Meichsner b71e809f34 Fixed ajax bug on categories page. 2010-05-28 12:01:19 +02:00
Benjamin Meichsner a8a243b5fa Avoid exception on blank comments. 2010-05-28 11:55:12 +02:00
Benjamin Meichsner 571548dfbc Fixed routing bug on (ex) admin controller. 2010-03-22 01:58:37 +01:00
Benjamin Meichsner 9a54d8504c Secured users session, considering foodcoop token. 2010-03-22 01:38:23 +01:00
Benjamin Meichsner 18e8a11b7d Removed unnecessary config params. Improved error handling. 2010-03-22 01:25:24 +01:00
Benjamin Meichsner 2c1952d625 Removed hardcoded links from main tabnav. 
* Reorganized routes and foodsoft config
* Avoid saving of wrong foodcoop tokens when following hard coded link
 2010-03-20 13:45:58 +01:00
Benjamin Meichsner e7af7e82b5 Implemented routing filter for foodcoop select. 
* Allows now a multi coop installation for one domain!
* SSL, we are coming...
* TODO: Remove all the hardcoded urls, check email-links etc.
 2010-03-20 02:26:30 +01:00
Benjamin Meichsner 55d2976e98 Moved order stats and cleanup stuff into rake task. 
Closes #14
 2010-02-09 21:45:57 +01:00
Benjamin Meichsner 036bc10282 Hide/show unavailable articles via js. 2009-10-17 20:33:36 +02:00
Benjamin Meichsner d0e04a05ec Removed unecessary weekly task templates. 2009-10-16 20:45:20 +02:00