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

640 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
87df342a89
Corrected the field name from res_owner to res_creator. 
In database has only the res_creator column.
 2018-09-25 02:07:43 +02:00
Tomasz Jakubowski
9ac5406ba2
Corrected the field name from res_owner to res_creator. 
In database has only the res_creator column.
 2018-09-25 02:07:00 +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
Nathan Gray
cedab0ab00 Move resources to new API 2016-05-05 20:22:04 +00:00
Nathan Gray
0eeb8b56c0 - Export plugins now specify the export record class 
- Projectmanager now has filters
 2016-05-04 19:34:30 +00:00
Hadi Nategh
62b3632073 Mobile theme: 
- Implement resources edit dialog
- Fix resources picture is not styled
- Fix mail subject column lost its width
- Implement new id representation for entries both on view and edit dialogs
 2016-05-04 10:02:16 +00:00
Nathan Gray
40fbf3e2c9 Update for resource selection to re-enable conflict detection 
- Remove account & contact options from default resource selection preference
- Edit dialog participant now passes selected start & duration, so conflict detection works again
 2016-04-29 18:01:17 +00:00
Ralf Becker
38412a1149 use new api in home and portlets 2016-04-28 18:06:46 +00:00
Nathan Gray
e88c3da6b8 Add missing placeholder (no rows) action 2016-04-26 23:11:29 +00:00
Ralf Becker
540b59a711 use new et2 config 2016-04-24 13:53:24 +00:00
Hadi Nategh
a6a3dc5250 Styling dialogs W.I.P.: 
- Remove all "Create new links" from link tabs
 2016-04-11 14:30:30 +00:00
Hadi Nategh
50aae863b6 Edit dialogs style W.I.P.: 
- Give tab widget new look
- Style grid header different
- Re-design calendar edit dialog
- Some fixes for multi et2_taglist
 2016-04-06 16:43:51 +00:00
Hadi Nategh
dbd97cd37a Mobile theme: 
- Eliminates some actions from contextmenu only on mobile
 2016-03-09 12:31:55 +00:00
Hadi Nategh
f5a6d52ae2 Mobile theme: 
- Implement apps color code
 2016-03-09 11:55:26 +00:00
Ralf Becker
45d4076798 fix resource to have new NM look 2016-03-08 15:49:30 +00:00
Hadi Nategh
34c2ed32b9 Mobile theme W.I.P: 
- Fix fontsize for infolog, timesheet, resources and addressbook
- Migrate mobile specific css classes into mobile theme for resources
 2016-03-04 13:27:07 +00:00
Nathan Gray
96ba38dbf8 Remove resources from calendar sidebox, new calendar owner widget covers it all 
(Also avoids the layout / sidebox size bug  on macs)
 2016-03-01 20:40:49 +00:00
Hadi Nategh
845e37e66d SVG images W.I.P.: 
- Add svg icons
- Implement color change for stylesheet2svg script
 2016-02-23 18:49:14 +00:00
Hadi Nategh
9332ce4a80 Mobile theme WIP: 
- Add plus button for all apps list views
 2016-01-14 10:56:48 +00:00
Hadi Nategh
358ac3e525 Mobile theme W.I.P.: 
- Fix resources image field
 2015-12-17 12:46:21 +00:00
Hadi Nategh
216aaeac17 Mobile theme W.I.P.: 
- Implement listview template for resources
 2015-12-15 14:34:58 +00:00
Nathan Gray
ceea9bd16c Dynamically load resources into tree when expanded 2015-12-09 16:53:26 +00:00
Nathan Gray
14cb62a7db Change resource selectbox in calendar side menu to a tree 2015-12-08 00:59:01 +00:00
Hadi Nategh
938c991124 WIP Egroupware tutorial: 
- Create tutorial sidebox hooks automatically
- Fix some styling for popup
- Display intro video show confirmation dialog based on session (login/logout)
 2015-10-19 15:00:42 +00:00
Hadi Nategh
aa6a362f16 WIP EGroupware Tutorial: 
- Add tutorials hook into other apps sidebar
 2015-10-16 10:39:38 +00:00
