gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-16 14:41:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,031 Commits 7 Branches 84 Tags 44 MiB
5499dbeb66
Commit Graph

100 Commits

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