Commit Graph

410 Commits

Author SHA1 Message Date
Uwe Steinmann
aa6bdf000b Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.Search.php
	views/bootstrap/class.ViewFolder.php
2014-06-04 21:25:30 +02:00
Uwe Steinmann
aa80f28de1 set splash message 2014-06-04 19:17:44 +02:00
Uwe Steinmann
e0a49734f0 'movefolder' requires a formtoken 2014-06-04 19:17:08 +02:00
Uwe Steinmann
c09e650c89 add 'deletedocument', 'movedocument' requires a formtoken 2014-06-04 19:15:28 +02:00
Uwe Steinmann
10b609927a Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	op/op.UpdateDocument.php
2014-06-04 08:03:20 +02:00
Uwe Steinmann
3b129502a0 unlock document if updated by admin or owner of document 2014-06-04 08:01:35 +02: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
51b84868a6 check if document is locked 2014-06-03 17:50:20 +02:00
Uwe Steinmann
858552b743 setting version to 0 will retrieve the latest version 2014-06-03 08:48:27 +02:00
Uwe Steinmann
05d6d9dca5 create preview image if it doesn't exists 2014-05-28 14:58:04 +02:00
Uwe Steinmann
5a8d13e1e7 get latest version if 'version' < 1 2014-05-28 14:54:10 +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
66c89d2875 set password expiration even if password is not set 2014-05-22 06:43:18 +02:00
Uwe Steinmann
4fa324f99e change deletion of old sessions
the time when an old session is deleted is taken from the cookie
lifetime. If set to 0 it will be after 1 week
2014-05-22 06:40:47 +02:00
Uwe Steinmann
2e7197665e run SeedDMS_Session::updateAccess() explicitly 2014-05-22 06:39:54 +02:00
Uwe Steinmann
71fb34cbca check quota 2014-05-20 06:43:44 +02:00
Uwe Steinmann
8cd9210107 quota can be set 2014-05-20 06:23:32 +02:00
Uwe Steinmann
319b2cbe75 Merge branch 'seeddms-4.3.8' into develop 2014-04-15 18:53:21 +02:00
Uwe Steinmann
cfe5d1561c set LDAP_OPT_REFERRALS in case of AD 2014-04-15 15:32:43 +02:00
Uwe Steinmann
783a7a3d37 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 21:41:56 +02:00
Uwe Steinmann
c550d7f11d use preview image width from settings 2014-04-10 21:38:33 +02:00
Uwe Steinmann
0144c4c396 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 11:22:05 +02:00
Uwe Steinmann
7f8d35bb38 check for empty attributes array (Bug #150) 2014-04-09 21:29:13 +02:00
Uwe Steinmann
4d094b2920 show single doc/folder only if the search returns 1 hit
till now it could happen, that if the last page of a search result contained
only 1 record, then this record was shown.
2014-04-09 10:50:17 +02:00
Uwe Steinmann
c180f17f98 Merge branch 'seeddms-4.3.8' into develop
Conflicts:
	styles/bootstrap/application.js
	views/bootstrap/class.Bootstrap.php
2014-04-09 06:26:32 +02:00
Uwe Steinmann
183c772d6a allow calling submittranslation only if showmissingtranslation is turned on 2014-04-08 10:43:59 +02:00
Uwe Steinmann
99ba945b75 add subcommand for submitting new translation 2014-04-08 10:41:53 +02:00
Uwe Steinmann
0ff38100c6 new parameter to turn missing translation output 2014-04-08 10:40:20 +02:00
Uwe Steinmann
5c3a22dee1 return message when password was send 2014-04-01 17:14:57 +02:00
Uwe Steinmann
885a26a6a4 check for saving empty category and keyword (Bug #148) 2014-04-01 13:59:34 +02:00
Uwe Steinmann
0d61fc80ec issue error if to is before from date 2014-04-01 11:12:54 +02:00
Uwe Steinmann
52bab22fc2 add fields for homefolder and quota 2014-03-26 17:31:37 +01:00
Uwe Steinmann
84c89c3ed6 go to home folder if set for user 2014-03-26 17:30:38 +01:00
Uwe Steinmann
3fc340f226 check for quota 2014-03-26 17:30:19 +01:00
Uwe Steinmann
1d011feaf6 Merge branch 'seeddms-4.3.8' into develop 2014-03-26 07:29:28 +01:00
Uwe Steinmann
7477c907d8 subtree command sets load_on_demand propperly
for folders with just documents the load_on_demand wasn't set
propperly. Those folders could not be opened in the Document Chooser
2014-03-24 10:39:02 +01:00
Uwe Steinmann
1b95fee8d5 fix merge conflickts 2014-03-21 09:21:49 +01:00
Uwe Steinmann
468846b19f Merge branch 'seeddms-4.3.7' into develop
Conflicts:
	Makefile
	op/op.Download.php
2014-03-21 09:20:19 +01:00
Uwe Steinmann
5b0a4ea614 trim referuri 2014-03-21 08:11:12 +01:00
Uwe Steinmann
ef923b5f72 check POST vars for valid values, prevent access to arbitrary files on the server 2014-03-21 08:10:23 +01:00
Uwe Steinmann
fcca6049ac check POST vars for valid values, preventing access to arbitrary files on the server 2014-03-21 08:09:07 +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
d87296c859 make preview image size configurable 2014-03-18 10:03:39 +01:00
Uwe Steinmann
bbd1fd6445 take enableAdminRevApp and enableOwnerRevApp into account
getReadAccessList() doesn't return the owner and administrators
unless explicitly requested by passing true for the first and second
parameter
2014-03-14 15:11:40 +01:00
Uwe Steinmann
aa399e50bb subtree takes sort order into account 2014-03-14 15:10:29 +01:00
Uwe Steinmann
52e24892f6 turn off http only cookies if large file upload is enabled (Bug #132) 2014-03-13 12:51:48 +01:00
Uwe Steinmann
4f31a040b6 Merge branch 'seeddms-4.3.5' into develop 2014-03-06 11:42:09 +01:00
Uwe Steinmann
87e7aa083a various enhacements
do not include lang file unless user is logged in,
check for user in all cases besides calculating the password strength
add comman 'session_info'
2014-03-06 11:33:31 +01:00
Uwe Steinmann
386ac5f208 Merge branch 'seeddms-4.3.5' into develop
Conflicts:
	Makefile
2014-03-04 19:48:08 +01:00
Uwe Steinmann
d3caff7cdc first check if folder has parent before accessing the parent 2014-03-04 17:58:00 +01:00