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

357 Commits

Author SHA1 Message Date
nathan
4a3fcec432 Resources: Fix missing merge documents 
It was missing the directory preference
 2023-01-16 09:44:34 -07:00
nathan
6c389419b0 *Resources: Add merge functionality 2022-12-21 12:23:38 -07:00
ralf
5556e22927 fix array_merge(): Argument #2 must be of type array, int given 2022-11-28 14:04:48 +01:00
nathan
24118a2a9c Resources: Additional changes to get submit on changing category to work 2022-11-23 15:24:08 -07:00
nathan
6d113ca407 Resources: Hide customfields tab for categories have no customfields 2022-11-22 15:01:46 -07:00
nathan
e57e81f5ea * Resources: Customfields can now be per category 2022-11-16 14:10:34 -07:00
Ralf Becker
dc24bb7e37 fix PHP 8.0 TypeError: Unsupported operand types: int + string 2021-11-10 11:28:30 +01: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
nathangray
42f8c9182e Resources: Fix display of old category icons in resource list 2021-04-01 11:12:44 -06:00
nathangray
81e918d010 Resources: Support custom category icons 2021-03-31 13:41:31 -06:00
Ralf Becker
868135775c PHP 8 fixes 2021-03-29 16:47:19 +02:00
nathangray
98697031ab Resources: Allow 0 quantity & usable 2021-03-24 15:11:57 -06:00
Ralf Becker
ab9c089f70 fix PHP 8 Fatal error Array and string offset access syntax with curly braces is no longer supported 2021-03-21 21:13:07 +01:00
nathangray
12c315abbc Avoid xml parse error 2021-02-25 11:56:40 -07:00
Hadi Nategh
8bc5b22b5e Add ignore_acl flag for read and checkUsable methods 2020-12-15 13:11:17 +01:00
Hadi Nategh
b612e26790 Add ignore_acl flag to save method 2020-12-07 14:14:26 +01:00
Hadi Nategh
78768ecf7e Fix documentation 2020-12-07 13:15:04 +01:00
Hadi Nategh
5ef339dc9b Add a method to fetch useable quantity of a resource 2020-11-05 17:36:59 +01:00
Ralf Becker
f76af52e2b fix warning about undefined constant 2020-06-28 07:51:29 +02:00
nathangray
06ffd20aa8 Resources - Remove remaining, unused preferences 2019-08-01 16:26:49 -06:00
nathangray
d805e9f467 Stop using deprecated each(), using foreach(), key() or current() instead 2019-02-12 14:13:45 -07:00
nathangray
979c96b854 * Resources - Fix resources not displayed in calendar if there's more than 20 in a category 2019-01-17 09:45:39 -07:00
nathangray
07b24b2a60 Commit session right after we store the state 2018-12-20 10:45:11 -07:00
nathangray
8451836a92 Import/Export - change signature of method that gets options to allow definition-specific values 
Do export too, for consistency
 2018-11-29 10:32:42 -07:00
nathangray
dba9a76246 Import/Export - change signature of method that gets options to allow definition-specific values 2018-11-29 09:35:35 -07:00
nathangray
e10905988a - Change resources preference option back 
- Fix default to be resources with conflicts
 2018-11-28 09:40:09 -07:00
nathangray
a999e6e94f * Calendar - Remove option to skip resource detection, we always do it now. 2018-11-23 10:01:58 -07:00
nathangray
eb7ea6bfab Fix resource invite permission was checked for every resource type 2018-10-01 10:26:06 -06:00
Tomasz Jakubowski
8979e5efe1
Correct the field name from res_owner to res_creator 
In database has only the res_creator column.
 2018-09-25 02:03:37 +02:00
nathangray
736b22ddde Add space to resource quantity in participant search result 2018-08-09 09:56:46 -06:00
nathangray
92df7d3376 * Resources - add (usable / quantity) for bookable resources in calendar participants results 2018-08-07 13:00:52 -06:00
Ralf Becker
60d5712a36 * Calendar/Resources: fix SQL error with no category responsible for Slovenian (and maybe other) translations 2018-05-23 10:44:49 +02:00
nathangray
ee5aba82f4 * Resources - fix 'Too few arguments' error when changing category of resource with accessories 2018-05-09 09:48:26 -06:00
Ralf Becker
2a29ab5808 * Resources: fixed image upload failed for some browsers (Picture type not supported) 
caused by reporting application/octet-stream instead of image mime-type
 2018-03-20 18:00:57 +01:00
Ralf Becker
82081eb58a fix PHP error class config not found when storing ACL for resources on minimal install 2017-08-24 11:58:07 +02:00
Ralf Becker
7cc280ac5f fix use of old egw_vfs class instead of new Api\Vfs 2017-01-19 15:30:12 +01:00
Ralf Becker
f9bbcdeb86 * Timesheet/Resources/Filemanager/Calendar: customfields could not be deleted 2017-01-17 18:24:56 +01:00
Ralf Becker
ae7211af6d replace deprecated session->appsession with Api\Cache::(s|g)etSession() 2016-10-12 17:52:30 +02:00
nathangray
6abb75cd5c Add conflict check when listing resources in a category for calendar owner / participan 2016-09-28 11:01:10 -06:00
nathangray
16b131c883 Fix resource booking conflict indication 2016-09-12 11:42:27 -06:00
nathangray
25ccd1134f Avoid &nbsp in resource subcategory name when searching for calendar 2016-08-18 11:42:50 -06:00
Ralf Becker
3752c35a5a add ajax=true to diverse admin pages of apps, changing customfields class to autoloadable admin_customfields (with old class extending new one, just in case), fix wrong English phrase "typ" in infolog 2016-08-12 11:35:30 +02:00
nathangray
b10c2d68fa Fix resource categories to work when first added from search results 2016-07-20 12:01:07 -06:00
nathangray
b039cccab5 Add a check to make sure $data is safe 2016-07-20 09:22:10 -06:00
nathangray
6d5f820b97 Add resource categories to owner / participant search results 
In the sidebox menu, resource categories are returned and selectable and will show events for all resources in that category.
In the edit popup, if the category name matches the search string, all resources of that category are returned and user can select them as if they would have searched for the name of the resource.
 2016-07-19 14:10:15 -06:00
Ralf Becker
2c238b7071 * PHP7/ImportExport: fix different evaluation order of PHP 5 and 7 gives eg. error "Function name must be string" in wizard 2016-07-07 20:25:32 +02:00
nathangray
94658a86fd Set ajax=true for resources global categories to load in div instead of iframe 2016-06-29 09:54:06 -06:00
Ralf Becker
4b75ed5e7f fix Scrutinizer "bugs" 2016-06-29 10:50:20 +02:00
Hadi Nategh
60f6f71430 Mobile template: 
- Fix links are not shown in view mode for infolog
- implement timesheet and resources view mode
 2016-06-21 16:37:35 +02:00
nathangray
726d2c3a51 Fix resource categories: 
- category admin is different from category owner
- fix error saving ACL
- fix missing column IDs, which prevented user from resizing or toggling some columns
 2016-06-13 20:35:43 -06:00