Uwe Steinmann
|
4b76b5e6ae
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2019-02-01 09:30:32 +01:00 |
|
Uwe Steinmann
|
4b1e933c76
|
add new config option $_allowChangeRevAppInProcess
|
2019-02-01 08:59:43 +01:00 |
|
Uwe Steinmann
|
bcfde858d8
|
new parameter xsendfile
|
2019-01-18 13:08:21 +01:00 |
|
Uwe Steinmann
|
e252af2df4
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2018-12-18 06:19:18 +01:00 |
|
Uwe Steinmann
|
e490c1a0f2
|
check if loading the settings.xml succeeded
|
2018-11-27 12:17:51 +01:00 |
|
Uwe Steinmann
|
ff07a141e8
|
do not set php vars SMTP, smtp_port, sendmail_from anymore
|
2018-11-21 08:29:58 +01:00 |
|
Uwe Steinmann
|
b7e1cb869c
|
take out ancient document conversion code
|
2018-11-21 08:27:59 +01:00 |
|
Uwe Steinmann
|
5c2e3edee7
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2018-04-19 13:54:04 +02:00 |
|
Uwe Steinmann
|
9db601e610
|
add methods arrayToString() and stringToArray()
|
2018-04-19 13:41:50 +02:00 |
|
Uwe Steinmann
|
0199019ee6
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2018-04-12 15:57:21 +02:00 |
|
Uwe Steinmann
|
0b4b3fb9d9
|
check if xml node in configuration exists before accessing it
|
2018-04-12 06:46:35 +02:00 |
|
Uwe Steinmann
|
dfe2e3f167
|
add new option for configuring replacement of documents in webdav
|
2018-04-12 06:41:51 +02:00 |
|
Uwe Steinmann
|
fd5920fc8d
|
take enable[Revision|Receipt]Workflow into account
|
2018-04-03 09:32:36 +02:00 |
|
Uwe Steinmann
|
939cbd7a56
|
make counted task in menu selectable
|
2018-03-26 10:00:20 +02:00 |
|
Uwe Steinmann
|
dffdc46568
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2018-03-20 07:22:23 +01:00 |
|
Uwe Steinmann
|
db3990b8b7
|
make repository for extensions configurable
|
2018-03-14 18:43:01 +01:00 |
|
Uwe Steinmann
|
9b2eecca0e
|
rejecting a revision will neccesarily put document in need correction status
|
2018-03-13 17:51:44 +01:00 |
|
Uwe Steinmann
|
a87d493cb3
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2018-02-27 07:40:01 +01:00 |
|
Uwe Steinmann
|
963c30956a
|
add configuration allowReviewerOnly
|
2018-02-26 08:08:57 +01:00 |
|
Uwe Steinmann
|
ab7776bdb9
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2018-02-07 22:32:18 +01:00 |
|
Uwe Steinmann
|
987025331d
|
set default position of new documents/folders (Closes #381)
|
2018-02-07 08:43:46 +01:00 |
|
Uwe Steinmann
|
e97c3a4b25
|
allow to set receiver when uploading a document
|
2018-01-16 18:15:05 +01:00 |
|
Uwe Steinmann
|
e36fbd87d8
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-12-18 11:10:14 +01:00 |
|
Uwe Steinmann
|
dec3b44123
|
add configuration for number of entries on viewfolder page
|
2017-12-14 09:39:05 +01:00 |
|
Uwe Steinmann
|
545cdb4e32
|
backup dir can be set in configuration
|
2017-11-21 11:51:45 +01:00 |
|
Uwe Steinmann
|
5b2da28edd
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-09-27 07:02:38 +02:00 |
|
Uwe Steinmann
|
3e2d6e3f74
|
add preview width for dropfolder lists
|
2017-09-20 09:20:56 +02:00 |
|
Uwe Steinmann
|
9fe0a39321
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-08-01 11:33:35 +02:00 |
|
Uwe Steinmann
|
00a91b621c
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2017-08-01 10:30:22 +02:00 |
|
Uwe Steinmann
|
5e640ad42b
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2017-08-01 10:30:09 +02:00 |
|
Uwe Steinmann
|
1339c36d67
|
do not add dir separator to contentDir if it is empty
|
2017-08-01 10:22:10 +02:00 |
|
Uwe Steinmann
|
8f59babaad
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-08-01 08:37:31 +02:00 |
|
Uwe Steinmann
|
05671428e1
|
file in drop folder can be shown in menu as item
|
2017-07-31 20:30:59 +02:00 |
|
Uwe Steinmann
|
7259c668c4
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-07-20 15:09:39 +02:00 |
|
Uwe Steinmann
|
c44b7853b2
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2017-07-20 15:09:26 +02:00 |
|
Uwe Steinmann
|
c0797cc896
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2017-07-20 15:09:12 +02:00 |
|
Uwe Steinmann
|
78ba1c131b
|
make sure contentDir ends with DIRECTORY_SEPERATOR (Closes #323)
|
2017-07-19 17:45:38 +02:00 |
|
Uwe Steinmann
|
b406d31ea0
|
add menu tasks including checkbox in settings for enabling it
|
2017-05-12 18:09:53 +02:00 |
|
Uwe Steinmann
|
3cc572a1cd
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-05-02 06:47:42 +02:00 |
|
Uwe Steinmann
|
6ee6e3fde2
|
take out enableAttachmentUpload
|
2017-04-27 17:19:49 +02:00 |
|
Uwe Steinmann
|
d2fc9b534f
|
add enableMultiUpload and enableAttachmentUpload
|
2017-04-27 06:50:12 +02:00 |
|
Uwe Steinmann
|
44f6b2edc3
|
save configuration value of extension as comma separated values if array
|
2017-04-20 09:54:12 +02:00 |
|
Uwe Steinmann
|
c9bdac8d33
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-04-11 17:37:04 +02:00 |
|
Uwe Steinmann
|
468ec80db3
|
fix saving of enableSessionList
|
2017-04-11 17:36:40 +02:00 |
|
Uwe Steinmann
|
a548710a55
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-04-11 17:08:59 +02:00 |
|
Uwe Steinmann
|
06db1ec603
|
session list can be turned on/off by settings
|
2017-04-11 08:33:33 +02:00 |
|
Uwe Steinmann
|
df27dcf878
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-03-20 11:54:55 +01:00 |
|
Uwe Steinmann
|
8afaf3c748
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2017-03-15 16:46:04 +01:00 |
|
Uwe Steinmann
|
c823981bd9
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2017-03-15 16:45:02 +01:00 |
|
Uwe Steinmann
|
2e3b9f474b
|
add maxUploadSize
|
2017-03-15 16:39:05 +01:00 |
|
Uwe Steinmann
|
6e9b840e45
|
Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
|
2017-02-28 17:06:58 +01:00 |
|
Uwe Steinmann
|
742d91cc68
|
add postgresql support
|
2017-02-28 07:39:39 +01:00 |
|
Uwe Steinmann
|
3c05f5f5cb
|
save array in ext configuration as comma separated list
|
2017-01-23 07:52:19 +01:00 |
|
Uwe Steinmann
|
e280a6afa9
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2017-01-20 15:02:27 +01:00 |
|
Uwe Steinmann
|
cd745eb518
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2017-01-18 21:24:01 +01:00 |
|
Uwe Steinmann
|
88c06c2f37
|
add defaultAccessDocs
|
2017-01-18 20:58:03 +01:00 |
|
Uwe Steinmann
|
56e7f567c7
|
enable turn off of updating document reception
|
2017-01-17 14:20:33 +01:00 |
|
Uwe Steinmann
|
f6d3e9785f
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2017-01-16 15:52:19 +01:00 |
|
Uwe Steinmann
|
c37910e473
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2017-01-16 15:12:16 +01:00 |
|
Uwe Steinmann
|
905eddabce
|
add new configuration enableUpdateRevApp
|
2017-01-16 13:00:22 +01:00 |
|
Uwe Steinmann
|
2c498613b6
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-11-17 16:02:42 +01:00 |
|
Uwe Steinmann
|
4e92b9e0d3
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-11-17 16:02:27 +01:00 |
|
Uwe Steinmann
|
f0a6265b4a
|
list of available languages can be set
this will reduce the languages in the language selector and also
shorten the time for loading all translations
|
2016-11-17 11:31:58 +01:00 |
|
Uwe Steinmann
|
a560035482
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-11-11 16:30:23 +01:00 |
|
Uwe Steinmann
|
26f19b8654
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-11-11 16:28:35 +01:00 |
|
Uwe Steinmann
|
dae20dcd11
|
backport code for reading converters
now supports converters for preview and fulltext
|
2016-11-11 09:09:51 +01:00 |
|
Uwe Steinmann
|
ca76b64ba8
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-11-08 12:00:44 +01:00 |
|
Uwe Steinmann
|
b5626c2cdf
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-11-07 09:27:28 +01:00 |
|
Uwe Steinmann
|
f960f69fc9
|
add new configuration for preview of pdf documents
|
2016-11-07 09:25:06 +01:00 |
|
Uwe Steinmann
|
9ac66febee
|
add config paramter enableAdminReceipt
allows admins in list of possible recipients of documents
|
2016-10-27 14:11:18 +02:00 |
|
Uwe Steinmann
|
e10b6974ae
|
add new config flag which allows doc reception by owner
|
2016-10-27 12:17:04 +02:00 |
|
Uwe Steinmann
|
d3c12a84fd
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-10-25 10:02:09 +02:00 |
|
Uwe Steinmann
|
bf9e2fa0da
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-10-25 10:01:00 +02:00 |
|
Uwe Steinmann
|
bfd02591c8
|
make getConfigDir static
|
2016-10-25 09:56:49 +02:00 |
|
Uwe Steinmann
|
9d1f3b867f
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-10-04 20:55:33 +02:00 |
|
Uwe Steinmann
|
3d50543b66
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-10-04 20:48:51 +02:00 |
|
Uwe Steinmann
|
9fa5ececb7
|
add showSingleSearchHit config option
|
2016-10-04 16:54:16 +02:00 |
|
Uwe Steinmann
|
eebb3e996d
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-08-10 17:53:12 +02:00 |
|
Uwe Steinmann
|
002684e840
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-08-10 17:49:56 +02:00 |
|
Uwe Steinmann
|
0802198e87
|
some more documentation of ldap settings
|
2016-08-10 17:48:23 +02:00 |
|
Uwe Steinmann
|
138a6ce408
|
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
|
2016-08-03 09:30:53 +02:00 |
|
Uwe Steinmann
|
b013553a3d
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-08-03 09:24:10 +02:00 |
|
Uwe Steinmann
|
8770aaecb3
|
add new paramter maxSizeForFullText
|
2016-08-02 17:08:54 +02:00 |
|
Uwe Steinmann
|
825ef2898b
|
add enable2FactorAuthentication
|
2016-07-06 22:25:43 +02:00 |
|
Uwe Steinmann
|
44dbf74c57
|
Merge branch 'seeddms-5.0.x' into develop
|
2016-05-30 11:20:47 +02:00 |
|
Uwe Steinmann
|
d76d54ce96
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-05-24 08:00:48 +02:00 |
|
Uwe Steinmann
|
6ba8013d40
|
add option to unlink file in drop folder once uploaded
|
2016-05-23 13:15:50 +02:00 |
|
Uwe Steinmann
|
20c0abf69d
|
add missing attribute 'target' to converters
this needs to be done when updating from 5.0.x to 5.1.x
|
2016-04-21 15:33:57 +02:00 |
|
Uwe Steinmann
|
e72e7f3f15
|
Merge branch 'seeddms-5.0.x' into develop
|
2016-03-22 15:22:19 +01:00 |
|
Uwe Steinmann
|
0577fec1ba
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-03-22 15:11:42 +01:00 |
|
Uwe Steinmann
|
2e8c9cb690
|
use __construct for constructor
|
2016-03-22 14:55:48 +01:00 |
|
Uwe Steinmann
|
d317388d18
|
Merge branch 'seeddms-5.0.x' into develop
|
2016-03-09 08:10:15 +01:00 |
|
Uwe Steinmann
|
9a319ef539
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-03-09 08:06:37 +01:00 |
|
Uwe Steinmann
|
526ae37b08
|
add new parameter editOnlineFileTypes
|
2016-03-09 07:45:37 +01:00 |
|
Uwe Steinmann
|
f84c8eedd2
|
add parameter to turn off/on advanced acl
|
2016-03-04 09:25:18 +01:00 |
|
Uwe Steinmann
|
3b8d7a5271
|
Merge branch 'seeddms-5.0.x' into develop
|
2016-02-04 19:22:59 +01:00 |
|
Uwe Steinmann
|
76f5a89f92
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-02-02 09:48:18 +01:00 |
|
Uwe Steinmann
|
4dce5d7ab3
|
help and default search method be set
|
2016-02-01 19:57:08 +01:00 |
|
Uwe Steinmann
|
7dc478382f
|
initial support for auto login of guest user
|
2016-01-29 16:48:21 +01:00 |
|
Uwe Steinmann
|
6f4c1cb519
|
Merge branch 'seeddms-4.3.x' into seeddms-5.0.x
|
2016-01-22 09:30:14 +01:00 |
|
Uwe Steinmann
|
c43c5e64eb
|
ldap search can be filtered
|
2016-01-19 15:30:54 +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
|
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
|
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
|
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
|
ff53a3e3e5
|
backup dir can be set
|
2015-07-28 07:29:08 +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
|
f35ae2736a
|
add new paramter autoLoginUser
|
2015-07-14 21:28:47 +02:00 |
|
Uwe Steinmann
|
a2179ca53e
|
add new paramter autoLoginUser
|
2015-07-14 21:23:33 +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
|
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
|
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
|
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
|
d9d4d89a27
|
set initial document status
|
2015-06-02 10:02:46 +02:00 |
|
Uwe Steinmann
|
b8d06babee
|
add setting for library folder
|
2015-05-29 20:42:37 +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
|
387f67dad4
|
enable/disable Acknowledge and Revision workflow
|
2015-04-20 13:44:45 +02:00 |
|
Uwe Steinmann
|
dc08f8df1b
|
add configuration of checkout dir
|
2015-04-17 20:10:36 +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
|
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
|
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
|
75ef47f6e1
|
expiration date of documents can be preset in settings
|
2015-01-29 17:28:40 +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
|
4f58d67d62
|
check for hostname include port doesn't fail anymore
|
2014-11-13 13:29:32 +01: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
|
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
|
0ff38100c6
|
new parameter to turn missing translation output
|
2014-04-08 10:40:20 +02: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 |
|