Commit Graph

62 Commits

Author SHA1 Message Date
Uwe Steinmann
6c1993a9fe show id of folder always, not just if inheritAccess is turn on
don't know how that got into the code
2014-07-11 12:57:13 +02:00
Uwe Steinmann
4186f6dd7e remove accidently duplicated code 2014-07-11 12:51:50 +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
72798e2ac4 set max file size for drag&drop upload 2014-07-11 12:04:13 +02:00
Uwe Steinmann
3c51f70e07 add drag&drop area for file upload 2014-07-11 08:42:57 +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
216e38378d take out code for show document/folder lines in table
they have been moved into the new functions printDocumentListRow()
and printFolderListRow()
2014-06-06 14:00:59 +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
8abed5989f use new folder remove operation 2014-06-05 09:51:20 +02:00
Uwe Steinmann
32d160ed99 show clipboard even if foldertree ist turned off 2014-06-04 21:42:08 +02:00
Uwe Steinmann
854700183c put clipboard into left coŀumn 2014-06-04 21:40:50 +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
7a2bcfb312 use new method for printing delete document icon 2014-06-04 19:22:54 +02:00
Uwe Steinmann
c1f5a31f13 Merge branch 'seeddms-4.3.6' into develop
Conflicts:
	Makefile
2014-03-18 16:55:06 +01:00
Uwe Steinmann
b078102c19 use configured preview image width 2014-03-18 10:55:24 +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
5e2ede8fd5 set variable with preview width
next step will be to make this configurable
2014-02-21 21:51:53 +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
a4f26d3f68 Merge branch 'seeddms-4.3.3' into develop
Conflicts:
	CHANGELOG
	languages/de_DE/lang.inc
	languages/en_GB/lang.inc
	views/bootstrap/class.ViewFolder.php
2014-02-01 16:15:46 +01:00
Uwe Steinmann
3596a7a191 add support for configuring folder sort method of folders 2014-02-01 15:23:19 +01:00
Uwe Steinmann
92a11af19f add hook folderListHeader 2013-10-08 21:10:08 +02:00
Uwe Steinmann
1eb5669022 call hook startPage 2013-09-11 18:42:10 +02:00
Uwe Steinmann
472ca6bd0f access 'expandFolderTree' via params[] array
do not add new class variable anymore
2013-09-09 06:43:04 +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
020384cb1c show clipboard only if enable in configuration 2013-08-13 14:48:43 +02:00
Uwe Steinmann
12f81b47eb call hook folderMenu 2013-08-12 07:03:24 +02:00
Uwe Steinmann
35063313a9 add new hooks folderInfo and folderListItem 2013-08-11 08:32:23 +02:00
Uwe Steinmann
ee318b643a call hook documentListItem if available 2013-07-31 17:29:55 +02:00
Uwe Steinmann
90b205232a fix merge error
clipboard was included twice
2013-07-20 10:56:34 +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
6b5fcb98f3 use ajax call to add item to clipboard 2013-06-18 18:19:45 +02:00
Uwe Steinmann
3b1c4615b6 remove some ^M at end of line 2013-06-17 15:50:00 +02:00
Uwe Steinmann
3a4930d28d use full with of browser if tree and clipboard are turned off 2013-06-13 14:57:16 +02:00
Uwe Steinmann
5986eac3ea fix clicking on folder tree 2013-06-10 22:11:03 +02:00
Uwe Steinmann
25a9e542c3 remove old class defintion of action links 2013-06-07 13:07:39 +02:00
Uwe Steinmann
72010b1bc0 Merge branch 'develop' into hooks 2013-06-06 16:02:28 +02:00
Uwe Steinmann
8342fdbc51 do not wrap column with status 2013-06-04 23:32:22 +02:00
Uwe Steinmann
5820840a2a new layout of folder/document list
remove columns for version and owner. Show this information below
title. Also show date of creation and last modification.
2013-05-31 14:33:54 +02:00
Uwe Steinmann
14e6661d7d new hook 'leftContent' 2013-05-28 06:45:13 +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
17130cec5e Merge branch 'develop' into hooks 2013-05-22 20:31:57 +02:00
Uwe Steinmann
274d8d723e fix checking access for icons of documents/folders 2013-05-21 08:59:22 +02:00
Uwe Steinmann
9cc81c4f37 do not allow clicking on icons if user has no access on document/folder 2013-05-21 08:39:41 +02:00
Uwe Steinmann
00a4b66466 add 'preContent' hook 2013-05-02 18:26:49 +02:00
Uwe Steinmann
41e5399053 put action icons at end of line in div 2013-04-19 14:39:19 +02:00
Uwe Steinmann
c818242b66 show icon if a document content has a waiting workflow transition (bug #4) 2013-04-18 13:38:52 +02:00
Uwe Steinmann
a02832040e count folders/documents recursively if set in configuration 2013-04-10 15:42:11 +02:00
Uwe Steinmann
190c9a44f2 show number of attachments and related documents 2013-03-28 13:08:47 +01:00