gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-07 15:44:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,453 Commits 7 Branches 80 Tags 38 MiB
504cfe6d3e
Commit Graph

1222 Commits

Author SHA1 Message Date
Uwe Steinmann
f859b48a57 Merge branch 'seeddms-5.0.x' into develop 2016-03-09 06:42:30 +01:00
Uwe Steinmann
dc3958b456 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-09 06:40:14 +01:00
Uwe Steinmann
7280668f91 add admin script for mass importing files from file system 2016-03-08 18:35:39 +01:00
Uwe Steinmann
60edc144e4 show folders if showfolders is set 2016-03-08 18:34:34 +01:00
Uwe Steinmann
96db0eb052 dropfolderchoose can select folders 2016-03-08 18:33:54 +01:00
Uwe Steinmann
835b16cb07 take out file deletion 2016-03-08 17:23:45 +01:00
Uwe Steinmann
5471c17b0f better check if reviewer/approver still exist 2016-03-08 16:07:42 +01:00
Uwe Steinmann
3031596312 replace old UI:: function calls 2016-03-08 14:59:04 +01:00
Uwe Steinmann
aca3db06c2 Merge branch 'seeddms-5.0.x' into develop 2016-03-08 10:46:16 +01:00
Uwe Steinmann
91e57e49da Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-08 10:42:21 +01:00
Uwe Steinmann
22aa803984 output some translations used in js code 2016-03-08 10:40:01 +01:00
Uwe Steinmann
d67132f090 set formtoken on draggable documents/folders 2016-03-08 10:39:21 +01:00
Uwe Steinmann
e9c116cd7a object title in clipboard is not draggable 2016-03-08 08:01:41 +01:00
Uwe Steinmann
4bd2a9f766 Merge branch 'seeddms-5.0.x' into develop 2016-03-08 07:00:09 +01:00
Uwe Steinmann
4a45fb2e42 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-08 06:59:18 +01:00
Uwe Steinmann
6098fc9057 much cleaner drap&drop support 2016-03-08 06:56:58 +01:00
Uwe Steinmann
691565473d do not output 'this category is used' for new category 2016-03-04 16:06:19 +01:00
Uwe Steinmann
535012f844 add column with role 2016-03-04 16:01:40 +01:00
Uwe Steinmann
85ac4314f5 check if SeedDMS_Aco::getRoot() returns objects 2016-03-04 15:45:59 +01:00
Uwe Steinmann
dcc3d9e74c take out debug output 2016-03-04 12:59:56 +01:00
Uwe Steinmann
82ac006a13 add many access checks before showing a link 2016-03-04 09:40:08 +01:00
Uwe Steinmann
06346b956c check access for action info 2016-03-04 09:39:22 +01:00
Uwe Steinmann
795f03f8b8 add column with role 2016-03-04 09:38:37 +01:00
Uwe Steinmann
304a5d804e use same user list as for Acl manager 2016-03-04 09:38:01 +01:00
Uwe Steinmann
1175f6f9c5 list all users with the selected role 2016-03-04 09:36:44 +01:00
Uwe Steinmann
f84c8eedd2 add parameter to turn off/on advanced acl 2016-03-04 09:25:18 +01:00
Uwe Steinmann
51fa5d18e6 enhance AccessOperation by check_view_access() 
all methods in SeedDMS_AccessOperation take the object to be checked
as the first parameter. Add new method check_view_access() which
checks if a view may be accessed based on the tables tblAros, tblAcos,
tblArosAcos
 2016-03-03 07:39:04 +01:00
