Commit Graph

65 Commits

Author SHA1 Message Date
Uwe Steinmann
49be0485c5 role is now an instance of SeedDMD_Core_Role 2016-02-24 14:35:37 +01:00
Uwe Steinmann
067890345e Merge branch 'seeddms-5.0.x' into develop 2016-02-17 11:44:25 +01:00
Uwe Steinmann
199ba46ce8 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-02-17 11:43:42 +01:00
Uwe Steinmann
a15b83dc99 add setting header of javascript file 2016-02-17 11:43:19 +01:00
Uwe Steinmann
179af06438 split printFolderChooser() for home folder into js and html 2016-02-17 11:35: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
e9f185533c do not show substitute user button if not admin or same user 2016-02-15 15:23:29 +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
65ce04d175 show pending reviews/approvals/workflows only for configured workflow mode 2016-02-10 10:34:02 +01:00
Uwe Steinmann
c0a1ed57bb list documents in workflow, add button to substitute user 2016-02-10 10:04:24 +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
0ca91816b5 pass strictformcheck to view, fix undefined variable error 2016-02-01 19:56:13 +01:00
Uwe Steinmann
51f80c0930 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2016-01-27 17:23:22 +01:00
Uwe Steinmann
380c916c66 a list of mandatory workflows can be set 2016-01-27 16:20:12 +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
4a23bd9eca rename css() to js() 2015-12-11 08:21:04 +01:00
Uwe Steinmann
5387401098 major rewrite to make it csp ready
place all javascript in a javascript file
2015-12-11 08:14:42 +01:00
Uwe Steinmann
d493715ae8 simplify some old javascript code 2015-12-10 12:43:19 +01:00
Uwe Steinmann
52b64822c5 show name of volume for checkout 2015-12-08 09:00:04 +01:00
Uwe Steinmann
ddfea8f3cb Merge branch 'seeddms-5.0.x' into develop 2015-09-28 12:35:18 +02:00
Uwe Steinmann
1ab19f6831 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-28 12:35:04 +02:00
Uwe Steinmann
23362f8146 remove old code, set data-query in div.ajax elements
load an initial user when the page is opened
2015-09-25 16:17:23 +02:00
Uwe Steinmann
8c0377aa39 Merge branch 'seeddms-5.0.x' into develop 2015-08-21 11:10:23 +02:00
Uwe Steinmann
2be77ac0e9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-21 11:10:05 +02:00
Uwe Steinmann
8256b61e36 do not output info if no user is selected 2015-08-21 11:09:38 +02:00
Uwe Steinmann
b7de0f61c7 Merge branch 'seeddms-5.0.x' into develop 2015-08-20 22:38:08 +02:00
Uwe Steinmann
6e80f025cf Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-20 15:55:53 +02:00
Uwe Steinmann
26819ce00e add method info(), place output of info below user selection 2015-08-20 15:55:03 +02:00
Uwe Steinmann
f59751aa14 set data-view and data-action in div.ajax tag instead of data-href 2015-08-20 14:52:36 +02:00
Uwe Steinmann
cde8e830f5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 09:24:05 +02:00
Uwe Steinmann
4b94100cbe set users for showForm 2015-08-19 09:19:24 +02:00
Uwe Steinmann
4c6eb18528 Merge branch 'seeddms-5.0.x' into develop 2015-08-19 06:09:20 +02:00
Uwe Steinmann
83fbab5149 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-19 06:05:48 +02:00
Uwe Steinmann
4358eb9a39 load form for user on demand via ajax 2015-08-18 22:45:51 +02:00
Uwe Steinmann
536ead64ac allow to substitute user for regular users 2015-05-19 19:44:18 +02:00
Uwe Steinmann
f86fe26eee add placeholder to ind reviewer select box 2015-05-19 13:27:53 +02:00
Uwe Steinmann
34bdb9cb21 add placeholder to ind reviewer select box 2015-05-19 13:27:22 +02:00
Uwe Steinmann
20a695f571 minor html fixes 2015-05-19 13:26:10 +02:00
Uwe Steinmann
06c71cc332 add handling of substitutes 2015-05-19 08:06:24 +02:00
Uwe Steinmann
234d333bfc fix selection of home folder 2015-03-20 08:40:30 +01: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
4c41f560c3 reorganize code
make one single method which creates to add/update form
2015-03-17 09:54:59 +01:00
Uwe Steinmann
8db94efbf9 Merge branch 'seeddms-4.3.11' into develop 2014-10-31 13:29:21 +01:00
Uwe Steinmann
3ddf1727fd allow passwords to be never expire 2014-10-31 13:20:43 +01: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