Uwe Steinmann
bd007a6660
use same icons and output for version information
2015-06-23 10:15:19 +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
3aeccf5a18
backport printProtocol()
...
Conflicts:
views/bootstrap/class.ViewDocument.php
2015-06-23 09:22:27 +02:00
Uwe Steinmann
cc9f40997b
rename approveLogId to approveLogID
2015-06-12 12:43:54 +02:00
Uwe Steinmann
bd475c6bd3
add link to review/approval files
2015-06-12 11:12:31 +02:00
Uwe Steinmann
48d5f38c4a
show link to downloaѕ review/approval file
2015-06-11 21:32:36 +02:00
Uwe Steinmann
e0fdb21986
check for currenttab
2015-06-09 09:18:57 +02:00
Uwe Steinmann
855b9695cd
approval can be submitted even after status S_DRAFT_APP has been left
2015-06-09 06:40:35 +02:00
Uwe Steinmann
fe47ee86cc
exiting review will not be hidden even if workflow mode is
...
traditional_only_approve
2015-06-02 10:23:50 +02:00
Uwe Steinmann
967f85a463
replace '/' by ', ' for better line break in header of table
2015-05-21 16:00:03 +02:00
Uwe Steinmann
555b586cda
replace '/' by ', ' for better line break in table header
2015-05-21 15:44:59 +02:00
Uwe Steinmann
4e4848c5d7
add more hooks for showing/editing attributes
2015-04-27 08:28:08 +02:00
Uwe Steinmann
46c2019ef2
nicer output of attribute values
2015-04-15 16:14:47 +02:00
Uwe Steinmann
ab07fbfef7
add hooks, put output of attribute into separate function
2015-04-14 19:38:50 +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
67bd3171b4
approval/review log was mixed up
2015-03-18 11:54:01 +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
56b57179f4
use new translation keys add_review and add_approval
2015-03-16 10:37:15 +01:00
Uwe Steinmann
8f96bbaa1d
workflow mode can be traditional without review
2015-03-16 08:58:10 +01:00
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