Lukas Reschke
047f1988c3
Merge branch 'master' into no-inline-js
2013-01-25 16:11:07 +01:00
Lukas Reschke
e5cc5a0a2d
Allow the loading of external images
2013-01-25 14:26:14 +01:00
Lukas Reschke
0517465f4d
Allow admins to change the CSP policy in the config file
2013-01-23 13:42:52 +01:00
j-ed
dcda792fbc
Update config/config.sample.php
...
fixed an other typo.
2013-01-22 21:42:39 +01:00
j-ed
dfa5f2de4d
Update config/config.sample.php
...
Fixed type in line 70. Thank you for pointing me to that typo.
2013-01-22 21:33:01 +01:00
j-ed
9c069530cb
Update config/config.sample.php
...
Added three additional mail_smtp.. parameters.
- mail_smtpdebug - enable debug messages to analyse SMTP problems.
- mail_smtptimeout - set SMTP timeout which is set to 10s by
default and this is sometimes to short especially if a malware/
spam scanner is used.
- mail_smtpsecure - force secure SMTP connections.
2013-01-22 14:24:00 +01:00
Bart Visscher
a8f963d9cf
Spaces to tabs
2013-01-16 18:09:16 +01:00
Lukas Reschke
eab6d7eb23
Enhanced auth is totally unmaintained and broken
...
Let's remove it, it's also not secure anymore with the introduction of
our API etc...
(And doesn't work with ldap etc…)
2013-01-14 21:39:49 +01:00
Michael Gapczynski
ceafb5d7d1
Add maintenance mode entry to config.sample.php
2013-01-04 10:31:59 -05:00
Thomas Mueller
1727b2e84d
add smtp port configuration option
2013-01-02 19:04:08 +01:00
root
a64a923d56
call it "proxy" instead of "curlproxy"
...
Thanks Bart for the hint.
This also switches "==" to "<>" and not the code actually works ;-)
2012-12-19 18:50:19 +01:00
Frank Karlitschek
019da9943a
add curl proxy support. Fixes #504
...
https://github.com/owncloud/core/issues/504
2012-12-19 18:50:19 +01:00
Robin Appelman
ffd14dfd09
add sample configuration for user backends
2012-11-25 14:43:45 +01:00
Frank Karlitschek
6cb3774706
make it possible to manually override the hostname and protocol if the automatic detection from ownCloud fails. This can happen in reverse proxy situations or with loadbalancers setups.
2012-11-22 19:22:00 +01:00
Lukas Reschke
59404b5675
Merge pull request #31 from visit1985/persistentcookies
...
reresubmit: improved persistent cookies :)
2012-10-16 04:46:22 -07:00
Lukas Reschke
e299c241df
Make enhanced auth configurable
2012-10-16 01:08:05 +02:00
Lukas Reschke
6f2e8788ca
Make enhanced auth time configurable
2012-10-16 01:02:03 +02:00
Bart Visscher
4b799a6982
Make the lifetime of the remember login cookie
2012-10-14 22:36:25 +02:00
Lukas Reschke
f271afa31c
Correct "ownCloud"
2012-09-23 20:23:37 +03:00
Brice Maron
fcaf04cad9
Add little more doc about app folders
2012-06-21 22:00:48 +00:00
Brice Maron
df83df5263
Correct sample config
2012-06-14 21:19:11 +00:00
Brice Maron
4753cc3ebd
Merge branch 'master' into multi_app_dir
...
Conflicts:
apps/bookmarks/ajax/addBookmark.php
config/config.sample.php
lib/app.php
remote.php
2012-06-14 21:16:59 +00:00
Brice Maron
6da5a2fdd4
Add possibility to choose the installation folder
2012-06-14 21:00:02 +00:00
Frank Karlitschek
897bfa8814
finally fix the updater. next is an automatic updater. but this is a bit more tricky.
2012-06-09 17:43:02 +02:00
Frank Karlitschek
6119f05ac0
generate a random salt during installation and store it in the config.php. use it to salt the password hashing.
2012-06-08 12:31:37 +02:00
Frank Karlitschek
f568b7ccb4
add spacing lines to our awesome new sample config file. readability++
2012-06-08 11:49:14 +02:00
Brice Maron
dd98afc56c
Add doc about multi app dir in sample config
2012-06-07 20:56:21 +00:00
Bart Visscher
e867edd1c8
Add help texts to config options in config.sample.php
2012-06-07 22:47:18 +02:00
Bart Visscher
9d936976a9
Make check for writable apps dir configurable
2012-06-05 17:51:52 +02:00
Frank Karlitschek
a72e6cc113
fix oc-780
2012-05-31 21:28:58 +02:00
Georg Ehrke
8f2217ca2e
make default app choosable
2012-05-11 13:56:52 +02:00
Thomas Mueller
07f2e316e4
removing executable bit from various files
2012-04-30 12:05:57 +02:00
Frank Karlitschek
c6144535a8
document the log settings
2012-04-21 23:30:14 +02:00
Frank Karlitschek
a86d89f5ca
Add a static code checker for evil patterns in apps.
...
Disabled by default for now.
We will check for private api calls here later once the public api is in place
2012-04-21 22:47:56 +02:00
Frank Karlitschek
2fbc92bd4b
new OC_Mail class to handle all mail sending. The benefit is that is way mor flexible than the standard mail command. can be configured to use a remote smtp relay for example. also port the lostpassword code
2012-04-20 20:49:35 +02:00
Frank Karlitschek
a191b75c31
make it possible to connect to other ocs appstores and other ocs knowledgebase servers.
...
also make it possible to switch the app store and the knowledgebase off completely.
2012-03-23 15:52:41 +01:00
Frank Karlitschek
a62e109e8c
make the location of the 3rdparty folder flexible.
...
It´s automatically search in the owncloud folder and in the parent folder.
override with an option in config.php is also possible
2012-02-23 15:37:38 +01:00
Frank Karlitschek
340b6bf3ad
add themeing support and support for autoselection of mobile/tablet and standalone css/jss files and templates
2012-02-11 23:25:35 +01:00
Florian Pritz
8648e3c43c
only call error_log() if DEBUG is true
...
Signed-off-by: Florian Pritz <bluewind@xinu.at>
2011-09-24 18:41:47 +02:00
Jan-Christoph Borchardt
2f1a06b2ee
merged gitignores
2011-08-15 20:43:39 +02:00
Alessandro Cosentino
86dd023448
Adding clear logs functions
2011-06-07 15:48:21 -04:00
Jakob Sack
8465f76e7e
Use OC_CONFIG where possible
2011-04-16 12:18:42 +02:00
Martin T. H. Sandsmark
64d4d57615
fix permissions, start to implement private data api
2010-07-16 11:36:03 +02:00
Robin Appelman
a73fbc5e32
Merge commit 'refs/merge-requests/27' of git://gitorious.org/owncloud/owncloud into merge
...
Conflicts:
inc/HTTP/WebDAV/Server/Filesystem.php
inc/lib_config.php
inc/lib_log.php
inc/lib_user.php
inc/templates/adminform.php
2010-07-05 12:17:31 +02:00
Aldo "xoen" Giambelluca
969c8053ce
Added variable $CONFIG_DBTABLEPREFIX in configuration file for table prefix
...
Table prefix is useful where only one DB is possible (cheap hosting).
this way is possible define something like a "namespace"
default is 'oc_'
2010-07-03 18:59:56 +02:00
Thomas Zander
ea73168a53
Ignore auto-generated config file
2010-05-22 23:53:07 +02:00
Robin
540963060a
remove config/config.php, this will make using git on the server easier since config.php changes
2010-05-22 23:43:06 +02:00
Robin
d15464a0d8
clear default config
2010-04-28 13:59:01 +02:00
Robin
aacda0367d
merge
2010-04-28 12:15:52 +02:00
Frank Karlitschek
2a75c0d044
merge Adityas improvements
2010-03-29 16:21:00 +02:00