gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-12 10:04:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,310 Commits 7 Branches 80 Tags 38 MiB
4c6eb18528
Commit Graph

206 Commits

Author SHA1 Message Date
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