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

2258 Commits

Author SHA1 Message Date
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
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
Ralf Becker
0a9e61f6fa * InfoLog: allow to limit list to last N month in site-configuration, if ordered by last modified 2021-05-31 10:38:44 +02:00
nathangray
a261ce8556 Avoid some PHP warnings about doing things to arrays that aren't arrays 2021-05-25 11:35:40 -06:00
Ralf Becker
b02936dddb fix Class 'Accounts' not found 2021-05-20 09:11:21 +02:00
Ralf Becker
87be62ce63 remove config allowing to immediately delete InfoLog entries (as it's required for sync) 2021-05-18 14:14:21 +02:00
Ralf Becker
1f010a4391 Bump version to 21.1 2021-05-08 15:02:24 +02:00
nathangray
e3442d3db0 Document info_owner/... placeholder in list 2021-05-07 10:18:43 -06:00
nathangray
23130ea078 * Infolog: Add info_owner/... merge placeholders 2021-05-07 10:15:05 -06:00
nathangray
74a7d6ee8b Use Merge number formatting instead of export formatting. It takes export file type into consideration. 2021-04-21 13:29:09 -06:00
nathangray
f89c8cfb03 Add hrules to sidebox menus 2021-04-19 16:02:41 -06:00
nathangray
06ceeb54e3 Infolog: Add project as export filter 2021-04-13 10:57:54 -06:00
nathangray
0628c5d54a Fix typo 2021-04-13 10:16:45 -06:00
nathangray
aff06ec4cc Import/export fixes 
- Fix for missing floats by Jürgen Dlugi
- Fix broken timesheet export was always 0 results
 2021-04-08 16:53:06 -06: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
Ralf Becker
868135775c PHP 8 fixes 2021-03-29 16:47:19 +02:00
nathangray
723e776b9d Add application-specific actions to kanban cards 2021-03-23 16:30:39 -06:00
nathangray
ac1a975f1d Infolog: Fix CRM view would overwrite state in infolog list, leading to wrong filters in favorites 2021-03-22 11:35:24 -06:00
nathangray
20af564f37 * Infolog: Fix details / no details filter preference was not saved 2021-03-22 09:50:02 -06:00
Ralf Becker
84845d05b5 Fix PHP 8.0 Fatal error: Unparenthesized a ? b : c ?: d is not supported 2021-03-21 21:46:10 +01:00
nathangray
df54dcace4 Apply client-side push refactoring to calendar, infolog, timesheet 2021-03-04 11:27:35 -07:00
Ralf Becker
58ae23c74c allow "app.<appname>.<method>" in link registry and use it to open CRM view 2021-03-04 11:50:13 +02:00
Ralf Becker
7c7445cea5 fix Call to protected method admin_cmd_config::exec() from context infolog_customfields 2021-03-02 17:35:48 +02:00
Hadi Nategh
6e2b956850 Fix error Cannot read property 'decrypt_hover' of undefined 2021-02-22 11:46:03 +01:00
Ralf Becker
0f69a5669f pending translations from our translation server 2021-02-03 08:25:50 +01:00
nathangray
8c078ea23f Remove debug 2020-12-11 09:08:13 -07:00
nathangray
c158707718 Add some debug into infolog csv import 2020-12-04 10:20:34 -07:00
nathangray
c3ae524ed6 Infolog: When importing into info_contact or info_from, try to find & link the contact 2020-12-01 11:14:15 -07:00
nathangray
f85e08b942 Infolog: When importing into info_contact, try to find & link the contact 2020-11-27 10:50:46 -07:00
Hadi Nategh
dd95002b8b Let the framework takes care of domId 2020-11-02 16:25:22 +01:00
nathangray
ce05572461 * Infolog: Responsible user in a different timezone would adjust the due date when saving 
After clicking 'Apply' responsible user could be given fully editable dialog in some cases (due to notifications)
 2020-10-19 10:41:58 -06:00
nathangray
a0065835a6 Update infolog & projectmanager on client when you add a timesheet entry 2020-10-13 10:28:36 -06:00
nathangray
ba0e1240c3 CRM: Fix some list bugs 
- Adding an infolog did not show up
- CRM.ts got disconnected if infolog list got reloaded
 2020-10-08 11:53:33 -06:00
Ralf Becker
4886583cc1 change sharing to allow mounting shared into existing user sessions 
without the need to destroy the session, if the sharee is a different user

This is accomplished by keeping the sharee in the stream context / attribute of the vfs class(es) instead of static Vfs::$user.
Later is still used for the current user - identical to egw_info[user][account_id].

This commit / merge of the vfs-context feature branch also added the abilty to mount WebDAV sources, eg. a sharing link from an other EGroupware instance
or any WebDAV server
 2020-10-08 11:24:34 +02: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
Ralf Becker
f73b8731e0 use json instead of php serialization 2020-09-16 17:01:51 +02:00