Commit Graph

27 Commits

Author SHA1 Message Date
nathan
82103dd514 * Collabora: Merge placeholder dialogs
Added merge placeholder & address dialogs to Collabora.  Also some new merge preferences for target filename and location, and placeholder list UI
2021-10-14 13:18:21 -06:00
nathangray
6b50299d8a Adapt app-specific merges to 186e03671a 2021-07-13 08:53:38 +02:00
nathangray
583fbea046 Use Merge number formatting instead of export formatting. It takes export file type into consideration. 2021-04-21 10:33:31 -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
Hadi Nategh
508d0aa920 Try to match placeholder NENVLF with its described example 2017-02-10 10:41:43 +01:00
nathangray
a23acf1dfa * Add creation field to timesheet 2017-01-17 10:34:28 -07: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
8b671d96f1 update to only use new Api, incl. dependency to only api (no more phpgwapi and etemplate) 2016-04-26 18:27:29 +00:00
Ralf Becker
a6767139a0 set ts_project for export/merge from ts_project_blur, where it get moved, if it is no custom value 2014-11-19 13:51:09 +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
b13ccf631c Add {{link}} placeholder to other apps 2013-03-20 14:51:09 +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
c8a5fe221a enable more apps to be merged by filemanagers itempicker 2013-01-04 00:21:37 +00:00
Klaus Leithoff
f3a40b341b * timesheet/mergeprint: add missing datefield definition 2012-08-24 11:45:28 +00:00
Nathan Gray
4feaa8375e Expansion of link_to custom fields 2012-04-11 20:03:11 +00:00
Nathan Gray
871701d774 Fix links/[app] merge tag - copy/paste error 2012-01-13 19:49:19 +00:00
Nathan Gray
02861daf88 Add mergeprint tag for links to a specified application: links/appname 2012-01-06 18:35:34 +00:00
Nathan Gray
4ab5f97ed0 Add {{links}}, {{attachments}}, {{links_attachments}} placeholders 2011-10-26 16:45:38 +00:00
Nathan Gray
624839d0db Translations for placeholder labels 2011-07-05 22:21:49 +00:00
Nathan Gray
41808c52c3 Add total field to merge 2011-05-12 19:30:01 +00:00
Nathan Gray
7962433e27 types value moved 2011-04-04 19:20:12 +00:00
Nathan Gray
949d06dce9 Fix status merge, strip spaces 2011-03-31 16:49:06 +00:00
Nathan Gray
51015de7b8 Specify fields to be treated as numeric 2011-03-14 22:07:23 +00:00
Nathan Gray
a28c004536 Format numbers according to user preferences 2011-02-28 20:35:50 +00:00
Nathan Gray
1280527169 Change display of placeholder tags from 2432...2432 to {{...}} 2011-02-18 17:07:16 +00:00
Nathan Gray
12a7d6534f Forgotten merge file 2011-02-11 18:36:27 +00:00