holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,875 Commits 27 Branches 330 Tags 157 MiB
e4f95d9c20
Commit Graph

83 Commits

Author SHA1 Message Date
nathan
45f039da95 * Add preference to set the filename of merged documents using placeholders 2021-10-06 11:59:29 -06:00
nathan
a0a89a6b74 Placeholder dialog: Add placeholders for projectmanager, timesheet, tracker 2021-10-05 16:09:39 -06:00
Ralf Becker
ddddc5ba05 next big chunk of fixed PHP 8.0 Warnings 2021-10-05 14:11:11 +02:00
nathan
6126bc2ac9 Placeholder dialog: Placeholder groups can now have groups 
References (info_contact)/ customfields to other apps are expanded so all their placeholders are available as well
 2021-10-04 14:45:57 -06:00
Ralf Becker
ac7faf6036 fix PHP 8.0 error: count(): Argument #1 ($value) must be of type Countable|array, string given 2021-10-04 13:02:34 +02:00
nathan
117b193a63 Add some missing general placeholders 2021-10-01 13:37:17 -06:00
nathan
71ef7ccd0d Fix some merge action bugs: 
- default document wasn't working properly, missing caption
- Email documents were giving "Unable to generate merge file"
 2021-10-01 10:06:29 -06:00
nathan
1dc9dd0c6b * Add a preference so you can choose where merged documents are put 2021-09-30 12:01:37 -06:00
nathan
fb88f8846b Merge as PDF: 
- improve error logging
- remove original merge result when PDF conversion succeeds
 2021-09-29 11:01:07 -06:00
nathan
707c57ecf0 * Add option to merge documents as PDF 2021-09-28 17:00:55 -06:00
nathan
2a4faf0137 * Add filemanager actions to convert editable files to PDF or PNG 2021-09-28 14:48:25 -06:00
nathan
7f930a6221 Placeholder dialog: Support for other apps, starting with Infolog 2021-09-27 14:46:41 -06:00
nathan
eb57294146 Placeholder dialog: Allow & show general fields 2021-09-27 11:09:38 -06:00
nathan
47cf12869b Utility function to add prefix to placeholder & optionally wrap it with markers, because I was writing it out so many times 2021-09-27 10:54:57 -06:00
Ralf Becker
d9f759f517 fix PHP 8.0 error: implode(): Argument #2 ($array) must be of type ?array, string given 2021-09-24 12:29:48 +02:00
nathan
704b6c6dc2 Add user placeholders into placeholder dialog 2021-09-22 11:15:49 -06:00
nathan
d512238dc0 * Collabora: Add address insert dialog 2021-09-21 14:07:22 -06:00
nathan
29bd739955 W.I.P on collabora placeholder insert 2021-09-20 15:34:55 -06:00
Ralf Becker
be3514c36f preferring get_rrows over get_rows to fix SQL error in timesheet merge 2021-09-13 18:02:39 +02:00
nathan
36df64085f * Api: Fix some merge files were opened in browser instead of downloaded 2021-09-03 09:33:32 -06:00
nathan
6c0aed651f Api: Add some extra parameters to Merge::merge_entries() so overridding classes can still use the parent method, passing in IDs & merge object 2021-08-09 13:44:43 -06:00
nathangray
b021767ac1 Make sure nested document actions open in new tab, same as others. 2021-07-05 09:46:00 -06:00
nathangray
34d601b102 Api: Fix missed change in nested document actions 
see 186e03671a
 2021-07-02 12:04:38 -06:00
nathangray
186e03671a Change merge download/Collabora to a common generation method, avoiding need to POST. 
This allows Kanban to download merge files
 2021-06-23 11:20:09 -06:00
Ralf Becker
fed41622c2 fixing all sorts of PHP 8 errors and PHPStorm errors 2021-03-31 17:50:01 +02:00
nathangray
8063d65303 Check that some things exist before trying to use them 2021-03-05 09:30:02 -07:00
nathangray
95f84454be Silence some warnings & debug 2021-03-05 09:13:12 -07:00
nathangray
ea41ab8e77 Api: Add charset parameter to tidy->repairString() to avoid mangling some non-ascii characters when merging into document 2020-10-14 14:53:37 -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
81cdf759a3 Api: Fix links got escaped when put into mail templates 2020-10-05 14:14:54 -06:00
nathangray
baebf56fb2 Merge: Fix {{link}} placeholder was incorrectly wrapped in HREF tag. Use {{link/href}} for that now. 2020-10-02 12:37:37 -06:00
nathangray
7163acfe1d * Add action to share filemanager folder (readonly) with hidden upload folder 2020-03-24 20:34:04 -06:00
nathangray
c59807d861 Api - No need to make the link titles safe here, it just makes timesheet titles look weird 2019-08-23 16:01:01 -06:00
nathangray
921d61070c Fix function signature documentation 2019-04-05 08:58:21 -06:00
nathangray
66d6a6c883 Break out merge share creation so it can be overridden 2019-04-04 10:28:20 -06:00
nathangray
2d644d930e Fix can't always find the merge app 2019-04-04 09:43:14 -06:00
Ralf Becker
becd608ce9 rtf seems to user iso-8859-1 or equivalent windows charset, not utf-8 2019-03-08 11:26:43 +01:00
nathangray
fd8f69db80 Api - Fix leftover $$ when merging empty contact customfields 2019-02-14 09:32:03 -07:00
nathangray
ec04121692 Fix addressbook HTML customfields were stripped of their tags when merging 2019-02-07 10:02:08 -07:00
nathangray
85a3b3e027 Fix some PHP 7.2 warnings "PHP Warning: count() Parameter must be an array or object ..." 2018-11-29 10:13:49 -07:00
nathangray
4a8b94bed8 Fix some PHP 7.2 warnings "PHP Warning: Use of undefined constant ..." 2018-11-28 11:11:45 -07:00
nathangray
2bf7e14477 Etemplate - add custom field sub-fields for app-entry widgets 
- add regex & regex_replace attributes to change value around
 2018-11-13 14:11:26 -07:00
nathangray
117b559a5e Entry share changes 
- Writable share is now a checkbox
- Add Sharing -> Merge entry into email template, share gets selected options
- Add {{share}} placeholder which creates (by default) read only share
 2018-10-11 12:54:17 -06:00
nathangray
f2cfd94391 Add a keep emails flag (default true), set to false to skip saving merged emails to sent folder 2018-10-01 11:16:17 -06:00
nathangray
e805551575 Keep image tags when merging into HTML templates 2018-09-18 10:21:36 -06:00
nathangray
822b967fe3 Better handling of HTML tables when merging. 
Fixes table within table broke format parsing.
 2018-09-12 16:46:36 -06:00
nathangray
de15acc03d Add div to list of tags that avoid HTML encoding on replacements 
Fixes HTML tracker description from external source showing HTML in notifications
 2018-07-19 12:50:22 -06:00
nathangray
668a4fede8 Api - Turn on merge for presentations, text templates, spreadsheet templates and presentation templates 2018-05-07 13:34:35 -06:00
nathangray
6c4ea8cb38 Api - Stop adding calcext:value-type attributes when merging to spreadsheets, they're no longer used and can cause a warning with recent templates 2018-04-23 09:24:49 -06:00
Ralf Becker
98376b5908 * PHP 7.2: fix several PHP Fatal errors and warnings stalling installation and usage 2018-04-09 16:02:00 +02:00