gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-17 05:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,752 Commits 7 Branches 76 Tags 32 MiB
e5016cf4f1
Commit Graph

667 Commits

Author SHA1 Message Date
Uwe Steinmann
f81eab28b4 new version 4.3.23 2016-01-21 07:41:09 +01:00
Uwe Steinmann
c43c5e64eb ldap search can be filtered 2016-01-19 15:30:54 +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
aefa0c120e set param 'class' for inclusion of view specific javascript file 2015-12-11 20:19:54 +01:00
Uwe Steinmann
20e7b873a5 get classname of SeedDMS Document from dms instance 
don't use hard coded SeedDMS_Core_Document anymore
 2015-12-04 08:34:32 +01:00
Uwe Steinmann
574cc53075 Merge branch 'seeddms-5.0.x' into develop 2015-12-03 15:24:41 +01:00
Uwe Steinmann
c93bc1bfa1 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-12-03 15:24:29 +01:00
Uwe Steinmann
eee4e2f0eb add getUser() 2015-12-01 18:06:15 +01:00
Uwe Steinmann
10cbf3b3b3 add pptx to getMimeType() 2015-11-30 20:46:55 +01:00
Uwe Steinmann
1f77a749be Merge branch 'seeddms-5.0.x' into develop 2015-11-27 16:09:11 +01:00
Uwe Steinmann
8d88844190 move replaceMarker from Notify 2015-11-25 17:19:28 +01:00
Uwe Steinmann
401f3ba685 move set sender into EmailNotify 2015-11-25 17:18:58 +01:00
Uwe Steinmann
18c397b7c7 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-25 17:03:04 +01:00
Uwe Steinmann
f021f1e2fd remove sendPassword() because it is now in SeedDMS_EmailUtils 2015-11-25 17:02:15 +01:00
Uwe Steinmann
250400a9cb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-11-25 17:01:52 +01:00
Uwe Steinmann
eda80242ea some reorganization of email notification 2015-11-25 16:49:09 +01:00
Uwe Steinmann
4dd2dc87af new version 4.3.22 2015-11-09 20:00:02 +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
9514115460 rename doNotCheckVersion to doNotCheckDBVersion 2015-09-28 06:39:26 +02:00
Uwe Steinmann
109f814fa9 new version 4.3.21 2015-09-22 10:22:40 +02:00
Uwe Steinmann
fcbb5f68fe Merge branch 'seeddms-5.0.x' into develop 2015-09-22 08:51:59 +02:00
Uwe Steinmann
c3296e476b Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-09-22 07:57:54 +02:00
Uwe Steinmann
904cd7a857 use $db->getCurrentTimestamp() instead of mktime 2015-09-22 07:51:13 +02:00
Uwe Steinmann
397c5ee9d8 Merge branch 'seeddms-5.0.x' into develop 2015-08-25 14:58:49 +02:00
Uwe Steinmann
78b39a24c5 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-25 14:58:35 +02:00
Uwe Steinmann
eca7d067c5 add getParam() 2015-08-25 14:58:16 +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
80f0499d1b add method __invoke() 
calls the function whose name is passed as $_GET['action']
 2015-08-20 15:53:30 +02:00
Uwe Steinmann
cbbe331fe2 new version 4.3.20 2015-08-19 08:42:05 +02:00
Uwe Steinmann
aa49c5b0b1 Merge branch 'seeddms-5.0.x' into develop 2015-08-10 21:58:16 +02:00
Uwe Steinmann
65fda6daee Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-10 21:53:27 +02:00
Uwe Steinmann
b0413a0d46 engine for fulltext search can be configured 2015-08-10 21:41:51 +02:00
Uwe Steinmann
4c907dbf9e Merge branch 'seeddms-5.0.x' into develop 2015-08-07 20:08:29 +02:00
Uwe Steinmann
cbf40c2b6f mayApprove() returns false if status is S_REJECTED 
this must be the case because if a document was rejected during review
the approval process may not happen anymore. The disadvantages is, that
a document which was rejected during approval cannot not be released
anymore.
 2015-08-07 14:21:32 +02:00