Ralf Becker
7b0ba9fb95 adding a "None" to resource selection in calendar, to allow to remove all resources from view 2015-10-08 19:57:29 +00:00
Nathan Gray
f0730feff1 Adapt resources view calendar action to work with et2 converted calendar 2015-08-11 22:32:05 +00:00
Ralf Becker
9ede2c0b70 WIP image upload via drag into ckeditor 4.5 2015-08-07 14:18:07 +00:00
Hadi Nategh
6abaf60a22 Fix click on resources picture in edit dialog doesn't open expose view 2015-04-09 10:48:45 +00:00
Hadi Nategh
8caca5580c Some Fixes for images view: 
-Fix images in listview, clicking on icons does not show the icons in expose view
-Fix images always stored as thumbnail and opening them in expose view does not open them in original size
-Clicking on thumbnail in details tab, will open the image in a popup with its original size
 2015-04-08 14:32:13 +00:00
Nathan Gray
047ee13253 Fix some missed details and simplifications in resource search options 2015-03-12 16:50:47 +00:00
Nathan Gray
255494fc20 Fix resource participant search conflict checking 2015-03-12 16:24:55 +00:00
Hadi Nategh
dd6a8f59bf Fix the sideboxmenu item "Resources list" opens nm in an iframe 2015-03-05 13:40:38 +00:00
Hadi Nategh
b0a4822a5b Fix the tab_height and historylog resize 2015-03-05 13:19:49 +00:00
Hadi Nategh
e844e1c77f Remove nm-sortheader from resources-image column 2015-02-24 16:43:47 +00:00
Ralf Becker
d432642f1a add encoding, eTempalte2 DTD and svn propset svn:keywords Id to all eTemplates 2015-02-17 09:55:05 +00:00
Ralf Becker
18fafed2a4 pending translations from our translation server 2015-02-17 08:52:58 +00:00
Ralf Becker
c54e69977a fix alignment of favorites in resources list 2015-02-14 08:36:41 +00:00
Hadi Nategh
ca44f843c3 Remove tag css specification for et2_container in resources 2015-02-06 14:12:11 +00:00
Ralf Becker
9b093562b4 remove div.et2_container in favor of just .et2_container, as we use a from now 2015-02-04 08:35:40 +00:00
Nathan Gray
5d36da8062 Check to make sure found resource is an array instead of a column flag. 
Fixes fatal error when deleting a category.
 2015-01-27 22:43:17 +00:00
Hadi Nategh
8d0857f9bf Fix expose view in for thumbnails in resources app 
- Remove image_toolbar; image_toolbar is deprecated, and replaced by expose_view feature.
 2015-01-20 15:11:45 +00:00
Hadi Nategh
4fa44e6482 Reorder and add missing phrases in lang files 2015-01-15 14:53:34 +00:00
Nathan Gray
d51c83402d Set default columns 2015-01-12 19:59:25 +00:00
Ralf Becker
7346a37998 cleaning up old addressbook stuff 2015-01-10 09:51:51 +00:00
Nathan Gray
244e859413 More Home progress: 
- Add support for resources favorites
 2014-11-28 19:43:37 +00:00
Nathan Gray
ea8ff86854 Add a method to get an icon for a record, as specific to that record as possible 2014-11-18 23:40:49 +00:00
Nathan Gray
2f53633dca * Switch to nextmatch and edit dialog for customfield list 2014-10-22 19:55:27 +00:00
Hadi Nategh
0f9adabe4a * Resources: Avoid clicking on images on the list view to not opening images in an extra window/tab but in a tooltip popup inside the list 2014-09-29 16:34:16 +00:00
Hadi Nategh
43e0818df1 Give recources thumbnail auto height as pixelegg has fixed height and it causes to deform the image size 2014-08-27 09:12:54 +00:00
Hadi Nategh
76830f71af * Resources/list: Fix thumbnails size in resources' listview 2014-08-27 08:12:57 +00:00