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
5,094 Commits 7 Branches 80 Tags 38 MiB
f4648a7023
Commit Graph

426 Commits

Author SHA1 Message Date
Uwe Steinmann
4a327be618 put warning for missing translation into container and row 2016-05-24 07:46:34 +02:00
Uwe Steinmann
38f02a149e Merge branch 'seeddms-5.0.x' into develop 2016-05-03 06:40:50 +02:00
Uwe Steinmann
129b725414 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-03 06:32:54 +02:00
Uwe Steinmann
5d25720ec9 add new operation to clear cache completely 2016-04-28 07:51:42 +02:00
Uwe Steinmann
e527a6d176 fix access check and add new debug menu item 2016-04-13 08:51:03 +02:00
Uwe Steinmann
fb73b9c922 get $user from view in mainMenu() 2016-04-12 07:55:15 +02:00
Uwe Steinmann
552c3b4d98 Merge branch 'seeddms-5.0.x' into develop 2016-04-05 10:05:05 +02:00
Uwe Steinmann
c982a23a32 call hook userMenuItems() 2016-04-05 09:42:46 +02:00
Uwe Steinmann
7d50c6e69d Merge branch 'seeddms-5.0.x' into develop 2016-03-31 11:19:36 +02:00
Uwe Steinmann
8cd3e6cada Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-31 11:17:47 +02:00
Uwe Steinmann
5c32c6edbe replace '<?=' by '<?php echo' 2016-03-30 14:16:23 +02:00
Uwe Steinmann
ebb53440df remove some old code, mark code as deprecated 2016-03-29 08:32:32 +02:00
Uwe Steinmann
2c297b5e1c take out javascript from html (Closes #253) 2016-03-29 07:59:20 +02:00
Uwe Steinmann
8b1effc2f3 Merge branch 'seeddms-5.0.x' into develop 2016-03-23 12:36:47 +01:00
Uwe Steinmann
d398f7733f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-23 12:34:50 +01:00
Uwe Steinmann
942de6cfee new style add-clipboard-area for receiving drop events 
add new class to menu item for clipboard which allows to easily
drop an item into the clipboard even if the clipboard itself
isn't visible
 2016-03-23 08:54:34 +01:00
Uwe Steinmann
f2b091cb83 Merge branch 'seeddms-5.0.x' into develop 2016-03-21 07:41:30 +01:00
Uwe Steinmann
c1f698c0cf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-21 07:41:19 +01:00
Uwe Steinmann
8daa5dadea add printSelectPresetButton[Html|Js]() 
button for preseting options is a select box
 2016-03-21 07:40:17 +01:00
Uwe Steinmann
1cd5622ca0 add missing space 2016-03-18 22:48:45 +01:00
Uwe Steinmann
361b63256f Merge branch 'seeddms-5.0.x' into develop 2016-03-18 16:17:17 +01:00
Uwe Steinmann
f7883f9154 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-18 16:07:47 +01:00
Uwe Steinmann
ca6f0303b2 put javascript into its own file and turn on content security policy 2016-03-18 15:33:18 +01:00
Uwe Steinmann
7bd77ba43e Merge branch 'seeddms-5.0.x' into develop 2016-03-15 08:50:32 +01:00
Uwe Steinmann
fc0b7a4e16 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-03-15 08:48:03 +01:00
Uwe Steinmann
d283c24979 put footnote into row-fluid 2016-03-15 08:28:23 +01:00
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
96db0eb052 dropfolderchoose can select folders 2016-03-08 18:33:54 +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
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
82ac006a13 add many access checks before showing a link 2016-03-04 09:40:08 +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
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
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
489f464163 add link to role management in menu 2016-02-24 14:44:58 +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
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
ee613233db add missing arguments to printDocumentChooser() 2016-02-17 11:12:19 +01:00
Uwe Steinmann
2a5a2cd61d Merge branch 'seeddms-5.0.x' into develop 2016-02-10 11:49:15 +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
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
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
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
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
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
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
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
c0fa5d9cc6 fix link to Search.php, add missing params to printFolderChooser() 2015-12-14 11:45:56 +01:00
Uwe Steinmann
c3fddd209d seperate folder chooser in html and javascript 2015-12-14 09:50:49 +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
940102f72f add csp headers, place div.splash instead of calling noty() 2015-12-11 08:13:05 +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
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
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
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
a30b3b9505 Merge branch 'seeddms-5.0.x' into develop 2015-10-30 13:09:25 +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
74a248d592 allow to edit 'date' and 'boolean' attributes 2015-10-30 08:02:21 +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
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
f83ae3eda1 printTimeline() retrieves data from ajax 2015-10-19 13:15:52 +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
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
06691a7d6f set className of items in timeline 2015-09-23 14:12:07 +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
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
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
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
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
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
5a534e6b71 use translation for text when modal boxes are loading its content 2015-09-03 15:15:12 +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
ca32bc856e add method getProgressBar() 2015-08-20 15:52:46 +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
69e262cea3 save state of jqtree widget 
has no effect currently
 2015-08-18 22:39:30 +02:00
Uwe Steinmann
4c907dbf9e Merge branch 'seeddms-5.0.x' into develop 2015-08-07 20:08:29 +02:00
Uwe Steinmann
6d8930a360 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-07 14:30:07 +02:00
Uwe Steinmann
d7223bc521 fix link to downloadable file in printProtocol() 2015-08-07 14:29:32 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
6060f1e98e new parameter $base for htmlStartPage(), propperly can hook in documentMenu 2015-07-15 22:32:19 +02:00
Uwe Steinmann
245bcc6a1e run hook folderNavigationMenu 2015-07-15 22:09:47 +02:00
Uwe Steinmann
8ed3264ae6 run hook folderNavigationMenu 2015-07-15 22:08:59 +02:00
Uwe Steinmann
a6d8ed829f add new parameter $base to htmlStartPage(), call hook for documentMenu propperly 2015-07-15 17:00:23 +02:00
Uwe Steinmann
1609610541 pass previewer to printClipboard, call hook for menuitems, ... 
backported from develop
 2015-07-15 07:24:32 +02:00
Uwe Steinmann
9604076555 printAttributeEditField() can be passed a default value 
document menu can be extended by a hook
 2015-07-14 21:27:41 +02:00
Uwe Steinmann
a6541296a1 list documents to receipt and revise in menu task list 2015-07-09 18:29:34 +02:00
Uwe Steinmann
59fd3c7170 add missing space between tag attributes 2015-07-09 08:01:21 +02:00
Uwe Steinmann
b8e9d3a6dd add missing space between tag attributes 2015-07-09 08:00:43 +02:00
Uwe Steinmann
4290e705cf add tasks to menu if configured 2015-07-09 07:59:54 +02:00
Uwe Steinmann
bf95beb536 put tasks into submenus 2015-07-08 19:48:18 +02:00
Uwe Steinmann
3583962085 new task menutask in op/op.Ajax.php which calls menuTask() 2015-07-08 18:58:38 +02:00
Uwe Steinmann
7902ab3fab Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-06-30 18:54:11 +02:00
Uwe Steinmann
77a5512f0b move code for easier merging 2015-06-30 18:53:40 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
 2015-06-30 07:05:27 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
88df1cee82 move printProtocol() into class.Bootstrap.php 2015-06-23 09:53:14 +02:00
Uwe Steinmann
195add869c move printProtocol() into class.Bootstrap.php 
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewDocument.php
 2015-06-23 09:52:29 +02:00
Uwe Steinmann
73254d7346 move printProtocol() into class.Bootstrap.php 2015-06-23 09:49:34 +02:00
Uwe Steinmann
5b03c3dcc3 show link to Indexer only if fulltext is enabled 2015-06-15 15:29:07 +02:00
Uwe Steinmann
a7ff808787 show link to Indexer only if fulltext is enabled 2015-06-15 15:28:53 +02:00
Uwe Steinmann
1d186d230b show link to Indexer only if fulltext is enabled 2015-06-15 15:28:25 +02:00
Uwe Steinmann
e7ed3f7789 add optional parameter class to contentContainerStart() 2015-06-15 09:21:20 +02:00