4 Commits

Author	SHA1	Message	Date
Nathan Gray	ab54bf675f	Remove unneeded calendar stuff, add contact expansion	2011-01-31 17:26:22 +00:00
Christian Binder	f174acb6d7	Projectmanager merge class now resolves its own project fields. Infologs can be assigned to eRoles now to resolve infolog fields in document merge. New ability to declare eRoles as -multi- in GUI. This will give us the ability to create a whole list of contents in a document with just one eRole given (not yet implemented).	2011-01-29 11:55:42 +00:00
Christian Binder	02966ff811	applied signature change of get_replacements method also to new infolog_merge	2011-01-27 17:39:32 +00:00
Nathan Gray	116523ccfd	Add merge functionallity to infolog	2011-01-26 20:16:18 +00:00