Uwe Steinmann
e089cc898c add button for adding missing aro 2016-03-03 07:08:42 +01:00
Uwe Steinmann
a8d615071e minor style changes, set propper url to modify permissions 2016-02-29 14:07:44 +01:00
Uwe Steinmann
677534c8ec add files for managing access control lists 2016-02-29 11:18:55 +01:00
Uwe Steinmann
ce57466695 Merge branch 'seeddms-5.0.x' into develop 2016-02-29 08:43:31 +01:00
Uwe Steinmann
62095c443b override exiting query parameter 'action' when including js code 2016-02-29 08:36:10 +01:00
Uwe Steinmann
5f610c4049 Merge branch 'seeddms-5.0.x' into develop 2016-02-26 09:22:25 +01:00
Uwe Steinmann
fe9ac278c7 list all registered hooks 2016-02-26 09:22:06 +01:00
Uwe Steinmann
21c7068341 Merge branch 'seeddms-5.0.x' into develop 2016-02-25 10:57:27 +01:00
Uwe Steinmann
d984f75871 set $objvalue in printAttributeEditField() 2016-02-25 10:49:18 +01:00
Uwe Steinmann
7099dc6d73 set $openfilterdlg before accordion for export 2016-02-25 10:43:14 +01:00
Uwe Steinmann
fcd4b23710 add button for role management 2016-02-24 14:58:27 +01:00
Uwe Steinmann
489f464163 add link to role management in menu 2016-02-24 14:44:58 +01:00
Uwe Steinmann
3d76792239 add management of roles 2016-02-24 14:36:59 +01:00
Uwe Steinmann
49be0485c5 role is now an instance of SeedDMD_Core_Role 2016-02-24 14:35:37 +01:00
Uwe Steinmann
d4e28ec735 get timeout from view 2016-02-19 08:04:45 +01:00
Uwe Steinmann
314906adf3 fix document chooser 2016-02-17 11:56:00 +01:00
Uwe Steinmann
067890345e Merge branch 'seeddms-5.0.x' into develop 2016-02-17 11:44:25 +01:00
Uwe Steinmann
199ba46ce8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-17 11:43:42 +01:00
Uwe Steinmann
a15b83dc99 add setting header of javascript file 2016-02-17 11:43:19 +01:00
Uwe Steinmann
0f991c2dc1 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-17 11:39:09 +01:00
Uwe Steinmann
a691c9628c remove extra variable in print[Document|Folder]ChooserJs() for modal form 2016-02-17 11:38:32 +01:00
Uwe Steinmann
3907431369 split printFolderChooser() for library folder into js and html part 2016-02-17 11:35:42 +01:00
Uwe Steinmann
179af06438 split printFolderChooser() for home folder into js and html 2016-02-17 11:35:01 +01:00
Uwe Steinmann
ee613233db add missing arguments to printDocumentChooser() 2016-02-17 11:12:19 +01:00
Uwe Steinmann
bc608eff07 Merge branch 'seeddms-5.0.x' into develop 2016-02-15 20:45:05 +01:00
Uwe Steinmann
202d994e1c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 17:08:01 +01:00
Uwe Steinmann
e9f185533c do not show substitute user button if not admin or same user 2016-02-15 15:23:29 +01:00
Uwe Steinmann
54df39ba81 pass timeout to view and previewer 2016-02-15 10:57:37 +01:00
Uwe Steinmann
a7c8d36720 use same var name as for all other views 2016-02-15 10:41:33 +01:00
Uwe Steinmann
47a72cc2db move js for sending test mail into view 2016-02-15 09:27:44 +01:00
Uwe Steinmann
c01a84cfb7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 08:24:39 +01:00
Uwe Steinmann
68d9e05931 do not show values if not set, add type to list of attributes 2016-02-11 17:47:40 +01:00
Uwe Steinmann
6c7648b75a use getDocumentList() instead of plain sql 2016-02-10 13:34:25 +01:00
Uwe Steinmann
d62d6f5662 do not use sql but call getDocumentList() 2016-02-10 12:31:17 +01:00
Uwe Steinmann
2a5a2cd61d Merge branch 'seeddms-5.0.x' into develop 2016-02-10 11:49:15 +01:00
Uwe Steinmann
43c80a9f73 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-10 11:48:19 +01:00
Uwe Steinmann
2e6511ebec replace phrase 'documents_to_check' by 'documents_to_process' 2016-02-10 10:34:44 +01:00
Uwe Steinmann
65ce04d175 show pending reviews/approvals/workflows only for configured workflow mode 2016-02-10 10:34:02 +01:00
Uwe Steinmann
82e839bb11 list pending approval/reviews/workflows only for configured workflow mode 2016-02-10 10:32:58 +01:00
Uwe Steinmann
c0a1ed57bb list documents in workflow, add button to substitute user 2016-02-10 10:04:24 +01:00
Uwe Steinmann
c15b7c4802 take out commented code 2016-02-10 10:03:56 +01:00
Uwe Steinmann
75183a9d36 check experation and set status accordingly before listing documents 2016-02-09 17:33:23 +01:00
Uwe Steinmann
be640b811d Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-09 12:36:53 +01:00
Uwe Steinmann
7640660284 make deletion of folders and documents work 2016-02-09 12:36:19 +01:00
Uwe Steinmann
ffdcbd0ce0 make click on .delete-document-btn and .delete-folder-btn work 
even if the html is loaded by ajax
 2016-02-09 12:35:30 +01:00
