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

48 Commits

Author SHA1 Message Date
Patrick Gansterer ea2862fdef Run rubocop --fix-layout and remove encoding comments 2021-03-02 09:12:19 +01:00
Patrick Gansterer beaca7d384 Make user in Task model optional to support old database entries 2020-10-10 20:39:40 +02:00
Patrick Gansterer 44a198c7bc Adopt Rails 5 belongs_to_required_by_default 2020-09-05 14:40:11 +02:00
Patrick Gansterer b6f5295267 Add created_by user to Task 2020-04-11 00:04:49 +02:00
Patrick Gansterer 39aff78f11 Remove protected_attributes gem 
We do not enforce the rules, so removing it and switching the existing
annotations to strong_parameters does not make our situation worse.
 2019-10-29 18:09:24 +01:00
Patrick Gansterer abe847c0ee Add and inherit from ApplicationRecord to match Rails 5.0 style 2019-01-15 04:40:05 +01:00
Patrick Gansterer f08715cda3 Fix Task.next_unassigned_tasks_for() for non-periodic tasks 2017-10-29 00:06:05 +02:00
Patrick Gansterer 47e4a9afdf Show only 2 tasks of the same periodic_task_group at dashboard 2017-10-28 20:17:45 +02:00
Patrick Gansterer 36dd19f324 Require due_date for periodic tasks 2016-03-04 17:11:47 +01:00
wvengen f6c008c79c Allow configuration of task periods 2014-11-23 01:34:51 +01:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214) 
Conflicts:
	Gemfile.lock
 2014-02-24 12:46:28 +01:00
Robert Waltemath c27127c745 Added i18n strings. 2013-06-24 11:53:52 +02:00
Robert Waltemath 3d1faa9ed3 Skip save callback when migrating data. 2013-06-24 10:36:14 +02:00
Robert Waltemath d081a2c66b Validate done/weekly combination only on creation of task. 2013-06-24 09:49:06 +02:00
Robert Waltemath 577945e591 Add validation for task.done in combination with periodic task. 2013-06-22 18:56:17 +02:00
Robert Waltemath ef329b5647 Added up and down migration for weekly task data. 2013-06-22 17:35:45 +02:00
Robert Waltemath c52e482743 Exclude tasks from groups when changing attributes. 2013-06-21 20:54:24 +02:00
Robert Waltemath 6b62fc90d8 Now creating periodic task via button 2013-06-21 13:48:48 +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
Benjamin Meichsner 3e9ca336a8 Fixed loosing assignments when updating a task. 2013-04-10 10:55:43 +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
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 0fcd5abb3a Fixed strange RecordReadOnly exception in task done. 2012-12-16 14:13:54 +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
Robert Waltemath 1cdb9e8501 Outlined new concept for multiple periodically recurring tasks (#3). 2012-11-28 10:13:54 +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
benni 1d9815731c Removed fancybox. Fixed profile, my ordergroup and tasks. 2012-11-12 09:18:44 +01:00
benni 971e80b505 Fixed foodsoft rake tasks. 2012-08-27 08:38:43 +02:00
benni 5fb0bc2444 Big feactoring and bug fixing, Mailer, Tasks, GroupOrders 2012-08-24 11:11:40 +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 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 185376d53d Some improved validations for task. 2011-05-14 16:34:10 +02:00
benni 8da229316c Some improved validations for task. 2011-05-13 22:43:23 +02:00
benni eab16e337e Updated router. Temporarly replaced routing filter with rails internal. 2011-05-11 12:27:58 +02:00
benni 46450cebef New annotation, because of db switch to mysql. 
Background: sqlite has some problems with decimal option.
 2011-05-07 21:55:24 +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
benni dcd2a514a6 Added duration to tasks. Annotated all models. 2011-05-07 20:50:39 +02:00
Benjamin Meichsner e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +02:00
Benjamin Meichsner 759217763e Added pagination to task archiv. 2009-03-23 11:23:41 +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 96442477d1 Fixed broken links in tasks-module. Translated some views into german. 2009-02-06 20:51:14 +01:00
Benjamin Meichsner 0a2a79237a Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing. 2009-02-02 16:35:43 +01:00
Benjamin Meichsner 6ce6c2c75a Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace). 2009-01-15 12:14:01 +01:00
Benjamin Meichsner 30f3d199d3 Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet. 2009-01-08 16:33:27 +01:00
Benjamin Meichsner 5b9a7e05df Initial commit of foodsoft 2 2009-01-06 11:49:19 +01:00