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

170 Commits

Author SHA1 Message Date
Hadi Nategh
fd976ea1dc Backport commit r48051, committed by Nathan Gray. Indicate merge class to use for mail, fixes infolog placeholders not known 2014-08-14 07:41:24 +00:00
Nathan Gray
210ebb5706 - Add $$user/primary_group$$ common placeholder 
- Add calendar_owner/<contact> sub-placeholders, including primary_group
 2014-07-08 19:05:09 +00:00
Nathan Gray
ee7349f4f6 Fix missing path, prevented single selected address merge into mail from opening properly in popup 2014-06-04 15:41:24 +00:00
Nathan Gray
79f7a8a6cf Use popup mail compose window if default document is an email, same as non-default documents 2014-05-29 15:33:27 +00:00
Ralf Becker
9455efae32 added postSubmit=true to document actions in mime-type sub-menus, was there for all other cases already 2014-05-26 16:09:03 +00:00
Klaus Leithoff
bec6913567 revert changes, as the double - is needed here; needs to be fixed elsewhere 2014-03-21 14:50:53 +00:00
Klaus Leithoff
354a2ac3e8 fix ->typo<- that prevented the merge action on message/rfc822 in addressbook to function properly 2014-03-21 14:26:10 +00:00
Nathan Gray
92e29ff0c4 Fix merge print to work with both old & new ODF spreadsheets 
- adds support for calcext:value-type cell attribute
 2014-03-18 14:13:57 +00:00
Nathan Gray
4cdd4d9d4a Update opendocument spreadsheet numeric cell attributes to include celcext:value-type. 2014-03-11 17:35:50 +00:00
Ralf Becker
6de6114e22 remove old API browser class, apps only used content_header method with is available as html::browser_header() with identical signature 2014-01-19 09:30:33 +00:00
Nathan Gray
05f0e486e3 Use long task UI to merge contacts into email templates 2014-01-16 14:05:07 +00:00
Nathan Gray
f9c2c73432 Get merging contact into mail template file working 2014-01-15 16:29:30 +00:00
Ralf Becker
6e30816758 fixed not working download via action system: needed submit via POST request instead of Ajax, add new boolean action attribute postSubmit 2013-10-04 12:48:11 +00:00
Klaus Leithoff
d2a851931f provide contact-id on errormessage on failure of mail-merge 2013-08-07 08:07:24 +00:00
Klaus Leithoff
6362e257b1 alter message on success/failure of multiple message sending via addressbook mail-merge 2013-08-06 13:48:20 +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
bd6c23298b Change ODS file line break tag from <text:line-break> to </text:p><text:p> so it works in LibreOffice 2013-04-22 15:25:19 +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
ef826ee2b9 Change all merges to use common get_all_links() function 2013-02-07 09:36:07 +00:00
Nathan Gray
03aeacf69d Add get_all_links() to get all link placeholders from content 2013-02-07 09:15:59 +00:00
Klaus Leithoff
d04f027709 missed commit for r41402 (adapted message on merging mail templates with single mail) 2013-01-25 14:03:14 +00:00
Ralf Becker
78fc93df60 * Addressbook/eMail: fixed wrong characterset when merge printing into eMail 2012-10-25 16:16:41 +00:00
Christian Binder
2fbf1d36e8 document merge helper function to allow download by HTTP POST request 2012-09-29 10:16:39 +00:00
Klaus Leithoff
5637674315 * mergeprint: fix problem with not replaced app-links like #contact/nfn; fix problem with not replaced date only option on date/datetime customfields 2012-08-23 10:26:43 +00:00
Ralf Becker
f7fa8ea37e * Addressbook/InfoLog/Filemanager/Tracker: added or fixed formatting of certain custom field types using a single shared method 2012-08-09 12:41:47 +00:00
Nathan Gray
1f94427cf7 Avoid conflict between date sub-placeholder for date/time custom field (#date_cf/date) and link-to custom field sub-placeholders (#infolog/created) 2012-07-31 17:56:57 +00:00
Nathan Gray
26ee1fb25e Add date with nothing after it to list of potential formats for parsing into spreadsheet date 2012-07-31 15:03:31 +00:00
Christian Binder
c900737797 reverted r39642 for a better solution to come 2012-07-02 20:43:00 +00:00
Nathan Gray
195a3353d7 Add date only placeholders for timestamps: {{timestamp_placeholder/date}} 2012-07-02 15:24:15 +00:00
Christian Binder
183fa30aca Registry of apps currently supporting merge (for later usage) 2012-07-01 18:22:38 +00:00
Nathan Gray
36cc792d46 Format numbers inside writer tables as numbers 2012-06-26 16:21:20 +00:00
Nathan Gray
13571a6254 Implement pagerepeat tag for html files 2012-05-16 17:36:07 +00:00
Nathan Gray
7a5c8f6ad6 Allow anchor tags in OO.o 2012-05-14 13:48:32 +00:00
Nathan Gray
94cd19a50c If openoffice template specifies pagerepeat, use it 2012-05-07 21:09:31 +00:00
Christian Binder
7852cf2baa feature: split document merge context menu entries if subfolders exist in template folders 2012-05-02 19:59:15 +00:00
Nathan Gray
1b30ed3870 - Test multiple options for date format, stop when one works - Avoid deprecated format_datetime(), only format if there is a value 2012-04-24 14:36:31 +00:00
Nathan Gray
0e9e4ae325 Add in seconds, some timestamps have those and date doesn't parse otherwise 2012-04-23 16:32:34 +00:00
Nathan Gray
5b8b8fd838 Avoid infinite loops by not passing real content text, so other app doesn't try to expand custom fields too 2012-04-18 16:21:24 +00:00
Nathan Gray
fb69fb21ea More robust handling of date formatting: 
- Handle placeholders with prefixes
- Use user format to parse date/time, in case it's already been formatted
 2012-04-16 15:54:22 +00:00
Nathan Gray
4feaa8375e Expansion of link_to custom fields 2012-04-11 20:03:11 +00:00
Nathan Gray
4d37157497 Make match non-greedy to only match placeholder 2012-04-10 15:05:41 +00:00
Nathan Gray
18ca0470b2 Merged links are always external 2012-04-02 22:14:15 +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
Ralf Becker
f676a23821 fixes for PHP 5.4 warnings and strict warnings, thought disabled E_STRICT for now, because of various strict warnings in working code, which could not be easy fixed in all areas (see comment in phpgwapi/inc/functions.inc.php) 2012-03-04 13:33:10 +00:00
Nathan Gray
dc6da791f4 Add placeholder [links|attachments|links_attachments]/link to get a download url for attachments 2012-02-28 00:23:41 +00:00
Nathan Gray
058553b8d9 - Fix last[-1] comments 
- Show custom notification / signature checkboxes for all queues too
- Handle message / signature as HTML, not text
- When merging HTML, keep the same tags as OO.o & word documents
 2012-02-27 21:34:34 +00:00
Nathan Gray
9caec6fffb Fix for empty spreadsheet dates in XML & OO.o getting a date anyway 2012-02-24 23:29:58 +00:00
Nathan Gray
2b39a7a059 Fix spreadsheet date/time formatting issue - incorrect parsing of user's time 2012-02-20 16:15:18 +00:00
Nathan Gray
1624c37dc7 Fix typo in Excel date processing 2012-02-13 19:23:17 +00:00
Nathan Gray
4f669300a4 When merging into a spreadsheet document, convert dates into SS dates 2012-02-13 18:59:00 +00:00