Uwe Steinmann
a72063c36a add missing parameter in call to printKeywordChooserJs() 2016-02-09 08:51:27 +01:00
Uwe Steinmann
2da2f0af9a Merge branch 'seeddms-5.0.x' into develop 2016-02-08 13:24:40 +01:00
Uwe Steinmann
0903eacb62 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-08 12:46:59 +01:00
Uwe Steinmann
450ca9953e some code cleanup and no output if there are no dumps 2016-02-08 12:43:50 +01:00
Uwe Steinmann
911c7895d9 get some view parameter in js() 
this fixes some php warnings
 2016-02-08 10:40:29 +01:00
Uwe Steinmann
08831349dd fix syntax error 2016-02-05 17:31:29 +01:00
Uwe Steinmann
44a90c0263 use ajax calls and put all javascript into method js() 2016-02-05 17:26:45 +01:00
Uwe Steinmann
20f1de9a3f replace sql statements with method calls in SeedDMS_Core 2016-02-05 16:49:27 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +01:00
Uwe Steinmann
b04571da11 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-04 19:13:06 +01:00
Uwe Steinmann
8b6631da6a folderListRow() doesn't need folder from view 2016-02-04 19:03:48 +01:00
Uwe Steinmann
a733ee3bd4 complete rewritten attribute manager 2016-02-04 19:03:19 +01:00
Uwe Steinmann
2317c092d6 fix setting default search method 
the search form in the main menu will just set 'fulltext=1' if
fulltext is the default method. out/out.Search.php will not
check for the defaultSearchMethod
 2016-02-03 14:46:06 +01:00
Uwe Steinmann
76f5a89f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-02 09:48:18 +01:00
Uwe Steinmann
a8a86193af unfold tree if folder is selected 2016-02-02 09:41:31 +01:00
Uwe Steinmann
4dce5d7ab3 help and default search method be set 2016-02-01 19:57:08 +01:00
Uwe Steinmann
0ca91816b5 pass strictformcheck to view, fix undefined variable error 2016-02-01 19:56:13 +01:00
Uwe Steinmann
7dc478382f initial support for auto login of guest user 2016-01-29 16:48:21 +01:00
Uwe Steinmann
52344c0842 fix Content-Type for javascript code 2016-01-28 16:50:06 +01:00
Uwe Steinmann
5abe031222 put javascript into a separate file 2016-01-28 15:04:14 +01:00
Uwe Steinmann
3f0a455260 put javascript into separate file 2016-01-28 14:56:23 +01:00
Uwe Steinmann
e9be5cc115 put all javascript into its own file 2016-01-28 13:38:12 +01:00
Uwe Steinmann
e7a6ebb8ce put javascript into separate file 2016-01-28 13:37:16 +01:00
Uwe Steinmann
b2ccf18db7 fix possible xss attack 2016-01-28 13:36:07 +01:00
Uwe Steinmann
36602ff54a add js() in view which turns CSP on 2016-01-27 17:33:40 +01:00
Uwe Steinmann
51f80c0930 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-27 17:23:22 +01:00
Uwe Steinmann
5ffbfbb898 list all docs in workflow owned by me and required operation by me 2016-01-27 17:11:29 +01:00
Uwe Steinmann
41d6f05f88 choose mandatory workflow from list if more than 1 workflow is possible 2016-01-27 16:20:51 +01:00
Uwe Steinmann
380c916c66 a list of mandatory workflows can be set 2016-01-27 16:20:12 +01:00
Uwe Steinmann
2e620fa622 add missing column header in group list 2016-01-27 06:50:11 +01:00
Uwe Steinmann
7efe61a059 add line break between users being active on a workflow 2016-01-27 06:49:19 +01:00
Uwe Steinmann
371bd08e38 escape user names to prevent xss attacks 2016-01-27 06:48:39 +01:00
Uwe Steinmann
5256aa0457 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-25 09:39:47 +01:00
Uwe Steinmann
6ce9be7fd5 take back in js for file upload 2016-01-25 09:36:19 +01:00
Uwe Steinmann
f71ea7eddc do not add js function checkTasks() to footer anymore 2016-01-19 10:10:15 +01:00
Uwe Steinmann
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +01:00
Uwe Steinmann
9da4d9f3db Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-16 07:17:32 +01:00
Uwe Steinmann
07f5512c9a add csp header only if view->js() is defined 2015-12-16 07:16:16 +01:00
Uwe Steinmann
d6c393dede use div.splash instead of calling noty() for message of missing 
translations
 2015-12-16 07:14:13 +01:00