Uwe Steinmann
92f66f4b4a Merge branch 'seeddms-5.0.x' into develop 2015-08-07 13:37:30 +02:00
Uwe Steinmann
17a9eb739c Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-07 13:37:14 +02:00
Uwe Steinmann
70e504ecef Merge branch 'seeddms-5.0.x' into develop 2015-08-07 13:20:10 +02:00
Uwe Steinmann
051e1d966a use $dms->getClassname() when checking for propper object type 2015-08-07 13:18:40 +02:00
Uwe Steinmann
5844522262 fix wrong variable name 2015-08-07 13:16:30 +02:00
Uwe Steinmann
c4f7223293 Merge branch 'seeddms-5.0.x' into develop 2015-08-07 13:13:14 +02:00
Uwe Steinmann
482143c04f pass $dms to contructor of SeedDMS_AccessOperation 2015-08-07 13:11:50 +02:00
Uwe Steinmann
57abe53166 set default language to en_GB (was still 'English') 2015-08-07 09:11:00 +02:00
Uwe Steinmann
55ccf3e987 Merge branch 'seeddms-5.0.x' into develop 2015-08-05 21:14:35 +02:00
Uwe Steinmann
122fcdb3c9 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-08-05 21:14:17 +02:00
Uwe Steinmann
7485a85077 set timeout for external commands when creating fulltext index 2015-08-05 21:11:21 +02:00
Uwe Steinmann
de8726cccf Merge branch 'seeddms-5.0.x' into develop 2015-07-28 09:01:02 +02:00
Uwe Steinmann
534e4a73f4 Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-07-28 07:53:21 +02:00
Uwe Steinmann
fd62547a69 dskspace() checks if directory could be opened 2015-07-28 07:53:10 +02:00
Uwe Steinmann
0c48b342a5 dskspace() checks if directory could be opened 2015-07-28 07:50:37 +02:00
Uwe Steinmann
c1b28071df addSepDir() doesn't add dir separator to empty string 
also remove space from string
 2015-07-28 07:32:29 +02:00
Uwe Steinmann
ff53a3e3e5 backup dir can be set 2015-07-28 07:29:08 +02:00
Uwe Steinmann
b520bfece0 add method addDirSep() 2015-07-28 07:28:34 +02:00
Uwe Steinmann
9a228017c1 take duplicate declaration of doNotCheckDBVersion 2015-07-28 06:45:43 +02:00
Uwe Steinmann
5f8cc5f460 add class variable _doNotCheckDBVersion 2015-07-24 16:05:47 +02:00
Uwe Steinmann
dc092daa8f use view classes from extension only if enabled 2015-07-22 07:09:13 +02:00
Uwe Steinmann
368ef8478c use view classes from extension only if enabled 2015-07-22 07:08:22 +02:00
Uwe Steinmann
1727387ac5 add method getHookObjects() 2015-07-15 22:30:03 +02:00
Uwe Steinmann
8856837883 check for views relative to $settings->_rootDir 2015-07-15 22:29:34 +02:00
Uwe Steinmann
4e9cadeca6 add new method getHookObjects() which returns all registered hook objects 2015-07-15 16:59:36 +02:00
Uwe Steinmann
ce79c8e8cd check for files relative to $settings->_rootDir instead of '../' 2015-07-15 16:58:53 +02:00
Uwe Steinmann
889779113d first check if user is an object before using it 2015-07-14 21:35:53 +02:00
Uwe Steinmann
f616c6cf39 check if user is valid before using it 2015-07-14 21:34:51 +02:00
Uwe Steinmann
bdfb552204 auto login user if not already logged in 
the user won't have a session, but will be granted access for the
http request

Conflicts:
	inc/inc.Authentication.php
 2015-07-14 21:32:15 +02:00
Uwe Steinmann
f35ae2736a add new paramter autoLoginUser 2015-07-14 21:28:47 +02:00
Uwe Steinmann
f187dff23a auto login user if not already logged in 
the user won't have a session, but will be granted access for the
http request
 2015-07-14 21:23:54 +02:00
