Commit Graph

174 Commits

Author SHA1 Message Date
Uwe Steinmann
72143a1a78 use translation for button to download more docs/folders 2017-12-15 08:09:01 +01:00
Uwe Steinmann
9a6786cc8d show only limited number of entries, fetch more when scrolling down 2017-12-14 09:39:43 +01:00
Uwe Steinmann
1500946fd9 Merge branch 'seeddms-6.0.x' into seeddms-6.1.x 2017-07-11 16:25:43 +02:00
Uwe Steinmann
df27dcf878 Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-20 11:54:55 +01:00
Uwe Steinmann
514aa3ef0f call hook listHeader() 2017-03-15 21:53:42 +01:00
Uwe Steinmann
6af5de2f52 call hook folderListSeparator only if documents and folders exist 2017-03-14 06:52:37 +01:00
Uwe Steinmann
a79b43557f add hook folderListSeparator 2017-03-14 06:38:40 +01:00
Uwe Steinmann
27b74c7c5f Merge branch 'seeddms-6.0.x' into seeddms-6.1.x 2017-03-03 12:13:49 +01:00
Uwe Steinmann
012d4d9f8d Merge branch 'seeddms-5.1.x' into seeddms-6.0.x 2017-03-03 09:43:45 +01:00
Uwe Steinmann
83e888b9c9 more reasonable check for docs and folders 2017-03-02 20:00:14 +01:00
Uwe Steinmann
1c359cb701 pass context to hook documentListItem 2017-03-02 08:40:46 +01:00
Uwe Steinmann
cf9136735c Merge branch 'seeddms-5.1.x' into seeddms-5.2.x 2017-01-17 10:17:07 +01:00
Uwe Steinmann
d0662a6132 Merge branch 'seeddms-5.0.x' into seeddms-5.1.x 2017-01-12 18:08:24 +01:00
Uwe Steinmann
950449ac04 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2017-01-12 18:03:01 +01:00
Uwe Steinmann
fe2a875872 put access rights into popup box if more then 3 exists 2017-01-12 17:26:55 +01:00
Uwe Steinmann
ec82a80010 take out old code 2016-11-22 18:20:59 +01:00
Uwe Steinmann
75d6678e2c pass context for attributes to hooks and [document|folder]ListRow() 2016-11-22 18:20:59 +01:00
Uwe Steinmann
50fa5a991c use filter parameter of getAttributeDefinitions(), call hook 2016-11-22 18:20:06 +01:00
Uwe Steinmann
7ce31e80a6 take attribute groups into account if set 2016-11-22 18:19:35 +01:00
Uwe Steinmann
20476876ac Merge branch 'seeddms-5.0.x' into develop 2016-05-23 12:32:18 +02:00
Uwe Steinmann
fe0e67b2ad Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-05-23 12:30:54 +02:00
Uwe Steinmann
0006416b7e add class table-hover to table 2016-05-18 09:19:46 +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
8a4948085a Merge branch 'seeddms-5.0.x' into develop 2016-04-28 12:24:47 +02:00
Uwe Steinmann
7e3cd7d6c4 move inclusion SeedDMS/Preview.php into view 2016-04-26 13:43:02 +02:00
Uwe Steinmann
4206c5ef59 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-04-22 16:40:29 +02:00
Uwe Steinmann
877f5c80ed output access rights even if inherited 2016-04-22 16:36:47 +02: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
66ec6fb7ce add missing contentEnd() at end of page 2016-03-15 08:30:53 +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
22aa803984 output some translations used in js code 2016-03-08 10:40:01 +01:00
Uwe Steinmann
bc608eff07 Merge branch 'seeddms-5.0.x' into develop 2016-02-15 20:45:05 +01:00
Uwe Steinmann
202d994e1c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-15 17:08:01 +01:00
Uwe Steinmann
54df39ba81 pass timeout to view and previewer 2016-02-15 10:57:37 +01:00
Uwe Steinmann
2a5a2cd61d Merge branch 'seeddms-5.0.x' into develop 2016-02-10 11:49:15 +01:00
Uwe Steinmann
43c80a9f73 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-10 11:48:19 +01:00
Uwe Steinmann
75183a9d36 check experation and set status accordingly before listing documents 2016-02-09 17:33:23 +01:00
Uwe Steinmann
3b8d7a5271 Merge branch 'seeddms-5.0.x' into develop 2016-02-04 19:22:59 +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
52344c0842 fix Content-Type for javascript code 2016-01-28 16:50:06 +01:00
Uwe Steinmann
5256aa0457 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-25 09:39:47 +01:00
Uwe Steinmann
6ce9be7fd5 take back in js for file upload 2016-01-25 09:36:19 +01:00
Uwe Steinmann
5863d962ac Merge branch 'seeddms-5.0.x' into develop 2015-12-16 09:30:16 +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
42b5162ca4 Merge branch 'seeddms-5.0.x' into develop 2015-09-23 14:43:13 +02:00
Uwe Steinmann
c7e0702c97 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-23 12:59:53 +02:00
Uwe Steinmann
bf0702709e show creation date in info section 2015-09-23 12:57:49 +02:00
Uwe Steinmann
71ed09ec0c pass previewer to printClipboard() 2015-07-15 07:26:47 +02:00
Uwe Steinmann
52559730d9 use new customizable preview converters 2015-06-25 19:52:02 +02:00
Uwe Steinmann
68e3045da2 make table condensed to save some space 2015-06-01 08:40:03 +02:00
Uwe Steinmann
4e4848c5d7 add more hooks for showing/editing attributes 2015-04-27 08:28:08 +02:00
Uwe Steinmann
4e682ecbe2 add more hooks for showing/editing attributes 2015-04-27 08:27:19 +02: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
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
99590a322d use new method getValueAsArray() for showing attributes 2014-11-13 08:21:49 +01:00
Uwe Steinmann
6d6bb02a60 do not show fast upload area if user has no write access of folder 2014-11-11 16:01:36 +01:00
Uwe Steinmann
2b5415e128 some cosmetic changes to ease merging with develop 2014-07-11 12:58:44 +02:00
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