Uwe Steinmann
a71cb01c85 ??? 2015-12-16 07:14:04 +01:00
Uwe Steinmann
8cbf645014 use div.splash instead of calling noty() for message of missing 
translations
 2015-12-16 06:36:20 +01:00
Uwe Steinmann
1acad75f83 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-15 21:04:45 +01:00
Uwe Steinmann
bdc3a28dcf seperate javascript from html 2015-12-15 21:02:47 +01:00
Uwe Steinmann
dfeac6843f no need for $user in js() 2015-12-15 21:02:14 +01:00
Uwe Steinmann
3f778f9a77 seperate html from javascript to make content security policy possible 2015-12-14 15:16:32 +01:00
Uwe Steinmann
29f4ca0710 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-14 12:09:16 +01:00
Uwe Steinmann
5f85b2290a do not access view parameter 'folder' in js() 2015-12-14 11:47:11 +01:00
Uwe Steinmann
c0fa5d9cc6 fix link to Search.php, add missing params to printFolderChooser() 2015-12-14 11:45:56 +01:00
Uwe Steinmann
8cc2d4d9ab change all links to op/op.Search.php to out/out.Search.php 2015-12-14 10:48:56 +01:00
Uwe Steinmann
b21237e87a seperate html from javascript 2015-12-14 09:53:42 +01:00
Uwe Steinmann
253075e418 return just the html to be embedded into a existing page 2015-12-14 09:51:51 +01:00
Uwe Steinmann
c3fddd209d seperate folder chooser in html and javascript 2015-12-14 09:50:49 +01:00
Uwe Steinmann
dcd973cb67 seperate html from javascript 2015-12-14 09:48:25 +01:00
Uwe Steinmann
85e9dc25bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-11 20:35:20 +01:00
Uwe Steinmann
836fcd4457 remove all javascript from html output and place in a seperate file 
this requires to change the popover into bootbox
 2015-12-11 20:29:52 +01:00
Uwe Steinmann
4a23bd9eca rename css() to js() 2015-12-11 08:21:04 +01:00
Uwe Steinmann
5387401098 major rewrite to make it csp ready 
place all javascript in a javascript file
 2015-12-11 08:14:42 +01:00
Uwe Steinmann
940102f72f add csp headers, place div.splash instead of calling noty() 2015-12-11 08:13:05 +01:00
Uwe Steinmann
e4ba3b44a8 rewrote using ajax (like UsrMgr) 2015-12-10 12:43:42 +01:00
Uwe Steinmann
d493715ae8 simplify some old javascript code 2015-12-10 12:43:19 +01:00
Uwe Steinmann
569fa62737 fix link to receipt or revise a document 2015-12-10 10:30:50 +01:00
Uwe Steinmann
65a1ba9102 fix links in task menu 2015-12-10 09:24:46 +01:00
Uwe Steinmann
6b95229ff7 Merge branch 'seeddms-5.0.x' into develop 2015-12-09 21:54:02 +01:00
Uwe Steinmann
9c0fe92998 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-09 18:04:12 +01:00
Uwe Steinmann
ffc709c557 set individual recipients from group 2015-12-08 09:00:42 +01:00
Uwe Steinmann
52b64822c5 show name of volume for checkout 2015-12-08 09:00:04 +01:00
Uwe Steinmann
e47d84071d attributes of type checkbox can be reset 
added a hidden field in printAttributeEditField() to set the value of
a checkbox to 0 if it not set.
 2015-12-04 08:02:02 +01:00