Uwe Steinmann
a2179ca53e add new paramter autoLoginUser 2015-07-14 21:23:33 +02:00
Uwe Steinmann
f35573611d set param enablemenutasks for view 2015-07-09 07:59:02 +02:00
Uwe Steinmann
cd3a239482 add new config parameter enableMenuTasks 2015-07-09 07:58:34 +02:00
Uwe Steinmann
f98aecaa59 add configuration parameter to turn of database version check 2015-06-30 07:53:36 +02:00
Uwe Steinmann
8ca8ae97bb Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 2015-06-30 07:53:13 +02:00
Uwe Steinmann
9666fe121f add configuration parameter to turn of database version check 2015-06-30 07:52:07 +02:00
Uwe Steinmann
463e94ee8a Merge branch 'seeddms-4.3.x' into seeddms-5.0.x 
Conflicts:
	CHANGELOG
	Makefile
	SeedDMS_Core/Core/inc.ClassDMS.php
	SeedDMS_Core/package.xml
	inc/inc.Utils.php
	inc/inc.Version.php
	install/install.php
	op/op.ApproveDocument.php
	op/op.Login.php
	op/op.RemoveDocumentLink.php
	op/op.ReviewDocument.php
	out/out.SetReviewersApprovers.php
	views/bootstrap/class.Bootstrap.php
 2015-06-30 07:05:27 +02:00
Uwe Steinmann
6c016f236a new version 4.3.19 2015-06-26 16:46:41 +02:00
Uwe Steinmann
806464a3fb first check for <converters target="fulltext"> 
in preview of newer versions which will have other targets for
converters
 2015-06-26 16:21:05 +02:00
Uwe Steinmann
6b816f4d44 better handling of converters, added converters for preview 
commands can also be deleted
 2015-06-24 21:25:53 +02:00
Uwe Steinmann
ac550a1ec1 ållow to set review/approver in status draft 2015-06-24 17:28:55 +02:00
Uwe Steinmann
b95f7ed91a new parameter overrideMimeType 2015-06-23 07:47:00 +02:00
Uwe Steinmann
f960bc81b4 new parameter overrideMimeType 2015-06-23 07:46:39 +02:00
Uwe Steinmann
515e95c227 new parameter overrideMimeType 2015-06-23 07:44:47 +02:00
Uwe Steinmann
5d5d954077 createToc() uses self::items, use counter for columns 2015-06-17 07:59:06 +02:00
Uwe Steinmann
d12f9993dd add mayReceipt() 2015-06-15 14:13:38 +02:00
Uwe Steinmann
ecafa39d1e mayApprove() checks if document is in review 2015-06-15 09:01:16 +02:00
Uwe Steinmann
d02c06a87f mayApprove() checks if document is in review 2015-06-15 08:56:18 +02:00
Uwe Steinmann
b69f91cf12 mayApprove() checks if document is in review 2015-06-15 08:53:39 +02:00
Uwe Steinmann
b3c9cb2728 add function get_extension() 
returns file extension by mimetype

Conflicts:
	inc/inc.Utils.php
 2015-06-12 09:01:41 +02:00
Uwe Steinmann
c8fcd1cebc add function get_extension() 
returns file extension by mimetype

Conflicts:
	inc/inc.Utils.php
 2015-06-12 09:01:01 +02:00
Uwe Steinmann
561b8d81ee add function get_extension() 
returns file extension by mimetype
 2015-06-12 08:59:05 +02:00
Uwe Steinmann
f2a7811f0c use SeedDMS_Core_DMS::getClassname() to check for propper class 2015-06-09 21:51:09 +02:00
Uwe Steinmann
a60294f371 use SeedDMS_Core_DMS::getClassname() to check for propper class 2015-06-09 21:50:32 +02:00
Uwe Steinmann
0c053d410c put creation of excel file into its own method 2015-06-09 21:34:07 +02:00
Uwe Steinmann
6a7b9c8a65 mayRecipients() and mayRevision() return only true if document ist 
released
 2015-06-09 21:33:08 +02:00
Uwe Steinmann
4a5c768385 add methode version() 2015-06-09 06:59:49 +02:00
Uwe Steinmann
fb2e7dfe12 utf8_decode file name in zip file 2015-06-08 22:03:08 +02:00
Uwe Steinmann
94744862a5 create excel file with meta data for for files in zip archive 2015-06-08 09:06:59 +02:00
Uwe Steinmann
a6085279c9 add class for downloading a bunch of document versions 2015-06-02 17:27:35 +02:00
Uwe Steinmann
dea874de02 set $_initialDocumentStatus to 2 instead of S_RELEASED 
the constant S_RELEASED isn't know at that time
 2015-06-02 17:26:41 +02:00
