gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-07 07:34:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,959 Commits 7 Branches 78 Tags 37 MiB
8375b66cbe
Commit Graph

105 Commits

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