Uwe Steinmann
7d88617964 individual approver/reviewer can be take from group 2015-12-04 08:00:50 +01:00
Uwe Steinmann
3e4e27f236 Merge branch 'seeddms-5.0.x' into develop 2015-12-03 15:10:34 +01:00
Uwe Steinmann
423ef654c4 fix output of checkboxes in printAttributeEditField() 2015-12-03 15:08:12 +01:00
Uwe Steinmann
f7b2d5b6d6 use the checkout space of the logged in user not the substituted user 2015-12-01 18:06:41 +01:00
Uwe Steinmann
348d40ad22 show filename as saved in database table 2015-11-30 20:47:07 +01:00
Uwe Steinmann
1f77a749be Merge branch 'seeddms-5.0.x' into develop 2015-11-27 16:09:11 +01:00
Uwe Steinmann
881925d201 fix link to FolderNotify when logged in as normal user 2015-11-27 15:45:01 +01:00
Uwe Steinmann
3d0e970760 Merge branch 'seeddms-5.0.x' into develop 2015-11-23 21:58:21 +01:00
Uwe Steinmann
6b5a39756c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-23 21:58:09 +01:00
Uwe Steinmann
8af9338ed5 add missing file 2015-11-19 17:38:30 +01:00
Uwe Steinmann
d04e65108d Merge branch 'seeddms-5.0.x' into develop 2015-11-19 08:00:10 +01:00
Uwe Steinmann
9d763b60a5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-19 07:59:34 +01:00
Uwe Steinmann
2f15d75508 set end date to end of day if day is set 2015-11-19 07:16:46 +01:00
Uwe Steinmann
f5bf326605 check if getTimeLine() returns data 2015-11-19 06:43:36 +01:00
Uwe Steinmann
f33f7ab41a Merge branch 'seeddms-5.0.x' into develop 2015-11-16 21:58:04 +01:00
Uwe Steinmann
bf6ddb71e6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-16 09:19:11 +01:00
Uwe Steinmann
6d16946a19 show more information of selected document 2015-11-16 08:35:06 +01:00
Uwe Steinmann
c22b22f49a Merge branch 'seeddms-5.0.x' into develop 2015-11-15 17:36:45 +01:00
Uwe Steinmann
e12e7ff95c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-11 10:30:24 +01:00
Uwe Steinmann
7211f4b10a show status log 2015-11-11 10:29:49 +01:00
Uwe Steinmann
14d79338de Merge branch 'seeddms-5.0.x' into develop 2015-10-30 16:16:24 +01:00
Uwe Steinmann
4db52aeee9 make sure to offer all attr types in dropdown menu 2015-10-30 16:15:32 +01:00
Uwe Steinmann
a30b3b9505 Merge branch 'seeddms-5.0.x' into develop 2015-10-30 13:09:25 +01:00
Uwe Steinmann
5b0dd0c643 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-30 13:08:41 +01:00
Uwe Steinmann
b8638a188b add translation for attribute types 2015-10-30 08:49:44 +01:00
Uwe Steinmann
50e0d2a885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-30 08:41:40 +01:00
Uwe Steinmann
15b1414d6e set format in date field to yyyy-mm-dd 2015-10-30 08:02:57 +01:00
Uwe Steinmann
74a248d592 allow to edit 'date' and 'boolean' attributes 2015-10-30 08:02:21 +01:00
Uwe Steinmann
2f9c09a559 add new attr type 'date' 2015-10-30 08:01:37 +01:00
Uwe Steinmann
36578b267d pass currently set language to timeline 2015-10-28 08:19:13 +01:00
Uwe Steinmann
50478ee3c7 use textarea for attribute field values if value > 80 chars 2015-10-28 08:18:25 +01:00
Uwe Steinmann
f78e02e7e8 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 11:43:40 +01:00
Uwe Steinmann
b7d1b0e663 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-27 11:42:39 +01:00
Uwe Steinmann
aa1f10af1c add word-break class to output of orig filename 
breaking long filenames will leave more space for the preview image
 2015-10-27 11:41:02 +01:00
