Commit Graph

433 Commits

Author SHA1 Message Date
Uwe Steinmann
c67f279572 allow modification of Rev/App in S_DRAFT_APP if
traditional_only_approval is set
2015-03-18 11:34:36 +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
558be76dae new version 4.3.15 2015-03-12 11:06:23 +01:00
Uwe Steinmann
c3b80c1b5d add new option enableNotificationWorkflow
turns on/off is mail is set to users/groups in next step of workflow
2015-03-11 18:11:41 +01:00
Uwe Steinmann
e5c1f0fe09 getConfigDir() also works on MS Windows 2015-03-10 21:23:33 +01:00
Uwe Steinmann
87894319c9 do not use empty() on return value of function 2015-02-26 11:47:02 +01:00
Uwe Steinmann
0266c3a037 Merge branch 'seeddms-4.3.15' into develop 2015-02-24 19:53:59 +01:00
Uwe Steinmann
cb0d7d8d92 enableClipboard takes out all clipboard functions 2015-02-24 17:47:58 +01:00
Uwe Steinmann
1aa08781b2 Merge branch 'seeddms-4.3.14' into develop
Conflicts:
	Makefile
	SeedDMS_Core/Core/inc.ClassFolder.php
2015-01-29 18:22:19 +01:00
Uwe Steinmann
6516c7ff1a set version to 4.3.14 2015-01-29 18:20:03 +01:00
Uwe Steinmann
75ef47f6e1 expiration date of documents can be preset in settings 2015-01-29 17:28:40 +01:00
Uwe Steinmann
1f8af132d0 add methods getParam() and hasParam() 2015-01-08 08:12:11 +01:00
Uwe Steinmann
0bb366de1f add rootDir to include path 2014-12-08 14:51:26 +01:00
Uwe Steinmann
1c327c65c0 run hooks before and after initiaizing the dms 2014-12-08 14:40:30 +01:00
Uwe Steinmann
8cb8c2fb27 pass database as first parameter to constructor of extension mgr 2014-12-08 14:39:55 +01:00
Uwe Steinmann
4d2a0d2a88 init code for loading SeedDMS Core files 2014-12-08 14:38:51 +01:00
Uwe Steinmann
8237f92a7b read view class from extension directories
set default theme to bootstrap
2014-12-08 14:37:48 +01:00
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
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
d6d4bb70ba ?? 2014-02-01 15:23:56 +01:00
Uwe Steinmann
40649cc25a user absolute path for view controller 2014-01-13 14:22:28 +01:00
Uwe Steinmann
713cd9e0c0 disable otrace code 2014-01-13 14:22:04 +01:00
Uwe Steinmann
8c12e7c27e add some fold marks, new method hasHook() 2014-01-10 07:56:19 +01:00
Uwe Steinmann
99483da8a3 getConfigDir() checks all parent directories
it used to check only the current and the parent directory of the
running script. This wasn't suffcient for scripts in the extensions anymore.
Now it checks all parent directories recursively
2014-01-10 07:53:35 +01:00
Uwe Steinmann
69aa7db50b callHook() can handle function parameters passed to the hook 2014-01-10 07:52:53 +01:00
Uwe Steinmann
18d705a687 use always the same date format 2014-01-08 06:34:53 +01:00
Uwe Steinmann
cc603741d7 strip slashes from all _GET, _POST, _COOKIE, _REQUEST if magic quotes is on 2014-01-08 06:34:15 +01:00
Uwe Steinmann
d3955f17c1 use default languages if phrase is not set or empty 2014-01-08 06:33:40 +01:00
Uwe Steinmann
282612dc56 use smtpfrommail for From field 2014-01-08 06:33:09 +01:00
Uwe Steinmann
8a7866db81 use string from default language if translation is empty 2014-01-07 09:04:10 +01:00
Uwe Steinmann
713a387231 strip slashes from $_GET, $_POST, ... if magic quotes is on 2014-01-07 08:39:34 +01:00
Uwe Steinmann
7369aa2879 take from address from _smtpSendFrom 2014-01-06 22:08:01 +01:00
Uwe Steinmann
d6d33db858 use 'Y-m-d' for date formating 2013-12-17 11:18:45 +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
99cb2503dc new version 4.3.2 2013-11-27 10:58:20 +01:00
Uwe Steinmann
cf867792b2 Merge branch 'seeddms-4.3.2' into develop 2013-11-24 18:20:36 +01:00
Uwe Steinmann
abed5d1023 if SEEDDMS_CONFIG_FILE is set, it will be passed to Settings() 2013-10-30 09:57:12 +01:00
Uwe Steinmann
05d51c05bd use PATH_SEPARATOR and DIRECTORY_SEPARATOR 2013-10-21 12:14:37 +02:00
Uwe Steinmann
2cdad42ff9 add form to translated phrase for passing string to otrance 2013-10-08 21:07:28 +02:00
Uwe Steinmann
bcd18ef813 add optional parameter $priority to add_log_line() 2013-10-06 12:27:54 +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
9b021e6e20 new version 4.3.1 2013-09-20 21:36:10 +02:00
Uwe Steinmann
686666d42f pass smtp paramters to contructor of SeedDMS_Email 2013-09-13 14:55:34 +02:00
Uwe Steinmann
9382c4d1b1 add config parameters for smtp username and password 2013-09-13 14:54:37 +02:00
Uwe Steinmann
d1f62e0eae replaceMarker() is deprecated 2013-09-13 14:06:28 +02:00
Uwe Steinmann
3b4b256763 use PEAR::Mail for sending mails, add support for smtp authentication 2013-09-13 14:04:31 +02:00
Uwe Steinmann
353da0c297 Merge branch 'seeddms-4.3.1' into develop 2013-09-05 23:01:27 +02:00
Uwe Steinmann
9a0d6cb3b8 set icon for rar files (fixes bug #85) 2013-09-05 22:59:45 +02:00
Uwe Steinmann
6e6fb20244 Merge branch 'hooks' into develop
Conflicts:
	Makefile
2013-09-05 08:52:37 +02:00
Uwe Steinmann
b6ca77e261 new version 4.3.0 2013-09-05 07:44:22 +02:00