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

75 Commits

Author SHA1 Message Date
wvengen 66ac3be81f Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/home/ordergroup.html.haml
	app/views/login/new_password.html.haml
	app/views/shared/_auto_complete_users.rhtml
	app/views/shared/memberships/_current_members.rhtml
	app/views/shared/memberships/_non_members.rhtml
 2013-11-18 11:42:49 +01:00
wvengen 3588962329 remove unused layout 2013-10-30 20:53:01 +01:00
wvengen fef17604c5 remove unused autocomplete templates 2013-10-30 20:50:56 +01:00
wvengen 5ead67f88c remove unused memberships controller/view 2013-10-30 20:46:59 +01:00
wvengen c37ed74942 Merge branch 'master' into allow-no-nickname 
Conflicts:
	app/views/foodcoop/users/_users.html.haml
 2013-10-29 19:15:52 +01:00
wvengen e13ca74df3 fix new user form 2013-10-29 19:11:33 +01:00
wvengen e968919cce beautify map invocations of users 2013-10-29 18:46:55 +01:00
wvengen 4e61e764df fix haml indentation errors 2013-10-17 16:35:50 +02:00
wvengen f6c2fd9a9d more user display changes 2013-09-22 02:15:35 +02:00
wvengen e4f0a1e3ed start of making nickname optional 2013-09-20 22:40:13 +02:00
wvengen b11706f30a sort ordergroups in order screen and pdfs 2013-09-17 00:25:38 +02:00
wvengen 8ca95f396f make both ordered and received products visible in order screens and pdfs 2013-09-16 23:52:58 +02:00
wvengen 74bfc85562 Merge remote-tracking branch 'fsmanuel/master' into master. 
Updated migration date to today.

Conflicts:
	db/schema.rb
 2013-07-18 18:48:49 +02:00
Julius b303b48853 Merge branch 'master' into improve-delivery-workflow-further 2013-07-13 21:08:50 +02:00
Julius a6228bdcf2 Style bootstrap tooltip; show FC share in article price info 2013-07-08 22:10:36 +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
Robert Waltemath a7fd7a7936 Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
wvengen c48ce138f3 cleanup of profile layout 2013-06-18 12:25:05 +02:00
Manuel Wiedenmann 6569579c02 styles the preferences in user profile 2013-06-14 22:38:07 +02:00
Julius e28f3eda65 Fix StockArticle creation during delivery; small cleanups 2013-06-11 13:10:18 +02:00
Manuel Wiedenmann 60c4c5510a adds a new user settings system + migration + rake task/worker updates 2013-06-06 03:40:15 +02:00
Benjamin Meichsner d4b9370541 Fixed setting all user setting to false in user profile. 2013-04-10 10:52:41 +02:00
wvengen 22b3f3a491 fix bug in javascript i18n 2013-02-09 10:19:48 +01:00
wvengen 28c66642f5 finish shared i18n 2013-02-08 19:16:06 +01:00
benni 552c553b77 Fixed admin, orders, wiki views. Converted all erb to haml. 2012-10-15 21:19:17 +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 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 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 ec2e761e7f Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
benni 5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +02:00
benni fc8418bc8e Some fixes in group forms. 2012-07-31 18:48:41 +02:00
benni ad508b207b Updated to rails 3.0.12. remove old gettext code. 2012-04-15 19:59:39 +02:00
benni eb4705857b Ordering refactored: Made everything RESTful. 2011-06-19 15:30:33 +02:00
benni adbe93f39e Fixed open_orders partial. 2011-06-13 15:26:06 +02:00
benni a27c0c67fc Fixed some typos. 2011-06-10 13:31:01 +02:00
benni 172db1d37e Admin namespace beendet. 2011-06-10 13:22:15 +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 1e33411516 refactored some js stuff. Fixed forms in article modul. 2011-05-19 19:49:37 +02:00
benni 6c98c7c755 Some fixes for task module. 2011-05-15 22:06:54 +02:00
benni 2a72263bd3 Replaced protoype with jquery. Some fixes in mailer class. 2011-05-11 15:14:39 +02:00
benni c2496aa4fd Consider task duration in ordergroup stats. 
* Also added duration to task template in workgroup task_duration.
 2011-05-07 21:54:00 +02:00
Benjamin Meichsner 84610cc9a5 Fixed broken link. Closes #44 2009-10-17 18:53:01 +02:00
Benjamin Meichsner 8a37a0e746 Fixed bug in comments partial on missing users. 2009-09-11 16:10:18 +02:00
Benjamin Meichsner c7e37fc7b2 Added possibility to give feedbacks via ajax form. Closes #2 
* Feedback message will send to error_recipients, configured in app_config.yml
 2009-08-04 15:22:11 +02:00