gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-20 08:31:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,907 Commits 7 Branches 84 Tags 44 MiB
6d8930a360
Commit Graph

180 Commits

Author SHA1 Message Date
Uwe Steinmann
6d8930a360 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-07 14:30:07 +02:00
Uwe Steinmann
d7223bc521 fix link to downloadable file in printProtocol() 2015-08-07 14:29:32 +02:00
Uwe Steinmann
6060f1e98e new parameter $base for htmlStartPage(), propperly can hook in documentMenu 2015-07-15 22:32:19 +02:00
Uwe Steinmann
245bcc6a1e run hook folderNavigationMenu 2015-07-15 22:09:47 +02:00
Uwe Steinmann
1609610541 pass previewer to printClipboard, call hook for menuitems, ... 
backported from develop
 2015-07-15 07:24:32 +02:00
Uwe Steinmann
b8e9d3a6dd add missing space between tag attributes 2015-07-09 08:00:43 +02:00
Uwe Steinmann
7902ab3fab Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-06-30 18:54:11 +02:00
Uwe Steinmann
77a5512f0b move code for easier merging 2015-06-30 18:53:40 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
 2015-06-30 07:05:27 +02:00
Uwe Steinmann
195add869c move printProtocol() into class.Bootstrap.php 
Conflicts:
	views/bootstrap/class.Bootstrap.php
	views/bootstrap/class.ViewDocument.php
 2015-06-23 09:52:29 +02:00
Uwe Steinmann
73254d7346 move printProtocol() into class.Bootstrap.php 2015-06-23 09:49:34 +02:00
Uwe Steinmann
a7ff808787 show link to Indexer only if fulltext is enabled 2015-06-15 15:28:53 +02:00
Uwe Steinmann
1d186d230b show link to Indexer only if fulltext is enabled 2015-06-15 15:28:25 +02:00
Uwe Steinmann
22b7b3ce96 add optional parameter class to contentContainerStart() 2015-06-15 09:21:13 +02:00
Uwe Steinmann
ae481e6ac9 add optional parameter class to contentContainerStart() 2015-06-15 09:20:33 +02:00
Uwe Steinmann
0c9714c37c show docs in root folder of document chooser 2015-06-11 11:27:07 +02:00
Uwe Steinmann
f02734b063 show docs in root folder of document chooser 2015-06-11 11:25:14 +02:00
Uwe Steinmann
45a9373bdd include DocumentChooser relative to out 
this makes it possible to include the document chooser even in
op/op.xxx.php files
 2015-06-11 07:56:04 +02:00
Uwe Steinmann
269355bb43 allow context sensitive help files 2015-06-11 06:42:28 +02:00
Uwe Steinmann
e527862c9d allow context sensitive help files 2015-06-11 06:41:49 +02:00
Uwe Steinmann
de40aa816a printAttributeEditField() outputs textarea for longer values 
up to 30 chars it remains an input field
 2015-04-16 08:05:11 +02:00
Uwe Steinmann
7d7a21fc9e printAttributeEditField() takes a second parameter the attribute 
this was the attribute value
 2015-04-15 14:11:52 +02:00
Uwe Steinmann
cb81eb7db4 Merge branch 'seeddms-4.3.16' into develop 
Conflicts:
	Makefile
	views/bootstrap/class.UsrMgr.php
 2015-03-20 08:32:29 +01:00
Uwe Steinmann
cb3392c774 propperly take new workflow mode traditional_only_approval into account 2015-03-17 11:19:55 +01: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
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