Commit Graph

396 Commits

Author SHA1 Message Date
Uwe Steinmann
5499dbeb66 Merge branch 'seeddms-4.3.6' into develop
Conflicts:
	languages/de_DE/lang.inc
2014-03-20 08:50:23 +01:00
Uwe Steinmann
b047f3a23f fix link to folder in clipboard menu 2014-03-20 08:37:47 +01: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
9b58c1fcfa make layout look more like document details page 2014-03-18 10:54:24 +01:00
Uwe Steinmann
d87296c859 make preview image size configurable 2014-03-18 10:03:39 +01:00
Uwe Steinmann
a3cd77dd17 show reverse document links 2014-03-18 07:07:12 +01:00
Uwe Steinmann
9032170149 pass sort order to ajax subtree command 2014-03-14 15:11:13 +01:00
Uwe Steinmann
2aa129772b add translated phrase for 'you are the manager of this group' 2014-03-06 20:31:14 +01:00
Uwe Steinmann
0a070eef1f Merge branch 'seeddms-4.3.5' into develop
Conflicts:
	languages/en_GB/lang.inc
	views/bootstrap/class.Bootstrap.php
2014-03-04 11:20:02 +01:00
Uwe Steinmann
598be765c6 force exitError() to not exit
added optional parameter noexit
2014-03-04 08:30:32 +01:00
Uwe Steinmann
ace5d1078b issue warning if mandatory users/groups have no access on document 2014-03-03 14:46:16 +01:00
Uwe Steinmann
50d939cd8e Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	Makefile
	op/op.RemoveFolder.php
2014-02-26 23:12:40 +01:00
Uwe Steinmann
0be40d61c8 fix vulnerablity against xss attack 2014-02-26 22:42:26 +01:00
Uwe Steinmann
31ffad39a8 fix security hole
missing check for passed parameters allows to read files on the server
2014-02-26 22:32:19 +01:00
Uwe Steinmann
5d879a3439 Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	Makefile
	op/op.Ajax.php
	styles/bootstrap/application.js
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-02-21 22:04:22 +01:00
Uwe Steinmann
5e2ede8fd5 set variable with preview width
next step will be to make this configurable
2014-02-21 21:51:53 +01:00
Uwe Steinmann
ea276405e6 unlinked documents/folders can be moved into rootfolder 2014-02-21 21:27:39 +01:00
Uwe Steinmann
02bd5c8f5f make warning about used attributes more visible 2014-02-21 21:26:56 +01:00
Uwe Steinmann
66b4885c8d fix some layout problems in forms 2014-02-21 11:27:03 +01:00
Uwe Steinmann
eae0d22bf3 add missing file for deleting content of document 2014-02-21 11:23:25 +01:00
Uwe Steinmann
3d1bb14c29 use same ordering in tree as in list (Bug #121) 2014-02-21 10:58:27 +01:00
Uwe Steinmann
a14c6b85e4 Merge branch 'seeddms-4.3.4' into develop
Conflicts:
	op/op.Login.php
2014-02-21 07:53:14 +01:00
Uwe Steinmann
90bea9a2fb fix handling of multivalue attributes 2014-02-20 21:05:22 +01:00
Uwe Steinmann
a4f26d3f68 Merge branch 'seeddms-4.3.3' into develop
Conflicts:
	CHANGELOG
	languages/de_DE/lang.inc
	languages/en_GB/lang.inc
	views/bootstrap/class.ViewFolder.php
2014-02-01 16:15:46 +01:00
Uwe Steinmann
94b107b7bd theme and language selector can be turn off on login page 2014-02-01 16:06:12 +01:00
Uwe Steinmann
3596a7a191 add support for configuring folder sort method of folders 2014-02-01 15:23:19 +01:00
Uwe Steinmann
5af3ceef36 apply htmlspecialchars() on converter cmds 2014-01-08 06:37:07 +01:00
Uwe Steinmann
2d4ded2d0f do not use short tags anymore 2014-01-08 06:36:40 +01:00
Uwe Steinmann
7c5e75cabb fix typo in type of input field 2014-01-08 06:36:11 +01:00
Uwe Steinmann
0ad0410404 run cmd of converters through htmlspecialchars() 2014-01-06 22:09:08 +01:00
Uwe Steinmann
ae8df3f9c6 replace all php short tags (bug #102) 2013-12-11 11:37:20 +01:00
Uwe Steinmann
d76d528baa fix missing 's' in submit button type 2013-12-11 11:29:38 +01:00
Uwe Steinmann
39f19f25bb Merge branch 'seeddms-4.3.2' into develop
Conflicts:
	Makefile
2013-11-27 14:10:05 +01:00
Uwe Steinmann
b5b93470a5 add new checks for unlinked documents and folders 2013-11-27 09:44:43 +01:00
Uwe Steinmann
49c38263f8 tree for document chooser lists documents in folders without subfolders (Bug #105) 2013-11-26 21:31:43 +01:00
Uwe Steinmann
564a0eec9d fix php warning because of undefined variable 2013-11-26 21:13:16 +01:00
Uwe Steinmann
4538a26fae check for cyclic parent-child relations between folders 2013-11-26 07:45:33 +01:00
Uwe Steinmann
cf867792b2 Merge branch 'seeddms-4.3.2' into develop 2013-11-24 18:20:36 +01:00
Uwe Steinmann
92a11af19f add hook folderListHeader 2013-10-08 21:10:08 +02:00
Uwe Steinmann
9ab1160cea move application.css at end of css files, include jquery.cookie.js 2013-10-08 21:09:06 +02:00
Uwe Steinmann
fac83d7e1f set priority of log msg 2013-10-06 12:27:06 +02:00
Uwe Steinmann
fcffe34047 list all approval/review logs if admin 2013-10-06 08:08:41 +02:00
Uwe Steinmann
d51eb587f1 turning of the language selector will no longer turn of user substitution 2013-09-30 11:08:05 +02:00
Uwe Steinmann
63d8fa4314 make jumploader work with java 1.7 2013-09-30 09:11:58 +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
eb9c1d14b6 add translation for 'Stastistic' (Bug #88) 2013-09-20 19:01:18 +02:00