Commit Graph

2192 Commits

Author SHA1 Message Date
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
nathan
db7828ad1d Add et2-box (& et2-hbox & et2-vbox) WebComponent
Box can have legacy & webcomponent children.
Used here in infolog edit created & modified row
2021-08-10 15:02:52 -06:00
Ralf Becker
a7923576ef try fixing not displayed custome type and status icons in CRM view 2021-07-23 09:49:18 +02:00
nathan
5fee9fcafe Make et2-textbox as a WebComponent
Not all attributes are handled yet, but value cycle is working
2021-07-22 14:54:10 -06:00
nathan
ad00156113 Merge branch 'master' into web-components 2021-07-19 14:15:52 -06:00
Ralf Becker
eec16362dc amending commit 59ac3f4 "always name generated file app.min.js" 2021-07-19 11:50:33 +02:00
nathan
b0322c549a Attribute parsing & basics of WebComponents looking like et2 widgets 2021-07-14 09:49:36 -06:00
Ralf Becker
a5ad691757 deprecated egw.includeJS() in favor of es6 import statement
with egw composition happening in main window the used import statement happens in that context and NOT in the window (eg. popup or iframe) this module is instantiated for!
2021-07-09 17:27:22 +02:00
Ralf Becker
90f1d9ea37 always show deleted filter and set deleted status in calendar
see #29778
2021-07-07 11:21:45 +02:00
Ralf Becker
05405b955a remove generated .js files from git 2021-07-01 08:38:08 +02:00
Ralf Becker
d7cd90ebe7 fix skipping timestamps, but preferring .min.js over .js
added more apps to rollup.config.js (ones givening errors are commented out)
2021-06-29 15:21:19 +02:00
nathangray
9be653e226 Adapt app-specific merges to 186e03671a 2021-06-23 11:31:47 -06:00
Ralf Becker
3f1653bff8 fix errors loading stylite/EPL object 2021-06-15 13:19:56 +02:00
Hadi Nategh
c0eae5d955 Fix import statement and remove debugger 2021-06-14 15:05:08 +02:00
nathangray
6993d82abf Infolog: Use infolog owner as sender of notifications
(cherry picked from commit c9c9f28851)
2021-06-11 13:14:39 -06:00
Hadi Nategh
54fff9739a Add more missing import statements 2021-06-10 15:40:49 +02:00
Ralf Becker
5298336886 include jquery and other legacy js files via script tag 2021-06-10 11:38:54 +02:00
Ralf Becker
38cb855017 fixing a couple more imports to get addressbook list show up 2021-06-09 11:11:34 +02:00
Hadi Nategh
c7d80123ce Fix error key(): Argument #1 ($array) must be of type array, null given 2021-06-01 16:35:34 +02:00
Ralf Becker
e43331e48b fix not applied blur on initial load and also disable optimization for CRM-view and the like 2021-05-31 17:11:58 +02:00