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

53 Commits

Author SHA1 Message Date
Robert Waltemath a7fd7a7936 Removed obsolete code of old workgroup-centric weekly task concept. 2013-06-22 18:14:11 +02:00
Robert Waltemath 46b07a6136 Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks 
Conflicts:
	config/locales/de.yml
 2013-06-12 10:00:11 +02:00
Manuel Wiedenmann c42c00b5f1 adds mailcatcher to foodsoft:setup_development 2013-05-29 12:35:16 +02:00
Manuel Wiedenmann 21c7fa40c1 adds a foodsoft:setup_development rake task 2013-05-26 14:02:16 +02:00
wvengen d0c74b394e i18n and translate page number text too 2013-05-20 17:14:42 +02: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
Benjamin Meichsner 1fe141175c Fixed multicoops and resque rake tasks. 2013-01-07 13:44:46 +01:00
benni 9db5a2fa14 Fixed apple calcualtion issue on fresh coop installations. 2012-12-30 15:32:22 +01:00
benni 9e228085df Added rake tasks for restarting resque workers. 2012-12-30 14:47:02 +01:00
benni 9ad77f5256 Add rake task helper for single coop. 2012-12-24 12:50:37 +01:00
benni 2c0fe08be6 Replaced delayed_job with resque. See README_DEVEL 2012-12-23 17:38:04 +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 fc1c173718 Fixed articles module. 2012-10-28 18:03:50 +01:00
benni f20ae890dd Added twitter bootstrap layout. Adapt home page. 2012-10-06 17:14:57 +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 971e80b505 Fixed foodsoft rake tasks. 2012-08-27 08:38:43 +02:00
benni ea547c84f0 Added rake task to execute every rake task for every foodcoop. 2012-08-27 08:24:25 +02:00
benni ec2e761e7f Fixed multi coop routing and changed config accessors. 2012-08-24 19:52:38 +02:00
benni af3875d46b Refactored order finishing. Delay user notifications. 2012-08-24 14:24:36 +02:00
benni 524d9b7c7a Fixed rake task to create weekly tasks. 2012-06-26 23:18:55 +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 7d54a416df Allow changing number of automaticly created next weekly tasks. 2012-06-24 11:01:16 +02:00
benni 1e33411516 refactored some js stuff. Fixed forms in article modul. 2011-05-19 19:49:37 +02:00
benni 03d84aed1d Added simple form for easier form building. 2011-05-14 17:06:32 +02:00
benni eab16e337e Updated router. Temporarly replaced routing filter with rails internal. 2011-05-11 12:27:58 +02:00
benni 2d7d0d3b94 Updated actionmailer classes and API. 2011-05-11 10:54:02 +02:00
benni 4eba5fbc9c First step for upgrading to rails 3. 
Check rake rails:upgrade:check for next steps.
 2011-05-11 01:32:21 +02:00
benni a689bdd5f5 Removed some deprecation warning from routing filter. 2011-05-11 00:58:53 +02:00
benni 1e49a44a92 Added seeds.rb for an easy start. 2011-05-06 20:23:33 +02:00
Benjamin Meichsner 00d9f060cc Merge branch 'routing-filter' 2010-05-25 23:16:49 +02:00
Benjamin Meichsner d6ee00db17 Fixed hard coded links in wiki pages. 2010-03-22 03:11:32 +01:00
Benjamin Meichsner 84699a9052 Avoid task exit when deliver with bad emails addresses. 2010-03-20 23:07:55 +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 e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner 4ba612aa5b Fixed bug in new rake task. 2009-08-14 13:50:05 +02:00
Benjamin Meichsner 332fc831c8 Send warn messages for unassigned tasks 7 days before due date. 2009-08-12 21:47:07 +02:00
Benjamin Meichsner a8c93c08b7 Added parent-child relationship to pages to visualize a breadcrump and subpages. 2009-08-12 18:41:25 +02:00
Benjamin Meichsner 58ce422ef7 Reduced number of generated weekly tasks. 2009-08-11 18:39:21 +02:00
Benjamin Meichsner 49be55238b Added rake task to notify workgroup members if not enough users assigned an upcoming task. 2009-08-11 18:10:14 +02:00
Benjamin Meichsner d8cdbe4abb Added rake task for auto create of upcoming workgroup tasks (weekly tasks). 2009-08-11 17:22:08 +02:00
Benjamin Meichsner 5d9385cde4 Changed wiki parser to wikicloth. 
* Temporarly removing of TOC.
 2009-08-11 14:30:35 +02:00
Benjamin Meichsner ce2156d75f Send order-finish-notifications in background. 2009-03-11 16:58:31 +01:00
Benjamin Meichsner 3ea8d5a2ef Refactoring of message system. 2009-02-18 01:06:35 +01:00
Benjamin Meichsner 67743cd014 Implement notification for upcoming tasks via a daily fired rake-task. 2009-02-10 15:07:47 +01:00
Benjamin Meichsner e16bebd042 Removed acts-as-statemachine. Replaces User.find_ordergroup with ActiveRecord-Association 'has_one :ordergroup'. 2009-02-01 20:56:23 +01:00
Benjamin Meichsner fc45345e0d Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results) 2009-01-20 19:37:15 +01:00