Uwe Steinmann
50ef190ae7 Merge branch 'seeddms-5.0.x' into develop 2015-10-27 09:03:45 +01:00
Uwe Steinmann
15040a2f92 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:36:57 +02:00
Uwe Steinmann
af91b6813f do not use reference to array item, use index 2015-10-20 18:36:24 +02:00
Uwe Steinmann
031129a31c Merge branch 'seeddms-5.0.x' into develop 2015-10-20 18:21:47 +02:00
Uwe Steinmann
2f9e015856 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-10-20 18:20:24 +02:00
Uwe Steinmann
47c2083fe6 do not set min/max anymore as it can't be changed afterwards 2015-10-20 18:15:08 +02:00
Uwe Steinmann
f83ae3eda1 printTimeline() retrieves data from ajax 2015-10-19 13:15:52 +02:00
Uwe Steinmann
88e0a57135 add ajax function for returning the timeline data 2015-10-19 13:15:20 +02:00
Uwe Steinmann
002fa8df29 get timeline data in ajax call 2015-10-19 13:14:14 +02:00
Uwe Steinmann
7ba956d760 Merge branch 'seeddms-5.0.x' into develop 2015-09-30 12:10:39 +02:00
Uwe Steinmann
c17d7246ad call hook for setting msg of timeline item 2015-09-29 12:12:01 +02:00
Uwe Steinmann
ddfea8f3cb Merge branch 'seeddms-5.0.x' into develop 2015-09-28 12:35:18 +02:00
Uwe Steinmann
1ab19f6831 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 12:35:04 +02:00
Uwe Steinmann
23362f8146 remove old code, set data-query in div.ajax elements 
load an initial user when the page is opened
 2015-09-25 16:17:23 +02:00
