431cf06e99
Merge pull request #4672 from owncloud/ocs_cleanup
...
Ocs cleanup
2013-09-02 14:24:46 -07:00
9a263a500a
Employ config option for OpenSSL config file, if provided.
...
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
2013-09-02 09:59:00 -04:00
fb34f49913
Start a branch for easier OpenSSL configuration.
2013-09-02 09:58:19 -04:00
a5633bb155
remove the config option that is no longer needed
2013-08-31 18:03:10 +02:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
70b6e2161e
invert logic of disable_previews
2013-08-29 10:08:53 +02:00
3fd2df4088
Only enable logrotate when configured. Also rotate size is settable.
2013-08-28 17:41:27 +02:00
1dab076750
make it possible to disable previews
2013-08-23 23:05:44 +02:00
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
d1a39ab01c
Merge pull request #4293 from owncloud/config-date
...
make log date configurable, default to iso 8601
2013-08-04 15:18:05 -07:00
ad952f215d
add 'logdateformat' to config.sample.php
2013-08-04 23:13:19 +02:00
ad329f541b
users's -> user's
2013-08-02 11:19:33 +02:00
504beb6cfd
Fix typo (again >.<).. gnah
2013-08-02 10:01:34 +02:00
79351d064f
Make default language configurable via config.php
2013-08-02 09:41:31 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
b4a5239278
fix syntax in config.sample.php
2013-07-29 16:30:04 +02:00
0a9bb8ba73
reduce time for auto expire to 30 days by default
2013-07-26 15:15:47 +02:00
d9c697534d
Fix some typos
2013-07-16 06:01:26 +02:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
3b91ce695f
session_life_time -> session_lifetime
...
default session_lifetime is 24hrs
recreation of session is triggered at 50% of the session life time
2013-06-28 15:17:54 +02:00
794c189650
session life time is now configurable and set to the same value
2013-06-26 09:21:38 +02:00
5c1d4fc186
yet another update for config.sample.php
2013-06-05 11:18:57 +02:00
78e8712366
update config.sample.php
2013-06-05 11:17:29 +02:00
1bed3253ab
add sample config for previews
2013-05-25 11:05:37 +02:00
3b576c5f77
Merge pull request #3111 from owncloud/csp-audio
...
Allow loading of external media ressources
2013-04-24 08:17:42 -07:00
4f96d7fb85
Allow loading of external media ressources
2013-04-24 16:45:51 +02:00
03aa86d8a6
- xframe restriction configurable now
2013-04-24 14:45:40 +02:00
46722d8282
fixes #2789 - no internet connectivity check if there is non on purpose
2013-04-08 22:41:20 +02:00
adb8197c0b
Update config.sample.php
...
clarify documentation. Fixes https://github.com/owncloud/core/issues/2624
2013-04-05 13:44:49 +03:00
63804f4153
Change logQuery from define() to OC::Config
2013-03-30 22:36:55 +01:00
f0733b2cb5
fix missing ',' after "mail_domain" parameter
2013-03-26 10:37:07 +01:00
02d53deecc
Update to reflect new parameter mail_domain
...
see #2568
2013-03-26 09:49:51 +01:00
50460d9032
Remove uneeded \ since we're using "
2013-03-02 00:04:44 +01:00
d8fee28b3b
add switch to enable/disable the possibility to change the display name by the user
2013-02-10 14:43:31 +01:00
0a16d25724
make it possible to modify the links to the clients
2013-02-06 15:20:43 +01:00
f04a91bd60
Merge pull request #1445 from owncloud/CSP_font
...
Allow loading of external fonts
2013-02-04 10:36:43 -08:00
5fcb35efd6
Also allow local files
2013-02-04 18:43:26 +01:00
bb90b0ee6e
Allow the loading of local font files embedded via data:
2013-02-04 18:38:16 +01:00
8de0f96a24
Allow loading of external fonts
...
Required by several applications like our pdf viewer
2013-02-04 17:51:52 +01:00
3def7f8187
Make fileblacklist configurable
2013-02-03 23:03:06 +01:00
7747f49263
add SSL proxy support
...
Add support for a reverse proxy that only forwards SSL connections
unencrypted to the web server.
This patch allows to detect the reverse proxy via regular expression for
the remote IP address and conditional overwrite the host name, protocol
and web root.
2013-01-31 18:43:30 +01:00
ab2b79cda6
add multiple domains reverse proxy support
...
Add support for a reverse proxy that handles multiple domains via different
web roots (http[s]://proxy.tld/domain.tld/owncloud).
As the reverse proxy web root is transparent for the web server the
REQUEST_URI and SCRIPT_NAME need manual adjustments. This patch replace
the direct use of this _SERVER variables with function calls and extend
this functions to overwrite the web root. Additionally it adds a Sabre
request backend that extends the Sabre_HTTP_Request to use the same
functions.
2013-01-31 18:42:31 +01:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
857b15db37
Merge pull request #1318 from j-ed/master
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-28 01:42:46 -08:00
4d74738fe7
Update config/config.sample.php
...
added parameter mail_smtpauthtype to set SMTP authentication type.
2013-01-26 12:04:06 +01:00
0d6a577481
Warn users not to enable DEBUG in productive environments
...
The debug mode should not be enabled in productive environments and is also a security risk since some apps outputs unsanitized debug data to the template.
2013-01-25 18:14:37 +01:00
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
0517465f4d
Allow admins to change the CSP policy in the config file
2013-01-23 13:42:52 +01:00
blizzz
Owen Winkler
Frank Karlitschek
Georg Ehrke
Bart Visscher
Thomas Müller
Lennart Rosam
Björn Schießle
kondou
Georg Ehrke
icewind1991
Lukas Reschke
Florian Scholz
Brice Maron
itheiss
Georg Ehrke
herbrechtsmeier
j-ed