gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-17 05:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,764 Commits 7 Branches 76 Tags 32 MiB
748041ffd8
Commit Graph

615 Commits

Author SHA1 Message Date
Uwe Steinmann
01d883bd95 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-10 09:12:14 +01:00
Uwe Steinmann
6951fe2169 add 'remove' button to folder chooser 2017-01-10 09:11:11 +01:00
Uwe Steinmann
cac47ee428 fix removal of file in drop folder chooser 2017-01-10 07:40:56 +01:00
Uwe Steinmann
ff48af1476 fix clearing filename in dropfolder chooser, add document.ready() 2017-01-10 07:37:45 +01:00
Uwe Steinmann
0d1b2625de set unique name for document chooser 2017-01-10 07:04:07 +01:00
Uwe Steinmann
289e13b255 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-09 15:32:57 +01:00
Uwe Steinmann
b78a730f82 add method footerjs() which deliveres a temp. js file 2017-01-09 10:57:07 +01:00
Uwe Steinmann
321535c391 use new path of jquery.passwordstrength.js 2017-01-06 07:23:25 +01:00
Uwe Steinmann
ae4e66c8b1 use new path of jquery.passwordstrength.js 2017-01-06 07:19:17 +01:00
Uwe Steinmann
c40b34295c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-04 07:44:02 +01:00
Uwe Steinmann
f1326c4968 make field for attribute of type date wider 2017-01-04 07:02:30 +01:00
Uwe Steinmann
e9e0de4d2a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-07 15:32:54 +01:00
Uwe Steinmann
ad91c8202b show workflow state instead of just 'in workflow' 
also set title of surounding span to workflow name
 2016-12-07 15:30:59 +01:00
Uwe Steinmann
ce20c3fea9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-12-02 11:35:57 +01:00
Uwe Steinmann
bbf4caa8c8 fix take over of reviewer, approver 
the javascript call to update the reviewer, approval selection was not
updated to select2
 2016-12-01 08:23:52 +01:00
