Commit Graph

12 Commits

Author SHA1 Message Date
Nathan Gray
aab8157907 Translation for placeholder labels 2011-07-05 21:44:21 +00:00
Nathan Gray
dd9d78d29a Make sure line breaks (emails) get preserved when merging 2011-04-18 18:54:11 +00:00
Nathan Gray
9f8aa313df Add pm_id & project to list of placeholders 2011-04-14 14:44:56 +00:00
Nathan Gray
f192583f58 - Move around field types into egw_record class
- Add Infolog ID field to importexport
- Fix import condition matching
2011-04-07 15:28:45 +00:00
Nathan Gray
3296d09385 Change display of placeholder tags from 2432...2432 to {{...}} 2011-02-18 17:03:20 +00:00
Christian Binder
96ab59b2fd Enable calendar items for projectmanager eRoles 2011-02-09 20:55:20 +00:00
Christian Binder
320297bae1 reverted rev 33740 because this breaks contact expansion for infologs - sorry - jaytraxxs mistake - a final solution will follow ASAP 2011-02-07 17:19:44 +00:00
Christian Binder
509306fcf8 exclude field "info_link" for merge which contains an array and cannot be handled this way by bo_merge 2011-02-07 10:44:08 +00:00
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