Commit Graph

366 Commits

Author SHA1 Message Date
Uwe Steinmann
c1b216bf51 running controller can set an error number
getErrorNr() retrieves this number
2014-12-08 14:36:26 +01:00
Uwe Steinmann
c560d21425 check extension dirs for controller class 2014-12-08 14:35:51 +01:00
Uwe Steinmann
44399154b8 Merge branch 'master' into develop 2014-11-27 14:27:56 +01:00
Uwe Steinmann
fc9d815725 new version 4.3.13 2014-11-27 14:25:50 +01:00
Uwe Steinmann
e9c3696466 Merge branch 'seeddms-4.3.13' into develop
Conflicts:
	Makefile
2014-11-19 17:04:56 +01:00
Uwe Steinmann
93510320ec new version 4.3.12 2014-11-17 07:15:13 +01:00
Uwe Steinmann
a121bd15f9 add function makeTsFromLongDate()
convert date from database into timestamp
2014-11-14 20:22:30 +01:00
Uwe Steinmann
803d819c03 fix creating of configuration file
createExtensionConf() will in any case create a file, even if there
are no extensions available. It will not automatically include that
file anymore.
2014-11-13 13:56:13 +01:00
Uwe Steinmann
4f58d67d62 check for hostname include port doesn't fail anymore 2014-11-13 13:29:32 +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
f76cb1afc1 new version 4.3.11 2014-11-07 08:42:55 +01:00
Uwe Steinmann
e364c3dd92 Merge branch 'seeddms-4.3.10' into develop
Conflicts:
	Makefile
2014-10-22 14:26:52 +02:00
Uwe Steinmann
a7a6d8d8ac new version 4.3.10 2014-10-22 14:15:16 +02:00
Uwe Steinmann
e2974f2054 Merge branch 'seeddms-4.3.9' into develop
Conflicts:
	views/bootstrap/class.ViewFolder.php
2014-07-11 12:49:21 +02:00
Uwe Steinmann
289649b6ee add file upload via drag&drop
can be enabled in the settings
2014-07-11 08:41:25 +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
e669b0acd5 mayEditComment() checks if document is locked 2014-06-03 17:50:58 +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
4de2bf318d new version 4.3.9 2014-05-22 07:50:36 +02:00
Uwe Steinmann
a5863e4a10 run SeedDMS_Session::updateAccess() because load() doesn't do it anymore 2014-05-22 06:37:56 +02:00
Uwe Steinmann
878ab2fd9a add class SessionMgr, different session update
add SeedDMS_Session::getLastUpdate(), SeedDMS_Session::load() doesn't
update last access anymore
new Session manager not ready yet
2014-05-22 06:35:12 +02:00
Uwe Steinmann
6e8af30e17 checkQuota() now takes the user as an argument 2014-05-20 06:31:12 +02:00
Uwe Steinmann
9d760dd53f replace dskspace() with platform independ version (Bug #156) 2014-05-16 12:48:37 +02:00
Uwe Steinmann
0144c4c396 Merge branch 'seeddms-4.3.8' into develop 2014-04-10 11:22:05 +02:00
Uwe Steinmann
55a8d7275f make class variable _number public 2014-04-10 11:19:22 +02:00
Uwe Steinmann
71fb0326e1 Merge branch 'seeddms-4.3.8' into develop
Conflicts:
	Makefile
2014-04-09 09:55:38 +02:00
Uwe Steinmann
8bb07f80b7 new version 4.3.8 2014-04-09 09:46:16 +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
84f3942fba add array for holding missing translations 2014-04-08 10:41:19 +02:00
Uwe Steinmann
84da6f7e58 set parameter showmissingtranslation for each view 2014-04-08 10:40:54 +02:00
Uwe Steinmann
0ff38100c6 new parameter to turn missing translation output 2014-04-08 10:40:20 +02: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
caa8603435 set version to 4.3.7 2014-03-21 09:13:31 +01:00
Uwe Steinmann
e4411cadf1 new version 4.3.7 2014-03-21 09:04:23 +01:00
Uwe Steinmann
21d5c868a3 fix check for referer starting with /op
didn't work, because referer was urlencode before the check, which
turned the '/' into '%xx'
2014-03-21 08:07:18 +01:00
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
ac630948da do not read preview width from settings if not set 2014-03-20 08:17:46 +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
f919c4ae2f new version 4.3.6 2014-03-18 16:46:13 +01:00
Uwe Steinmann
d87296c859 make preview image size configurable 2014-03-18 10:03:39 +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
d0769bcdf7 renew cookie lifetime unless set to 0 2014-03-06 11:32:45 +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
f9c4c02fdc new version 4.3.5 2014-03-04 19:45:29 +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
d21a0384fa add missing parenthesis in version file (Bug #100) 2014-02-21 11:05:49 +01:00
Uwe Steinmann
4d44f549e9 set version to 4.3.4 2014-02-21 09:04:15 +01:00
Uwe Steinmann
6aa821490d Merge branch 'seeddms-4.3.3' into develop
Conflicts:
	Makefile
2014-02-01 16:46:34 +01:00
Uwe Steinmann
92554f64aa new version 4.3.3 2014-02-01 16:28:54 +01:00