Uwe Steinmann
4e93bf4ca2 fix php tag 2016-11-16 17:03:27 +01:00
Uwe Steinmann
408592ee90 replace some php short tags (Closes: #294) 2016-11-15 18:10:22 +01:00
Uwe Steinmann
f1f970b0e0 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-11-02 18:13:18 +01:00
Uwe Steinmann
13bed81418 include select2 code 2016-11-02 12:26:16 +01:00
Uwe Steinmann
bf9e2fa0da Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-25 10:01:00 +02:00
Uwe Steinmann
4d6d184944 set default value of attribute of type email 2016-10-25 08:03:18 +02:00
Uwe Steinmann
8b26681153 add attribute data-rule-email to seeddms attribute of type email 2016-10-25 07:58:28 +02:00
Uwe Steinmann
894466b102 add code for taking over attribute value of previous version 2016-10-20 18:27:43 +02:00
Uwe Steinmann
e71f24f910 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-05 13:34:40 +02:00
Uwe Steinmann
c1e434788d set showtree in documentListRow() 2016-10-05 10:22:35 +02:00
Uwe Steinmann
3d50543b66 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-10-04 20:48:51 +02:00
Uwe Steinmann
f987efb7c2 add optional parameter norequire to printAttributeEditField() 2016-10-04 17:05:07 +02:00
Uwe Steinmann
d251beb7c3 show divider only if menuitems and admin menu exists 2016-09-28 14:59:39 +02:00
Uwe Steinmann
a5651d3ce6 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-09-15 14:02:59 +02:00
Uwe Steinmann
e4aba9ae25 add validation rule attribute to input field for interger attributes 2016-09-06 15:33:26 +02:00
Uwe Steinmann
cda2d32852 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-31 15:23:55 +02:00
Uwe Steinmann
23592faf34 include topCenter for noty 2016-08-31 15:23:12 +02:00
Uwe Steinmann
2a59f1e307 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-30 12:05:36 +02:00
Uwe Steinmann
b2d13bd657 show workflow name as title of warn icon if action is required 2016-08-30 11:45:07 +02:00
Uwe Steinmann
5003c54deb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-30 08:46:59 +02:00
Uwe Steinmann
96a4db05bf add more field validation 2016-08-29 09:44:49 +02:00
Uwe Steinmann
9a17a5c068 fix printFolderChooser() 
the last optional parameter $formname wasn't take into account
 2016-08-22 17:14:20 +02:00
Uwe Steinmann
60af07ce51 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-12 18:21:21 +02:00
Uwe Steinmann
e1716da485 do not use showtree in documentListRow() anymore 2016-08-11 12:06:53 +02:00
Uwe Steinmann
79e7a2babe Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-10 08:38:33 +02:00
Uwe Steinmann
1ae82da90e use new ajax command 'clearclipboard' 2016-08-09 18:15:20 +02:00
Uwe Steinmann
df2b273d7a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-08-03 12:33:08 +02:00
Uwe Steinmann
3a006be5bf make folderListRow() a bit more efficient 
get subfolders and documents only, if enablerecursivecount is turned on
 2016-08-03 12:32:12 +02:00
Uwe Steinmann
6bebd3df5e Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-27 21:10:31 +02:00
Uwe Steinmann
953ccc1eb0 add expiration date to list of documents 2016-07-27 21:08:15 +02:00
Uwe Steinmann
dd616fdf8f Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-07-06 11:12:54 +02:00
Uwe Steinmann
79ae595b7d add ImportFS to menu 2016-07-06 10:30:32 +02:00
Uwe Steinmann
f8a6b7e599 distinguish between files and folders in printDropFolderChooser() 
if $showfolders is set, only folders will be shown
 2016-07-06 09:03:14 +02:00
Uwe Steinmann
67474d1d88 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-30 11:16:52 +02:00
Uwe Steinmann
ba786d52b9 add hidden field to attributes 2016-05-26 10:45:14 +02:00
Uwe Steinmann
d76d54ce96 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-24 08:00:48 +02:00
Uwe Steinmann
483d082c44 fix warning in list of missing translations 2016-05-24 07:50:43 +02:00
Uwe Steinmann
4a327be618 put warning for missing translation into container and row 2016-05-24 07:46:34 +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
c982a23a32 call hook userMenuItems() 2016-04-05 09:42:46 +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
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
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
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
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
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
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
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
62095c443b override exiting query parameter 'action' when including js code 2016-02-29 08:36:10 +01:00
Uwe Steinmann
d984f75871 set $objvalue in printAttributeEditField() 2016-02-25 10:49:18 +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
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
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
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
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
423ef654c4 fix output of checkboxes in printAttributeEditField() 2015-12-03 15:08:12 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
1609610541 pass previewer to printClipboard, call hook for menuitems, ... 
backported from develop
 2015-07-15 07:24:32 +02:00
Uwe Steinmann
b8e9d3a6dd add missing space between tag attributes 2015-07-09 08:00:43 +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
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
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
22b7b3ce96 add optional parameter class to contentContainerStart() 2015-06-15 09:21:13 +02:00
Uwe Steinmann
ae481e6ac9 add optional parameter class to contentContainerStart() 2015-06-15 09:20:33 +02:00
Uwe Steinmann
0c9714c37c show docs in root folder of document chooser 2015-06-11 11:27:07 +02:00
Uwe Steinmann
f02734b063 show docs in root folder of document chooser 2015-06-11 11:25:14 +02:00
Uwe Steinmann
45a9373bdd include DocumentChooser relative to out 
this makes it possible to include the document chooser even in
op/op.xxx.php files
 2015-06-11 07:56:04 +02:00
Uwe Steinmann
269355bb43 allow context sensitive help files 2015-06-11 06:42:28 +02:00
Uwe Steinmann
e527862c9d allow context sensitive help files 2015-06-11 06:41:49 +02:00
Uwe Steinmann
de40aa816a printAttributeEditField() outputs textarea for longer values 
up to 30 chars it remains an input field
 2015-04-16 08:05:11 +02:00
Uwe Steinmann
7d7a21fc9e printAttributeEditField() takes a second parameter the attribute 
this was the attribute value
 2015-04-15 14:11:52 +02:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop 
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
 2015-03-20 08:32:29 +01:00
Uwe Steinmann
cb3392c774 propperly take new workflow mode traditional_only_approval into account 2015-03-17 11:19:55 +01:00
Uwe Steinmann
0335cc8bcd Merge branch 'seeddms-4.3.15' into develop 
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.Settings.php
 2015-03-17 06:52:33 +01:00
Uwe Steinmann
89ef1a58ec view parameter enableClipboard has been renamed to enableclipboard 2015-03-13 09:31:48 +01:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
cb0d7d8d92 enableClipboard takes out all clipboard functions 2015-02-24 17:47:58 +01:00
Uwe Steinmann
6c3024e799 include application.css after all other css files 2015-02-13 17:41:12 +01:00
Uwe Steinmann
b3bfaf9ac5 Merge branch 'seeddms-4.3.15' into develop 
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
 2015-02-05 09:37:52 +01:00
Uwe Steinmann
8963879f5d htmlencode() the complete content in deletion dialog 
this used to be just the filename, but translations of the text
may also contain qoutes which break the javascript
 2015-02-04 07:41:33 +01:00
Uwe Steinmann
93cb26e79d do not used hard coded class names of SeedDMS_Core_xxx anymore 2014-12-08 14:49:26 +01:00
Uwe Steinmann
985206f481 make last paramter of printFolderChooser() optional 2014-11-19 20:25:06 +01:00
Uwe Steinmann
15c5392ed8 Merge branch 'seeddms-4.3.11' into develop 
Conflicts:
	Makefile
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
 2014-11-13 09:21:08 +01:00
Uwe Steinmann
7c4e5a15aa strip html tags from sitename when using for html title 2014-11-07 08:54:47 +01:00
Uwe Steinmann
c1eeba573e Merge branch 'seeddms-4.3.10' into develop 2014-10-16 17:28:11 +02:00
Uwe Steinmann
8d4151893e use " instead of ' in javascript for deleting documents and folders 2014-10-16 17:27:07 +02:00
Uwe Steinmann
cbe0574388 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
 2014-07-23 06:55:44 +02:00
Uwe Steinmann
a011433d28 remove not used file upload code 2014-07-22 17:34:08 +02:00
Uwe Steinmann
e2974f2054 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.ViewFolder.php
 2014-07-11 12:49:21 +02:00
Uwe Steinmann
458069fba1 div.#main-clipboard doesn't need ondrop-attr anymore 2014-07-11 08:42:17 +02:00
Uwe Steinmann
3a84ec91d4 fix php syntax error 2014-07-08 09:21:47 +02:00
Uwe Steinmann
4d8f9731d5 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
 2014-07-08 08:49:14 +02:00
Uwe Steinmann
73bfecb5a8 more general folder chooser 
the choosen folder will no longer use targetidformx for the input field
containing the id. It is now independent of the form name.
 2014-07-08 08:30:59 +02:00
Uwe Steinmann
cc61505825 document/folder chooser even works for forms not named 'form1' 2014-07-07 15:45:24 +02:00
Uwe Steinmann
579946d455 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
 2014-07-03 12:07:27 +02:00
Uwe Steinmann
d3451e0b7b temporarily take out new fileupload 2014-07-03 12:04:11 +02:00
Uwe Steinmann
b494e3c248 add title attribute 2014-06-11 11:02:25 +02:00
Uwe Steinmann
f1a9923f57 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
 2014-06-06 15:13:15 +02:00
Uwe Steinmann
3301dbeda5 showing the clipboard will filter out those objects which are no longer available 2014-06-06 15:08:44 +02:00
Uwe Steinmann
6325bd2844 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
 2014-06-06 14:15:39 +02:00
Uwe Steinmann
e552294073 add new methods documentListRow(), printLockDocumentBtn() 2014-06-06 14:00:28 +02:00
Uwe Steinmann
df3a55d39b make clipboard ajax aware 2014-06-05 15:02:19 +02:00
Uwe Steinmann
58cdecfe21 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewFolder.php
 2014-06-05 10:03:35 +02:00
Uwe Steinmann
1d8b73c2f9 add new method printDeleteFolderButton(), fix drag and drop from clipboard 2014-06-05 09:50:21 +02:00
Uwe Steinmann
aa6bdf000b Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
 2014-06-04 21:25:30 +02:00
Uwe Steinmann
b950d22b60 javascript can be collected and output at end of page 
add method to show icon for deleting documents in document/folder list
 2014-06-04 19:20:07 +02:00
Uwe Steinmann
f13ef894b2 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	Makefile
	op/op.RemoveDocument.php
	op/op.UpdateDocument.php
	out/out.RemoveDocument.php
 2014-06-04 07:58:06 +02:00
Uwe Steinmann
16e22ceafd check if expiration may be set 2014-06-03 17:51:44 +02:00
Uwe Steinmann
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
 2014-05-22 08:21:22 +02:00
Uwe Steinmann
2414d9e510 menu on myaccount page shows 'edit user' item if admin 2014-05-22 06:44:20 +02:00
Uwe Steinmann
8fc212966b add menu item for user list in admin menu 2014-05-20 06:26:23 +02:00
Uwe Steinmann
01e067a2c4 use container-fluid class for top navigation (Bug #157) 2014-05-16 11:05:53 +02:00
Uwe Steinmann
315111a778 add nicer looking file upload chooser 2014-05-16 09:17:43 +02:00
Uwe Steinmann
319b2cbe75 Merge branch 'seeddms-4.3.8' into develop 2014-04-15 18:53:21 +02:00
Uwe Steinmann
02d8da676e show predefined value of multivalue attribute only if not empty 2014-04-15 15:33:05 +02:00
Uwe Steinmann
c180f17f98 Merge branch 'seeddms-4.3.8' into develop 
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
 2014-04-09 06:26:32 +02:00
Uwe Steinmann
2c4ce681ef add function for listing missing languages at end of page 
also check if turned on
 2014-04-08 10:47:28 +02:00
Uwe Steinmann
82c9dbe2aa add new page for charts to admin menu 2014-04-02 08:50:57 +02:00
Uwe Steinmann
729fff53ef include jquery.js before extra header 2014-04-01 21:04:55 +02:00
Uwe Steinmann
134bcd025d do not link '...' in page browser 2014-04-01 10:42:51 +02:00
Uwe Steinmann
a8ae1c5a89 better navigation in page browser 2014-04-01 09:20:58 +02:00
Uwe Steinmann
82184bdcae limit pager to one line by restricting the number of pages to 20 2014-04-01 07:39:16 +02:00
Uwe Steinmann
5944edd41b do not show two dividers in right most menu 
was shown when no language menu item and no su user item was visible
 2014-04-01 06:49:29 +02:00
Uwe Steinmann
eabfee8c76 set attribute target in folder chooser pointing the input field storing the folder id 2014-03-26 17:36:00 +01:00
Uwe Steinmann
a26270f5b6 add optional parameter 'formname' to printFolderChooser() 
this allows to set the name of the input field containing the selected
folder
 2014-03-26 08:17:55 +01:00
Uwe Steinmann
1d011feaf6 Merge branch 'seeddms-4.3.8' into develop 2014-03-26 07:29:28 +01:00
Uwe Steinmann
815ca1acf8 show link to indexer in folder menu (if admin) 2014-03-26 07:27:01 +01:00
Uwe Steinmann
468846b19f Merge branch 'seeddms-4.3.7' into develop 
Conflicts:
	Makefile
	op/op.Download.php
 2014-03-21 09:20:19 +01:00
Uwe Steinmann
646128cbd8 add dummy javascript function, Bug #135 
when clicking on a folder in the document chooser, the none existing
javascript function folderSelectedform1() was called. This fix just
adds it.
 2014-03-21 08:05:08 +01:00
Uwe Steinmann
5499dbeb66 Merge branch 'seeddms-4.3.6' into develop 
Conflicts:
	languages/de_DE/lang.inc
 2014-03-20 08:50:23 +01:00
Uwe Steinmann
b047f3a23f fix link to folder in clipboard menu 2014-03-20 08:37:47 +01:00
Uwe Steinmann
c1f5a31f13 Merge branch 'seeddms-4.3.6' into develop 
Conflicts:
	Makefile
 2014-03-18 16:55:06 +01:00
Uwe Steinmann
9032170149 pass sort order to ajax subtree command 2014-03-14 15:11:13 +01:00
Uwe Steinmann
0a070eef1f Merge branch 'seeddms-4.3.5' into develop 
Conflicts:
	languages/en_GB/lang.inc
	views/bootstrap/class.Bootstrap.php
 2014-03-04 11:20:02 +01:00
Uwe Steinmann
598be765c6 force exitError() to not exit 
added optional parameter noexit
 2014-03-04 08:30:32 +01:00
Uwe Steinmann
5d879a3439 Merge branch 'seeddms-4.3.4' into develop 
Conflicts:
	Makefile
	op/op.Ajax.php
	styles/bootstrap/application.js
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
 2014-02-21 22:04:22 +01:00
Uwe Steinmann
3d1bb14c29 use same ordering in tree as in list (Bug #121) 2014-02-21 10:58:27 +01:00
Uwe Steinmann
a14c6b85e4 Merge branch 'seeddms-4.3.4' into develop 
Conflicts:
	op/op.Login.php
 2014-02-21 07:53:14 +01:00
Uwe Steinmann
90bea9a2fb fix handling of multivalue attributes 2014-02-20 21:05:22 +01:00
Uwe Steinmann
2d4ded2d0f do not use short tags anymore 2014-01-08 06:36:40 +01:00
Uwe Steinmann
ae8df3f9c6 replace all php short tags (bug #102) 2013-12-11 11:37:20 +01:00
Uwe Steinmann
39f19f25bb Merge branch 'seeddms-4.3.2' into develop 
Conflicts:
	Makefile
 2013-11-27 14:10:05 +01:00
Uwe Steinmann
49c38263f8 tree for document chooser lists documents in folders without subfolders (Bug #105) 2013-11-26 21:31:43 +01:00
Uwe Steinmann
cf867792b2 Merge branch 'seeddms-4.3.2' into develop 2013-11-24 18:20:36 +01:00
Uwe Steinmann
9ab1160cea move application.css at end of css files, include jquery.cookie.js 2013-10-08 21:09:06 +02:00
Uwe Steinmann
fac83d7e1f set priority of log msg 2013-10-06 12:27:06 +02:00
Uwe Steinmann
d51eb587f1 turning of the language selector will no longer turn of user substitution 2013-09-30 11:08:05 +02:00
Uwe Steinmann
63d8fa4314 make jumploader work with java 1.7 2013-09-30 09:11:58 +02:00
Uwe Steinmann
617a37559c upper level of folder tree can be removed in presentation 
This is controlled by a view parameter 'remove_root_from_tree' which
currently can only be set by an extension
 2013-09-17 06:22:34 +02:00
Uwe Steinmann
9add363cad Merge branch 'seeddms-4.3.1' into develop 2013-09-09 22:17:40 +02:00
Uwe Steinmann
961a4351c2 add missing div in header 
this also makes the folding of the menu work again
 2013-09-09 20:46:33 +02:00
Uwe Steinmann
ac7bd8cbdc Merge branch 'seeddms-4.3.1' into develop 2013-09-06 15:26:34 +02:00
Uwe Steinmann
9f6cb6453c folder tree can be expanded again on default 2013-09-06 15:24:51 +02:00
Uwe Steinmann
353da0c297 Merge branch 'seeddms-4.3.1' into develop 2013-09-05 23:01:27 +02:00
Uwe Steinmann
9a0d6cb3b8 set icon for rar files (fixes bug #85) 2013-09-05 22:59:45 +02:00
Uwe Steinmann
76c7033313 Merge branch 'seeddms-4.3.1' into develop 2013-09-05 22:55:13 +02:00
Uwe Steinmann
275896d95c translate strings (fixes bug #86) 2013-09-05 22:51:01 +02:00
Uwe Steinmann
6e6fb20244 Merge branch 'hooks' into develop 
Conflicts:
	Makefile
 2013-09-05 08:52:37 +02:00
Uwe Steinmann
40ad10b45f set time of splash message 
default for error message is now 3000 ms unless it is overritten by
'duration' parameter
 2013-08-15 20:38:05 +02:00
Uwe Steinmann
e9adfa0f92 propper passing of url params in page list 
the links in the page browser were missing propper attribute values
 2013-08-14 09:12:20 +02:00
Uwe Steinmann
b2bc46b677 minor cosmetic change in printNavigation() 2013-08-12 07:02:40 +02:00
Uwe Steinmann
0f7df48c98 add calling hook documentClipboardItem 2013-07-31 21:44:02 +02:00
Uwe Steinmann
2979fc9648 Merge branch 'develop' into hooks 
Conflicts:
	views/bootstrap/class.ViewFolder.php
 2013-07-19 23:14:29 +02:00
Uwe Steinmann
f0f56ac51f make new function menuClipboard() 
it creates the html of the menu item in header which list the clipboard.
This method is called by the ajax command 'addtoclipboard' when a new
item was added to the clipboard.
 2013-06-18 18:18:08 +02:00
Uwe Steinmann
11ff71eea1 do not show 'Move Clipboard' item if access is not allowed 2013-06-17 09:13:08 +02:00
Uwe Steinmann
e1c082d1ac set searching for attributes in header search form by default 2013-06-14 16:20:19 +02:00
Uwe Steinmann
dad7acb5b4 show clipboard in header even if not in the context of a folder 
but do not allow to move clipboard into the current folder even there is none
 2013-06-14 16:07:15 +02:00
Uwe Steinmann
7f90144deb pass refferer to op/op.[Clear|Move|Clipboard.php 2013-06-14 00:03:38 +02:00
Uwe Steinmann
9e2ba3e500 show clipboard as item in head menu 2013-06-13 23:16:46 +02:00
Uwe Steinmann
18d4f079e0 use relative address for out.FolderChooser.php in printFolderChooser() 
this allows to use it from scripts in op/ (e.g. op.Search.php)
 2013-06-07 10:13:52 +02:00
Uwe Steinmann
72010b1bc0 Merge branch 'develop' into hooks 2013-06-06 16:02:28 +02:00
Uwe Steinmann
31015784ac allow to use jqtree more than once on a page 
also uses just 'docid' for id in the document chooser instead of appending
the form name.
 2013-06-03 07:55:39 +02:00
Uwe Steinmann
d8d51f1910 show children of current folder in tree 2013-05-31 16:13:15 +02:00
Uwe Steinmann
edc972e3dd clean up of code for dropfolder file chooser 2013-05-29 18:21:46 +02:00
Uwe Steinmann
d11c6d9a74 small left margin of folder tree 2013-05-28 06:48:20 +02:00
Uwe Steinmann
2fe6e7ac82 Merge branch 'develop' into hooks 2013-05-28 06:31:59 +02:00
Uwe Steinmann
c07e8b1f8f more enhancements of new tree view 
remove some old code, move printFolderTree() into class.ViewFolder.php
 2013-05-26 18:55:57 +02:00
Uwe Steinmann
aae4b76907 new implementation of folder hierachy 2013-05-24 17:32:12 +02:00
Uwe Steinmann
a54a10dbe0 do not use session function if session not set 
There is no session on the login page. So don't try to call functions
from the session. Also set a different color of the header menu if
a user switch has been done
 2013-05-23 16:42:51 +02:00
Uwe Steinmann
0d0ad432e6 fix path to noty 2013-05-23 16:11:45 +02:00
Uwe Steinmann
17130cec5e Merge branch 'develop' into hooks 2013-05-22 20:31:57 +02:00
Uwe Steinmann
88c8fa8ef6 rename all xxxFlashMsg() methods to xxxSplashMsg() 2013-05-21 08:36:11 +02:00
Uwe Steinmann
1c390021e5 clear flash msg after showing it 2013-05-18 22:53:38 +02:00
Uwe Steinmann
917e018bb4 initial functions for flash messages 2013-05-18 22:29:45 +02:00
Uwe Steinmann
df35579ea6 Merge branch 'develop' into hooks 2013-05-17 09:47:14 +02:00
Uwe Steinmann
9f945b2714 Merge branch 'seeddms-4.2.2' into develop 
Conflicts:
	CHANGELOG
	views/bootstrap/class.ViewDocument.php
 2013-05-17 09:42:33 +02:00
Uwe Steinmann
7ea3c9a73a close folder chooser dialog when folder is selected 2013-05-17 08:47:04 +02:00
Uwe Steinmann
487f6b1806 fix minor layout error in folder tree (Bug #51) 2013-05-16 09:56:28 +02:00
Uwe Steinmann
82212adacf add extension manager to admin menu 2013-05-03 09:52:15 +02:00
Uwe Steinmann
eb594a1e6c added method show() 2013-05-02 12:14:10 +02:00
Uwe Steinmann
947a4d83f8 put icons in clipboard into div to make them black 2013-04-30 19:38:48 +02:00
Uwe Steinmann
9cedb7843b use translation for 'clipboard' 2013-04-22 21:09:48 +02:00
Uwe Steinmann
782107af8e use appletInitialize() for setting folder oder document 
for some reason there is no method uploaderInitialized() called
bei jumploader anymore.
 2013-04-22 11:53:04 +02:00
Uwe Steinmann
9885e26f96 put save icon on all save buttons 2013-04-19 15:22:25 +02:00
Uwe Steinmann
98cf1cc78a use symbols from awesame font 2013-04-19 14:30:57 +02:00
Uwe Steinmann
d63ec26d8e add new feature to substitute user while being admin 2013-04-19 09:00:34 +02:00
Uwe Steinmann
8b8a50fd06 show datepicker in users language 2013-04-11 19:15:03 +02:00
Uwe Steinmann
43c084511c set iconѕ for office text and spreadsheet documents 2013-04-11 08:37:36 +02:00
Uwe Steinmann
2533963665 various improvements for mobile devices, pass folder id in upload url of jumploader 
adding an attr in jumploader doesn't seem to work
 2013-03-26 20:26:28 +01:00
Uwe Steinmann
9690a77e28 make nav bar collapsable on small screens 2013-03-20 11:17:07 +01:00
Uwe Steinmann
315470e63a use bootstrap icons if folder tree 2013-03-18 08:46:24 +01:00
Uwe Steinmann
b4ea1a922d pass current document to pageNavigation() 
pageNavigation() still uses a global variable $document which is
replaced by a parameter passed to the function. All calls of
pageNavigation() needs a third parameter with the document.
 2013-03-08 17:55:14 +01:00
Uwe Steinmann
438a98d110 output translated language name 2013-02-27 20:40:45 +01:00
Uwe Steinmann
1a62e0d433 add button to fold out menu on small screens 2013-02-27 17:16:51 +01:00
Uwe Steinmann
91c4145156 use common header 2013-02-22 21:56:18 +01:00
Uwe Steinmann
df54de8aa9 use translated text for buttons in modal boxes 2013-02-20 10:47:20 +01:00
Uwe Steinmann
694d75fdf3 include application.css before responsive design 
need in order to add extra space at top of page without messing up
the layout on smart phones
 2013-02-18 15:32:20 +01:00
Uwe Steinmann
3878a7d7d0 minor correction in header 2013-02-18 10:12:34 +01:00
Uwe Steinmann
812349fe9d took out 60px margin at top 2013-02-18 09:27:51 +01:00
Uwe Steinmann
1acf6790d9 add back button to exitError() method 2013-02-14 14:34:35 +01:00
Uwe Steinmann
73c6ff9427 major name change from letodms to seeddms 2013-02-14 12:10:53 +01:00
Uwe Steinmann
22f91a73f6 use phrase 'drag_icon_here' instead of hardcoded text 2013-02-13 19:39:28 +01:00
steinm
3f4972f06b - use global function showtree() to set url query parameter 2013-02-08 08:08:11 +00:00
steinm
0f02123e36 - add title tag to icons of clipboard entries 2013-02-07 21:42:46 +00:00
steinm
82748d210f - check if user is set before using it 2013-02-07 17:02:23 +00:00
steinm
9ccca2261d - make search box in header smaller 
- make text behind checkbox lighter
 2013-02-06 17:32:29 +00:00
steinm
c20bcbfb6a - do not show menu items for workflow operations if in traditional 
workflow mode
 2013-02-06 13:57:14 +00:00
steinm
8422ced0ab - added method errorMsg() 2013-02-05 10:08:26 +00:00
steinm
6ff71bdc09 - show message when clipboard is empty 2013-02-04 14:44:32 +00:00
steinm
d8f43bef3a - corrected output of clipboard 2013-02-02 15:58:52 +00:00
steinm
4dc94c37b1 - added printClipboard() 2013-01-30 20:00:43 +00:00
steinm
04de5a05c0 - support drag and drop in breadcrumbs and folder tree 2013-01-30 09:50:30 +00:00
steinm
c45147b39f - added optional parameter with fieldname to printKeywordChooser() 
(not needed currently)
 2013-01-29 08:15:24 +00:00
steinm
26e97f32a4 - get rid of most global variables 
- added support for typeahead function in document and folder chooser
 2013-01-28 10:18:19 +00:00
steinm
78eea45df1 added language selection menu 
use typeahead for search query form
 2013-01-24 09:35:56 +00:00
steinm
aceea1784b added new method warningMsg() 2012-12-19 10:17:38 +00:00
steinm
e53f622d47 - reorganized menu on admin page 2012-12-17 08:44:28 +00:00
steinm
c40cb44c79 took out item in main menu which was inserted for demonstration purposes only 2012-12-14 08:34:04 +00:00
steinm
d4d366d5aa new dir with different views 2012-12-14 07:53:13 +00:00