56 Commits

Author	SHA1	Message	Date
Nathan Gray	077122e03f	Fix user filter for merge	2011-02-16 17:23:52 +00:00
Nathan Gray	4c4f2e5e32	Apply current filters to range selections when merging	2011-02-16 17:19:19 +00:00
Nathan Gray	8b1440560e	- Add merge print directory to sidebox so it's available from all views ... - Add day_n, yesterday, today & tomorrow tables	2011-02-15 20:35:46 +00:00
Nathan Gray	974ef4b74a	- Add calendar_ prefix to merge fields ... - Fix bug in weekly table preventing more than one week	2011-02-10 19:17:26 +00:00
Christian Binder	96ab59b2fd	Enable calendar items for projectmanager eRoles	2011-02-09 20:55:20 +00:00
Nathan Gray	7ca1ba08d5	Implement merge for calendar	2011-02-09 15:58:06 +00:00