Uwe Steinmann
fd92628c30 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 18:11:17 +02:00
Uwe Steinmann
d43dc75207 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 18:05:47 +02:00
Uwe Steinmann
ca3970c9c3 fix setting date in timeline 2015-09-23 18:05:30 +02:00
Uwe Steinmann
4012122e5e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 18:00:16 +02:00
Uwe Steinmann
dba8e78dc8 reformat datetime for timeline 2015-09-23 17:59:39 +02:00
Uwe Steinmann
37f9771b97 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 17:21:26 +02:00
Uwe Steinmann
874066a7fc Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 17:21:17 +02:00
Uwe Steinmann
b456b02fbd add timeline to admin menu 2015-09-23 17:11:09 +02:00
Uwe Steinmann
42dbb30e22 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 16:03:15 +02:00
Uwe Steinmann
659f788de4 do not show subheader of timeline if empty 2015-09-23 15:50:04 +02:00
Uwe Steinmann
42b5162ca4 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 14:43:13 +02:00
Uwe Steinmann
10c5086307 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 14:13:56 +02:00
Uwe Steinmann
617d18d7d1 timeline can be filtered by type of items 2015-09-23 14:12:30 +02:00
Uwe Steinmann
06691a7d6f set className of items in timeline 2015-09-23 14:12:07 +02:00
Uwe Steinmann
c7e0702c97 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 12:59:53 +02:00
Uwe Steinmann
bf0702709e show creation date in info section 2015-09-23 12:57:49 +02:00
Uwe Steinmann
b0edf297a2 Merge branch 'seeddms-5.0.x' into develop 2015-09-22 16:01:09 +02:00
Uwe Steinmann
58731cfdde Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 15:59:47 +02:00
Uwe Steinmann
88d973f496 turn off selectable items in timeline 2015-09-22 10:55:52 +02:00
Uwe Steinmann
6a91429711 do not output timeline if no data is available 2015-09-22 10:32:33 +02:00
Uwe Steinmann
9db24f5e7d set height of timeline to 300px, limit max date to today 2015-09-22 10:20:11 +02:00
Uwe Steinmann
619d2b5ca3 limit timeline to date range 2015-09-22 10:16:56 +02:00
Uwe Steinmann
c8b007a1af timeline can be limited to date range 2015-09-22 10:16:26 +02:00
Uwe Steinmann
fcbb5f68fe Merge branch 'seeddms-5.0.x' into develop 2015-09-22 08:51:59 +02:00
Uwe Steinmann
272d9a43ee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 18:10:07 +02:00
Uwe Steinmann
94dbfdfd15 set msg of item in timeline to name of document 2015-09-21 18:09:30 +02:00
Uwe Steinmann
f82dc7558b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 17:25:56 +02:00
Uwe Steinmann
a326421ac2 take out today from timeline 2015-09-21 17:20:10 +02:00
Uwe Steinmann
1de65573ec make chart for timeline higher 2015-09-21 17:19:52 +02:00
Uwe Steinmann
6be0d179fc Merge branch 'seeddms-5.0.x' into develop 2015-09-21 16:58:25 +02:00
Uwe Steinmann
229d976113 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-21 16:58:14 +02:00
Uwe Steinmann
a7736397a8 pass $timeline instead of $document to printTimeline() 2015-09-21 16:47:47 +02:00
Uwe Steinmann
fc909100d2 add link to timeline, move version info into last line 2015-09-21 16:47:05 +02:00
Uwe Steinmann
c385d86a60 add timeline over all documents 2015-09-21 16:46:17 +02:00
Uwe Steinmann
d54172d366 Merge branch 'seeddms-5.0.x' into develop 2015-09-18 08:00:06 +02:00
Uwe Steinmann
8ab6dda490 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-18 07:59:15 +02:00
Uwe Steinmann
1004d5f1ee separate extraheader by js and css, only admins see timeline 2015-09-18 07:55:24 +02:00
Uwe Steinmann
71ba7412ce split extraheader into js and css, msg in timeline can be translated 2015-09-18 07:53:20 +02:00
Uwe Steinmann
b55627f213 add initial support for timeline of recent changes 2015-09-16 21:19:46 +02:00
Uwe Steinmann
f11738fbb1 show preview of file and date of creation 2015-09-03 15:16:20 +02:00
Uwe Steinmann
5a534e6b71 use translation for text when modal boxes are loading its content 2015-09-03 15:15:12 +02:00
Uwe Steinmann
07053ca7e9 check for includecontent checkbox and pass it to url 2015-08-25 16:44:07 +02:00
Uwe Steinmann
8c0377aa39 Merge branch 'seeddms-5.0.x' into develop 2015-08-21 11:10:23 +02:00
Uwe Steinmann
2be77ac0e9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-21 11:10:05 +02:00
Uwe Steinmann
8256b61e36 do not output info if no user is selected 2015-08-21 11:09:38 +02:00
Uwe Steinmann
b7de0f61c7 Merge branch 'seeddms-5.0.x' into develop 2015-08-20 22:38:08 +02:00
Uwe Steinmann
cd3ca37885 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 22:37:50 +02:00
Uwe Steinmann
0ae71871ef fix php warning in getProgressBar() 2015-08-20 16:22:05 +02:00
Uwe Steinmann
6e80f025cf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 15:55:53 +02:00
Uwe Steinmann
26819ce00e add method info(), place output of info below user selection 2015-08-20 15:55:03 +02:00
Uwe Steinmann
139b498d14 use new method getProgressBar() 2015-08-20 15:54:40 +02:00
Uwe Steinmann
ca32bc856e add method getProgressBar() 2015-08-20 15:52:46 +02:00
Uwe Steinmann
f59751aa14 set data-view and data-action in div.ajax tag instead of data-href 2015-08-20 14:52:36 +02:00
Uwe Steinmann
e97de9c6df Merge branch 'seeddms-5.0.x' into develop 2015-08-19 20:16:40 +02:00
Uwe Steinmann
784081b5d3 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 20:16:26 +02:00
Uwe Steinmann
c4e80969ea no need to count folders and documents anymore 2015-08-19 20:15:45 +02:00
Uwe Steinmann
58413e5218 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 09:24:20 +02:00
Uwe Steinmann
cde8e830f5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 09:24:05 +02:00
Uwe Steinmann
ee5d01a1ee preset $placeholder to '' 2015-08-19 09:20:06 +02:00
Uwe Steinmann
4b94100cbe set users for showForm 2015-08-19 09:19:24 +02:00
Uwe Steinmann
4c6eb18528 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 06:09:20 +02:00
Uwe Steinmann
83fbab5149 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 06:05:48 +02:00
Uwe Steinmann
4358eb9a39 load form for user on demand via ajax 2015-08-18 22:45:51 +02:00