Uwe Steinmann
1123611371 rename mayOverwriteStatus() to mayOverrideStatus() 2015-06-02 10:04:35 +02:00
Uwe Steinmann
d9d4d89a27 set initial document status 2015-06-02 10:02:46 +02:00
Uwe Steinmann
86f641c3b0 new status in getOverallStatusText() 2015-06-02 10:02:02 +02:00
Uwe Steinmann
596a577529 show link to revise document even if still in workflow 2015-06-01 17:35:25 +02:00
Uwe Steinmann
c2e49aa2d7 take out old code 2015-06-01 07:40:02 +02:00
Uwe Steinmann
b8d06babee add setting for library folder 2015-05-29 20:42:37 +02:00
Uwe Steinmann
38b7a7c660 callHook() returns null if no method was found 2015-05-29 20:41:52 +02:00
Uwe Steinmann
536ead64ac allow to substitute user for regular users 2015-05-19 19:44:18 +02:00
Uwe Steinmann
778e867618 new version 5.0.0 2015-05-19 08:24:09 +02:00
Uwe Steinmann
6cfdea17b3 add function to return revision status 2015-05-12 19:10:02 +02:00
Uwe Steinmann
608a86d45c rename reviser to revisor, added revision workflow to document page 2015-05-11 09:30:13 +02:00
Uwe Steinmann
9b643fa700 check for extension dir before reading contents 2015-05-04 07:15:00 +02:00
Uwe Steinmann
3fc72a3fff check for extension dir before reading contents 2015-05-04 07:14:24 +02:00
Uwe Steinmann
4187b78053 new version 4.3.18 2015-05-04 06:26:01 +02:00
Uwe Steinmann
2a1ce40a9c add functions getReceiptStatusText() and printReceiptStatusText() 2015-04-28 12:18:01 +02:00
Uwe Steinmann
c7ad9433a1 return value of hook will be passed on even if not a string 2015-04-27 08:28:01 +02:00
Uwe Steinmann
877f937413 return value of hook will be passed on even if not a string 2015-04-27 08:26:51 +02:00
Uwe Steinmann
2781974f7b Merge commit 'a252f82f085b8284d353a31a7fa583b8f12da4fa' into seeddms-5.0.0-pre3 2015-04-23 12:38:31 +02:00
Uwe Steinmann
4f3c6ed090 add checkbox for creating checkout dir if it doesn't exists 2015-04-22 17:21:57 +02:00
Uwe Steinmann
df75ae5c8c add method maySetReviser 2015-04-22 11:41:39 +02:00
Uwe Steinmann
387f67dad4 enable/disable Acknowledge and Revision workflow 2015-04-20 13:44:45 +02:00
Uwe Steinmann
ff9b3486c5 add maySetRecipients() 2015-04-20 13:44:13 +02:00
Uwe Steinmann
bcb34f1e51 set parameter checkoutdir in view 2015-04-17 20:11:09 +02:00
Uwe Steinmann
dc08f8df1b add configuration of checkout dir 2015-04-17 20:10:36 +02:00
Uwe Steinmann
d16559c3d1 fix creation of cached extension configuration 2015-04-16 08:03:23 +02:00
Uwe Steinmann
1717277684 set version to 5.0.0-pre3 2015-04-15 21:19:02 +02:00
Uwe Steinmann
c340006089 set 'dms' in view when calling exitError() 2015-04-15 16:12:44 +02:00
Uwe Steinmann
ffe2192376 add errormsg 2015-04-15 16:11:45 +02:00
Uwe Steinmann
e21429433c check for configured views in extension configuration 2015-04-14 19:39:43 +02:00
Uwe Steinmann
986613cf6e initialize $EXT_CONF to an empty array() 2015-04-07 06:44:15 +02:00
Uwe Steinmann
9b5ca19391 do not use syntax which requires php > 5.5.x 2015-03-30 17:40:54 +02:00
Uwe Steinmann
72c3207a75 Merge branch 'seeddms-4.3.17' into develop 
Conflicts:
	Makefile
 2015-03-30 16:40:24 +02:00
Uwe Steinmann
35043b1cda new version 4.3.17 2015-03-27 17:34:28 +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
358c239c3a new version 4.3.16 2015-03-20 08:16:05 +01:00
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