extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity
33,276 Commits 33 Branches 357 Tags 204 MiB
5d92310436
Commit Graph

588 Commits

Author SHA1 Message Date
Tomasz Jakubowski
5d92310436 Merge remote-tracking branch 'origin/patch-2' 2018-09-25 02:32:58 +02:00
Tomasz Jakubowski
0f485040b5
Corrected the field name from res_owner to res_creator. 
In database has only the res_creator column.
 2018-09-25 02:05:57 +02: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
Krzysztof Kaczmar
7881945c68 Some fixes in Polish language files 2018-07-23 14:01:10 +02: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
Ralf Becker
e5a7156544 Translations from Ilias Chasapakis 2018-05-14 18:55:38 +02:00
U-quokka\komaba
2da4ec91db update Japanese language files. 2018-05-12 08:24:38 +09:00
nathangray
ee5aba82f4 * Resources - fix 'Too few arguments' error when changing category of resource with accessories 2018-05-09 09:48:26 -06:00
Nathan Gray
470b989672
Merge pull request #38 from marcelklehr/feature/disable-cal-invitations-for-resources 
Allow disabling calendar invitations to resources
 2018-04-03 10:07:29 -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
Marcel Klehr
fb6cfee24c Allow disabling calendar invitations of resources 2018-03-19 16:58:44 +01:00
Ralf Becker
f21b13090f pending translations from our translation server 2017-11-04 09:36:02 +01:00
Ralf Becker
65b02c0246 bump verison to 17.1 2017-10-22 12:56:58 +02:00
nathangray
333ec7d1a8 Resources - change category admin to just user accounts, no groups 2017-10-13 09:51:39 -06: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
nathangray
1f2764c351 Resources - do not clear currently set calendar owners, add to what's selected 2017-06-12 12:35:43 -06:00
Ralf Becker
915f76e2e6 pending CS translations from Tony Kano (tw.mail-AT-quick.cz) 2017-03-16 12:40:18 +01:00
nathangray
c02c04509a Fix some missing Czech phrases 2017-03-15 08:48:15 -06:00
Ralf Becker
e2d25e741b pending CS and FR changes from our translation server 2017-03-15 11:54:24 +01:00
nathangray
608f9d1142 Some translation improvements from Stefan Unverricht 2017-02-27 11:14:31 -07:00
Hadi Nategh
c78042d522 Update PUBLIC ID of etemplate2.dtd in all templates 2017-02-01 09:59:37 +01: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
Hadi Nategh
e135b7272f * Mobile template: Fix customfields do not show up in view mode 2017-01-09 16:04:51 +01:00
nathangray
8599464e3b Handle show calendar if user did select all - fetch all IDs first 2016-10-18 11:09:39 -06: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
Ralf Becker
fdd2ac22c3 fix German translation 2016-08-11 18:03:06 +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
Hadi Nategh
2ae5097326 Mobile template: 
- Fix alignment of resources picture in view template
 2016-07-04 15:01:47 +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
83f2109e40 Mobile template: 
- Fix resources view template
- Add general avatar class for view mode
 2016-06-21 17:05:29 +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
c9cdf453fc Change cancel icon to match other dialogs 2016-06-15 09:27:06 -06: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
Ralf Becker
6c87e540d6 * Resources: fix PHP Fatal call to undefined method Api\Accounts::get_list() when editing ACL 2016-06-13 14:52:49 +02:00
Ralf Becker
0e212815bf fix deprecated warnings because of constructor named as class 2016-05-30 20:42:14 +02:00
nathangray
3253cce632 Update resources ACL UI 2016-05-26 15:32:00 -06:00
Ralf Becker
8a24f3e449 fix not loaded header / CSS, caused by missing echo before $GLOBALS['egw']->framework->(header|footer) 2016-05-14 21:26:36 +02:00
Nathan Gray
f550d4a503 In link_query conflict check decrement quantity available with real quantity used by calendar 2016-05-09 20:27:46 +00:00
Ralf Becker
251de1dc54 move category images to api, fixes PHP Fatal in admin_categories, if phpgwapi is not installed 2016-05-09 10:05:57 +00:00