extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 15:18:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
36,356 Commits 33 Branches 357 Tags 204 MiB
3f3748dc87
Commit Graph

47 Commits

Author SHA1 Message Date
nathangray
74a7d6ee8b Use Merge number formatting instead of export formatting. It takes export file type into consideration. 2021-04-21 13:29:09 -06:00
nathangray
151889b39c Api: Move list of common merge placeholders into parent class to reduce duplication, add link/<format> options 2020-10-06 10:56:08 -06:00
nathangray
d5cf6a600f * Infolog, Timesheet - Fix link title placeholders not working 2018-10-04 11:17:30 -06:00
nathangray
df577514dd * Infolog - Fix merging empty custom date fields filled them with current date 2018-02-01 10:44:17 -07:00
Ralf Becker
8989cf195b fix PHP Warning: Illegal string offset 'app' 2018-01-24 09:30:01 +01:00
nathangray
867c661796 Fix missing fields in merge if info_contact is not a addressbook entry 2017-11-15 15:41:12 -07:00
nathangray
7af5c268a9 * Infolog - make project fields available for merge 
Just the project fields, no elements or tables
 2017-06-19 14:32:41 -06:00
Hadi Nategh
508d0aa920 Try to match placeholder NENVLF with its described example 2017-02-10 10:41:43 +01:00
nathangray
108498e0cd Fix variable not defined before using it 
(thanks, Scrutenizer)
 2017-02-01 09:35:24 -07:00
nathangray
5be77f5ef2 Support customfields at the beginning of content 2016-05-18 15:41:20 -06:00
Ralf Becker
8a24f3e449 fix not loaded header / CSS, caused by missing echo before $GLOBALS['egw']->framework->(header|footer) 2016-05-14 21:26:36 +02:00
Ralf Becker
f94aa623db using new api for InfoLog 2016-04-30 17:05:23 +00:00
Nathan Gray
cfbec7adec Remove extra line break processing, now handled by parent class 2016-03-21 19:24:46 +00:00
Nathan Gray
8c7945d41c Add custom date fields to list to formatted for spreadsheets 2016-02-16 23:42:25 +00:00
Ralf Becker
c633e0033b * all aps: lower memory requirements of insert into document by skipping HTML processing, if there are no html (custom-)fields 2014-11-19 12:20:59 +00:00
Nathan Gray
c158a32c72 Fix timesheet sum 2014-10-15 23:02:42 +00:00
Nathan Gray
ee5a8c5fcc Move timesheet sum placeholder 2014-09-09 21:28:57 +00:00
Nathan Gray
9cdaebe1b6 Add timesheet time (info_sum_timesheets) placeholder 2014-09-09 21:26:45 +00:00
Nathan Gray
228d3e9614 Add placeholders for parent 2014-06-18 15:50:23 +00:00
Nathan Gray
654054826f Implement home-accounts and select-account custom fields sub-placeholder expansions in the correct place, with the rest of them 2013-06-05 17:03:27 +00:00
Nathan Gray
e8770a9611 Fix loading of account contact info placeholders 2013-06-05 14:44:10 +00:00
Nathan Gray
b50dc80ee1 Add in contact placeholders for custom fields of type select-account 2013-06-04 21:24:17 +00:00
Nathan Gray
81fbfc23cc Add general placeholder {{link}} is a link to current record 2013-03-19 20:56:58 +00:00
Nathan Gray
6d685e010a Add links/href & links/link to general placeholder list 2013-03-04 17:43:46 +00:00
Nathan Gray
ef826ee2b9 Change all merges to use common get_all_links() function 2013-02-07 09:36:07 +00:00
Christian Binder
2fbf1d36e8 document merge helper function to allow download by HTTP POST request 2012-09-29 10:16:39 +00:00
Nathan Gray
b0ea2a5e63 Fix missing select lookups 2012-04-25 17:47:49 +00:00
Nathan Gray
57602e41ca Expand link_to custom fields and make available all placeholders from the app. 
eg: {{#address}} gives the link title, but now you can use {{#address/n_fn}}, {{#address/email}}, etc.
 2012-04-02 21:25:42 +00:00
Nathan Gray
4f669300a4 When merging into a spreadsheet document, convert dates into SS dates 2012-02-13 18:59:00 +00:00
Nathan Gray
2a2880dd75 Exclude primary link from link lists 2012-01-06 17:28:55 +00:00
Nathan Gray
2e9866bab9 Add mergeprint tag for links to a specified application: links/appname 2012-01-05 17:43:44 +00:00
Nathan Gray
a07cc48066 Restore pm_id & project merge markers 2011-12-22 16:21:34 +00:00
Nathan Gray
5878768532 Change {{links}} to exclude files, {{links_attachments}} is everything 2011-10-26 15:06:37 +00:00
Nathan Gray
79c669c6cb Add placeholder for attachments 2011-10-25 22:52:34 +00:00
Nathan Gray
adfe721ba7 Implement links placeholder 2011-10-25 22:39:16 +00:00
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