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

2211 Commits

Author SHA1 Message Date
Hadi Nategh
7212b5dd51 Fix infolog description field adding extra horizontal scrollbar 2021-12-14 16:05:23 +01:00
nathan
d69d57e6e9 Merge branch 'master' into web-components 2021-12-06 10:52:10 -07:00
Ralf Becker
af08ee1495 pending translations from our translation server 2021-12-04 15:44:14 +01:00
nathan
da6ff9d639 Merge branch 'master' into web-components 2021-11-24 09:42:28 -07:00
nathan
6502687268 Fix infolog double PM change test 2021-11-22 10:31:15 -07:00
Ralf Becker
cb65460b5f * InfoLog: fix not working overwrite check (optimistic locking) plus incrementing etag 2021-11-22 17:54:24 +01:00
nathan
241d3181c9 Infolog: Fix save conflict was still overwriting 2021-11-22 09:11:13 -07:00
Ralf Becker
5aed6918bd fix PHP 8.0 TypeError: implode(): Argument #1 ($pieces) must be of type array, string given 2021-11-20 08:36:35 +01:00
nathan
b91e1d8a5f Merge branch 'master' into web-components 2021-11-18 10:28:30 -07:00
Ralf Becker
2406fe0fad fix PHP 8.0 TypeError: preg_match(): Argument #2 ($subject) must be of type string, array given 2021-11-13 17:45:25 +01:00
Ralf Becker
db88ad9c0d fix PHP 8.0 TypeError: Cannot access offset of type string on string 2021-11-11 09:21:53 +01:00
nathan
ed66beaf8f Merge branch 'master' into web-components 2021-11-10 10:25:51 -07:00
Ralf Becker
2944a00e02 fix PHP 8.0 TypeError: Cannot access offset of type string on string, when iCal exporting a GEO attributes 2021-11-10 16:59:47 +01:00
Ralf Becker
f74b3be7a8 fix PHP 8.0 TypeError: Illegal offset type in Api\Categories::id2name() 2021-11-10 12:56:04 +01:00
nathan
a717234b2f Merge branch 'master' into web-components 2021-11-09 15:02:25 -07:00
nathan
3d2502c630 Infolog: Fix could not change project after b125e1b2fd 2021-11-09 14:02:10 -07:00
nathan
e03b8bbdc9 Merge branch 'master' into web-components 2021-11-05 11:08:31 -06:00
nathan
b125e1b2fd Infolog: Fix linking a second project will remove one project after a second save 
With test.
 2021-11-05 10:45:27 -06:00
nathan
672ed0aa0e - DateTime widget to handle dates with times 
- Time & Date+time parser & formatter functions
- Date widget does not return a time
 2021-11-03 09:05:16 -06:00
nathan
76d7447dab Merge branch 'master' into web-components 2021-11-01 09:37:26 -06:00
Ralf Becker
723db2c004 fix PHP 8.0 error: array_intersect(): Argument #2 must be of type array, string given 2021-10-25 16:04:28 +02:00
Ralf Becker
b1af39be37 fix big chunk of PHP 8.0 warnings 2021-10-21 10:39:57 +02:00
nathan
fbbc466c78 Merge branch 'master' into web-components 2021-10-18 10:56:05 -06:00
nathan
9861c9a0b3 Fix copy / paste error 2021-10-15 09:37:27 -06:00
nathan
33fcb4e657 Infolog: Avoid errors adding app replacements if incorrect parameters given 2021-10-15 09:09:53 -06:00
nathan
62aeccbb0f Infolog: Avoid changing contact or project links if user has no write permission 2021-10-15 09:05:15 -06:00
nathan
bcfcc51398 Hide parent & contact in parent placeholder list 2021-10-12 15:50:37 -06:00
nathan
9e2bb05ded Placeholders list common UI 
Should reduce maintenance by using a common UI to show placeholders based on the placeholder list
 2021-10-12 14:18:18 -06:00
nathan
d43c27a31b Fix nested placeholders (customfields from other apps) were not being displayed properly 2021-10-07 14:51:16 -06:00
nathan
da6a16e62d - Add generation target path preference to all apps 
- Use common method to get merge preferences to reduce duplication
 2021-10-07 10:22:45 -06:00
Ralf Becker
91bd7c7aeb an other chunk of fixed PHP 8.0 Warnings 2021-10-07 10:14:43 +02:00
nathan
02dce82010 Merge branch 'master' into web-components 2021-10-06 14:02:22 -06:00
nathan
45f039da95 * Add preference to set the filename of merged documents using placeholders 2021-10-06 11:59:29 -06:00
Ralf Becker
d2c85cfe86 fix PHP 8.0 errors: key(): Argument #1 ($array) must be of type array, null given 
guarding key() from calling with null eg. $button = key($content['button']) --> key($content['button'] ?? []) or check before !empty($content['button'])
 2021-10-06 16:08:32 +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
4458954af3 fix PHP 8.0 error: array_intersect() does not accept unknown named parameters 2021-10-04 13:15:33 +02:00
nathan
7f930a6221 Placeholder dialog: Support for other apps, starting with Infolog 2021-09-27 14:46:41 -06:00
nathan
25773a929f Merge remote-tracking branch 'origin/master' into web-components 2021-09-23 10:22:18 -06:00
Ralf Becker
9239b86cd9 pending translations from our translation server 2021-09-22 14:57:11 +02:00
nathan
9e6bd22b4f Don't need to specify size, it's automatic now 2021-09-14 11:13:46 -06:00
nathan
b47a3dd11b Fix action popups were initially visible 2021-09-13 13:36:30 -06:00
nathan
d22847a503 - Fix timestamp & encrypt button positioning 
- Clean up the footer buttons a little
 2021-09-13 11:50:36 -06:00
Ralf Becker
582793d52b Revert "Bring web-component work into master branch" 
To many things are not working :(
- addressbook, infolog, even timesheet index lacks at least r/o textbox and problably other widgets
- smallPART (with many extra widgets) is completly unusable
- *box widget seems not to skip empty boxes
--> we need more testing and progress, before we can merge that

This reverts commit 9cee681b94.
 2021-09-03 11:28:22 +02:00
nathan
9cee681b94 Bring web-component work into master branch 2021-09-02 10:52:10 -06:00
nathan
538e483499 Merge branch 'master' into web-components 2021-08-23 15:41:27 -06:00
nathan
8fa424c4df Avoid using private internal value 2021-08-23 15:37:16 -06:00
nathan
e34ca22499 Split textarea off from textbox & start implementing 
Splitting the two made things a lot simpler to deal with
 2021-08-20 15:52:22 -06:00
Hadi Nategh
4cd86ac958 Fix infolog type icons not being displayed 2021-08-20 10:13:30 +02:00
nathan
4f225054f8 WIP on Date widget 
Something's not right with the parser/formatter, they're not getting called.

Times not handled yet
 2021-08-13 15:26:18 -06:00
nathan
fac1dfb8d4 Merge branch 'master' into web-components 2021-08-12 10:35:46 -06:00