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

191 Commits

Author SHA1 Message Date
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
Ralf Becker
a566599b7f * PostgreSQL/Addressbook/All Apps: fix SQL error in history tab if there are attachments 2021-09-03 09:48:47 +02:00
Ralf Becker
94c98718ef update script to remove hashes/non-email-addresses from egw_history_log.share_email 2021-08-17 09:15:25 +02:00
nathan
bea880d9b1 * Api: Fix changes in history log had a hash instead of user if the change was made after a share was opened. 2021-08-16 13:07:17 -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
nathangray
d6c6e14abf * Api: Prevent invalid customfield names 
(cherry picked from commit ae86eb7812)
 2021-06-11 13:18:03 -06:00
nathangray
3ada84be0f Tracker: Fix notification dates could be in wrong timezone 2021-05-05 11:57:21 -06:00
nathangray
35fd51da86 Add table name in when parsing search 
Also, some code quality fixes
 2021-04-19 14:34:53 -06:00
Ralf Becker
fed41622c2 fixing all sorts of PHP 8 errors and PHPStorm errors 2021-03-31 17:50:01 +02:00
Ralf Becker
37e5e12c3c PHP 8 fix: adding explicit cast for comparing DB-version to a float major number 2021-03-31 13:31:42 +02:00
nathangray
1ffde3b692 Change global sharing variable to be a list of shares in use, indexed by token. This should resolve the issues with multiple shares being accessed in the same session. 2021-03-11 17:00:16 -07: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
Ralf Becker
89d6dc8650 Fixing the fix Undefined constant DateTime 2021-03-02 10:25:11 +02:00
Ralf Becker
b1af8449fd Fix ErrorException: Object of class EGroupware\Api\DateTime could not be converted to string 
It's happening as we removed __toString method from Api\DateTime to allow again direct comparing with comparison operators
 2021-03-02 09:37:43 +02:00
Ralf Becker
fdecefebd4 fix exception when trying to store a DateTime 2021-02-19 21:30:50 +02:00
Ralf Becker
57d5176080 remove non-digits and only search phone-numbers in phoneSearch 2021-02-15 21:28:39 +02: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
Ralf Becker
da27403b1b * eSyncPro: fix SQL error in device list 2020-09-16 16:45:01 +02:00
Ralf Becker
eb812dad01 * PostgreSQL: fix SQL error opening ProjectManager 
caused by exploding SQL expression by comma --> keep colums as array, to not have the need to explode it
 2020-09-01 10:24:46 +02:00
Ralf Becker
a14a21fa49 * Tracker/Notifications: send mail after response to user and push errors 2020-08-01 15:10:07 +02:00
Ralf Becker
0e3143d45d fix SQL error in ranking caused by automatic added ambigous column which app code had already aliased "$table.$col AS $col" 2020-07-31 13:39:05 +02:00
Ralf Becker
319ae2637c an other case of not automatic fixed ambigious auto-id 2020-05-08 12:35:09 +02:00
nathangray
7163acfe1d * Add action to share filemanager folder (readonly) with hidden upload folder 2020-03-24 20:34:04 -06:00
Ralf Becker
f7c653832f add an iterator for objects with a get_rows method 2020-01-13 14:41:46 +01: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
8edb92f03f Strip HTML before diffing for history 2019-06-06 15:05:31 -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
nathangray
0324c7d6e6 Do not store a diff for encrypted values, that is not useful. 2019-03-25 10:07:46 -06:00
Tomasz Jakubowski
a5455c3d76
Add reply to for email notification 2019-03-12 22:15:31 +01:00
nathangray
e43c8f8f19 Infolog - add ability to clear description history 2019-03-11 14:15:28 -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
Ralf Becker
0abec539c3 * All apps: store history of multiline fields as diff only (migration can take 15min!) 2019-03-01 15:46:54 +01:00
nathangray
59ab76ef5e Use correct class 2019-02-28 15:22:50 -07:00
nathangray
b7934f699c Finish up UI 
- CSS
- Popup sizing & formatting
- diff resize when popup resizes
 2019-02-28 15:15:26 -07:00
nathangray
3c76c5a10a Fix diff argument order 2019-02-27 16:08:20 -07:00
nathangray
7e7e198299 Make diff check static 2019-02-27 10:48:10 -07:00
nathangray
73600bb541 Use a proper constant for diff marker 2019-02-27 09:04:17 -07:00
nathangray
39e7820520 Just send unified diff to client, not full old & new value 2019-02-27 09:03:28 -07:00
nathangray
ae000be2bc Instead of new and old values, store unified diff in database for multiline strings 2019-02-26 15:13:47 -07:00
Ralf Becker
1d8f2a606b integrate custom-field search in token processing 
to allow to use something like: "<regluar-match-token> +<custom-field-match-token>" to return correct entries matching both
also no longer search private custom-fields not accessible by current user (gives a slower query, if private cfs exist)
 2019-02-19 16:21:02 +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
