gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 23:22:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,411 Commits 7 Branches 76 Tags 30 MiB
8809086014
Commit Graph

66 Commits

Author SHA1 Message Date
Uwe Steinmann
8809086014 Merge branch 'seeddms-4.3.13' into develop 2014-11-24 19:42:18 +01:00
Uwe Steinmann
8af69d9cfa Download of documents whose content is gone will not be possible anymore (Bug #185) 2014-11-24 19:23:26 +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
2eb4408111 add missing space between icon and text on button 2014-11-13 09:01:39 +01:00
Uwe Steinmann
99590a322d use new method getValueAsArray() for showing attributes 2014-11-13 08:21:49 +01:00
Uwe Steinmann
f13ef894b2 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	Makefile
	op/op.RemoveDocument.php
	op/op.UpdateDocument.php
	out/out.RemoveDocument.php
 2014-06-04 07:58:06 +02:00
Uwe Steinmann
0717db2926 do not set expiration in version box 2014-06-03 17:52:01 +02:00
Uwe Steinmann
1fcc786d25 Merge branch 'seeddms-4.3.9' into develop 
Conflicts:
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/Core/inc.ClassUser.php
	op/op.AddDocument.php
	styles/bootstrap/application.css
	views/bootstrap/class.UsrMgr.php
 2014-05-22 08:21:22 +02:00
Uwe Steinmann
bfb6620b3b show only last approval status 2014-05-22 06:46:44 +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
a3cd77dd17 show reverse document links 2014-03-18 07:07:12 +01:00
Uwe Steinmann
cf867792b2 Merge branch 'seeddms-4.3.2' into develop 2013-11-24 18:20:36 +01:00
Uwe Steinmann
fcffe34047 list all approval/review logs if admin 2013-10-06 08:08:41 +02:00
Uwe Steinmann
544cc2669f allow members of a group to approve a document if user is owner 
only if enableOwnerRevApp is set in the settings
 2013-09-27 08:25:37 +02:00
Uwe Steinmann
4c514a23b6 Merge branch 'seeddms-4.3.1' into develop 
Conflicts:
	Makefile
 2013-09-20 21:40:22 +02:00
Uwe Steinmann
08008551b9 replace hard coding strings with translation 2013-09-20 21:05:46 +02:00
Uwe Steinmann
b7f20daa26 use translation for hardcoded strings 2013-09-20 20:56:46 +02:00
Uwe Steinmann
58fdef13eb Merge branch 'seeddms-4.3.1' into develop 2013-09-20 13:45:33 +02:00
Uwe Steinmann
1b86aa6727 check for _enableOwnerRevApp before showing the approve/review button 2013-09-19 14:27:09 +02:00
Uwe Steinmann
c240a0ebec Merge branch 'develop' into hooks 2013-08-05 14:56:43 +02:00
Uwe Steinmann
bf01a83a05 show plain workflow action name if translation cannot be found 2013-08-05 14:55:53 +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
82d5863591 uncomment code to set expiration date 2013-06-17 07:12:02 +02:00
Uwe Steinmann
2fe6e7ac82 Merge branch 'develop' into hooks 2013-05-28 06:31:59 +02:00
Uwe Steinmann
854ca658f9 added missing space on button 2013-05-28 06:28:33 +02:00
Uwe Steinmann
df35579ea6 Merge branch 'develop' into hooks 2013-05-17 09:47:14 +02:00
Uwe Steinmann
2fe12295ea take over recent changes in 4.3.0 after merge with 4.2.2 2013-05-17 09:46:16 +02:00
Uwe Steinmann
9f945b2714 Merge branch 'seeddms-4.2.2' into develop 
Conflicts:
	CHANGELOG
	views/bootstrap/class.ViewDocument.php
 2013-05-17 09:42:33 +02:00
Uwe Steinmann
e36d4c0094 fix approving of documents 
The variable $status was overridden in the the status log if logged
in as admin. This causse problems whenever was allow to review/approve
documents. All other users where not affected because the don't see
the status log
 2013-05-17 09:27:15 +02:00
Uwe Steinmann
8adb1ad5f6 Merge branch 'develop' into hooks 2013-04-30 19:27:33 +02:00
Uwe Steinmann
492c08e397 move tab pane into right page column 2013-04-30 19:26:33 +02:00
Uwe Steinmann
1f73a6150e Merge branch 'develop' into hooks 2013-04-30 19:20:17 +02:00
Uwe Steinmann
29b5dd476a make sure preview for related document is created before showing 2013-04-30 18:36:24 +02:00
Uwe Steinmann
a1f57d3e73 use some icon for editing comments 2013-04-30 18:19:28 +02:00
Uwe Steinmann
57590fef86 show review/approval tab only if version has reviewer or approver 2013-04-30 18:14:05 +02:00
Uwe Steinmann
f2a37f3e0e remove link on current version for setting the expiration date 
the expiration date can only be set for the document
 2013-04-30 17:24:45 +02:00
Uwe Steinmann
c64dc58a77 Merge branch 'seeddms-4.2.1' into develop 2013-04-30 08:40:38 +02:00
Uwe Steinmann
1ef343903c show expiration date; show login on review/approval page 2013-04-30 08:36:53 +02:00
Uwe Steinmann
025e88d5af add icon for setting approver/reviewer 2013-04-30 08:02:53 +02:00
Uwe Steinmann
b4ab7ace36 better icon for version information download 2013-04-29 19:55:50 +02:00
Uwe Steinmann
fdb82c7abb use better icon for version information download 2013-04-29 19:52:11 +02:00
Uwe Steinmann
1f4dde6b59 show preview of document files too 2013-04-29 19:32:55 +02:00
Uwe Steinmann
8a9099bbcb various ui improvements 2013-04-23 19:03:56 +02:00
Uwe Steinmann
ea79961d85 Merge branch 'develop' into hooks 2013-04-22 10:48:06 +02:00
Uwe Steinmann
9885e26f96 put save icon on all save buttons 2013-04-19 15:22:25 +02:00
Uwe Steinmann
7edf2cef00 call parent::show 2013-04-18 22:20:28 +02:00
Uwe Steinmann
57c58a09c7 place a message on the page if document has a waiting workflow transition 2013-04-18 13:38:02 +02:00
Uwe Steinmann
fd1d5fa2cf use function filterDocumentLinks() from class SeedDMS_Core_DMS 2013-04-10 15:49:54 +02:00
Uwe Steinmann
0565e9c55d fix code to determine if user is required for review 2013-04-08 09:12:56 +02:00