Hadi Nategh
a059628f58 * Mail: take user's cutomfields type of email into account when searching for contacts in Compose -> TO field. 2019-02-01 11:13:43 +01:00
Hadi Nategh
b3f2d7b102 Revert part of commit 05ce70f1a8 because it breaks codes where result of search function expecting to be an array instead of Db2DataIterator (eg. timesheet) 2019-01-28 12:35:41 +01:00
nathangray
05ce70f1a8 Fix missing types in admin queue and history 2019-01-23 10:41:52 -07:00
Hadi Nategh
b2c109ed37 Fix typo 2019-01-22 12:59:15 +01:00
Hadi Nategh
32dc0decf5 * Mail: add default value settings for S/MIME passphrase expiration in site configurations 2019-01-18 16:19:08 +01: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
4b989d016c Log useful error message if select or radio custom field has no values 2018-11-28 11:06:17 -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
Hadi Nategh
c5e902926b Fix notifications with same id but no links are not getting grouped together 2018-07-23 16:25:07 +02: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
Hadi Nategh
677a4a03fb * Tracker: fix issue text part of some html tickets mail notifications contain html parts 2018-07-12 17:47:19 +02:00
Ralf Becker
baa2807606 some hooks needed for new policy app 2018-06-12 19:04:02 +02:00
nathangray
6708ccb043 Record share emails in history log & display them instead of user when set 2018-06-06 15:51:46 -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
nathangray
1cb13a1f13 * Api - Fix references to sub-fields of custom field entries only merged for the first entry of each type 2018-04-03 15:27:09 -06:00
Hadi Nategh
2943b678bd Fix merge replace placeholders causes huge performance issue. Additionally, fixes the extra $ sign shown up in replaced placeholders. 2018-03-23 16:46:51 +01:00
Ralf Becker
1d835928d2 new method Api\Framework::getUrl() to get a full / externally usable Url 2018-03-21 12:51:52 +01:00
Ralf Becker
dcb78d9776 remove due to own table in 17.1 no longer needed migration of (private) custome-fields 2018-03-14 14:50:46 +01:00
Hadi Nategh
034b17a49a Implement new user preference in order to be able to select a handler for opening a merge print document 2018-02-07 13:15:29 +01:00
nathangray
f07dbf7439 Attempt to prefer user's date format when parsing date from a string. 
Should fix merging into spreadsheet problems with certain date formats (dd/mm/yyyy)
 2018-02-02 11:37:30 -07:00
nathangray
f402561d7d Better tests for Customfields, fix a couple of permission bugs revealed 
Found a problems when requesting 'all' custom fields, it would still use current user permissions
 2018-01-12 10:03:34 -07:00
nathangray
3709d773d9 * Allow private custom fields in notifications, with filtering according to set permissions. Private custom fields are removed from notifications to non-users. 2018-01-10 10:43:43 -07:00
nathangray
a9b616fa20 * API - Make sure private custom fields are not accidentally included in notification due to being cached 2017-12-21 11:26:51 -07:00
nathangray
ced6c63ddd Fix historylog pagination, found by Filippos Karailanidis 2017-12-05 15:13:30 -07:00
Nathan Gray
fade7185ae
Merge pull request #31 from filkaris/history_rows 
Historylog widget: Ability to set nextmatch num_rows
 2017-12-05 08:40:30 -07:00
nathangray
6506418e61 * Api - Fix nested custom field merging 2017-12-01 11:58:44 -07:00
nathangray
2df24a3aaf Add flag for select all to collabora action 2017-12-01 10:36:58 -07:00
A Sigalas
e9de76af7a Set option for num_rows 2017-12-01 11:04:31 +00:00
nathangray
b47777422b Make prefix argument optional 2017-11-16 09:56:20 -07:00
nathangray
867c661796 Fix missing fields in merge if info_contact is not a addressbook entry 2017-11-15 15:41:12 -07:00
Neo Morina
653a0d50c7
Added MIME Type "text/csv" when "pagerepeat" found 
This gives the possibility to use "pagerepeat" in CSV files.
 2017-11-09 13:16:06 +01:00
Ralf Becker
cfe9204f77 allow sql fragments in Api\Storage\Base::delete as in other places 2017-11-06 16:43:23 +01:00
Ralf Becker
790fa8c71d allow sql fragments in Api\Storage\Base::delete as in other places 2017-11-06 16:24:30 +01:00
Ralf Becker
b5574da397 remove system call used for PHP < 5.3.1 2017-10-31 09:55:23 +01:00
nathangray
d3c596a443 - Add a parameter to pass in the class of the notification to use so we can pass in a test one 
- Explicitly tell notification what type of message (plain or html) we're giving it
 2017-10-21 11:29:05 +02:00
nathangray
0183635c02 Add permission check for collabora before setting actions to open in editor 2017-10-05 09:55:06 -06:00