Michael Gapczynski
eeb409a6ec
Merge branch 'master' into fix-shared-links
2013-02-10 19:10:06 -05:00
Michael Gapczynski
8e3b8c7f47
Proper fix for shared links
2013-02-10 19:09:58 -05:00
Robin Appelman
3292dc3eea
Cache: allow file sizes >2GB
2013-02-10 16:44:00 +01:00
Thomas Müller
e68cf72458
Merge pull request #1543 from owncloud/utf8-locale-master
...
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-09 09:58:05 -08:00
Thomas Müller
279cbeb001
Merge pull request #1481 from owncloud/fixing-1354-master
...
basic WebDAV test in place now
2013-02-09 05:13:33 -08:00
Thomas Müller
232a98524c
some systems use en_US.UTF8 instead of en_US.UTF-8
2013-02-08 17:49:54 +01:00
Thomas Müller
ea42014ba4
in case curl is not present we cannot test
2013-02-08 15:23:26 +01:00
Thomas Müller
0efcf33e2f
Merge pull request #1451 from eMerzh/fix_1065
...
Add Redirect to getUrlContent fix #1065
2013-02-07 06:27:58 -08:00
Thomas Mueller
5788d36c8d
Merge branch 'master' into fixing-1354-master
...
Conflicts:
settings/admin.php
settings/templates/admin.php
2013-02-07 10:44:28 +01:00
Lukas Reschke
e969a78cf9
Merge pull request #1443 from owncloud/use-module-file-info-master
...
we get best results regarding mime type detection if we use fileinfo - l...
2013-02-06 11:53:13 -08:00
Thomas Müller
efdaea4557
Merge pull request #1357 from owncloud/alternative-loging-master
...
add support for apps to register alternative login methods
2013-02-06 06:49:58 -08:00
Thomas Mueller
1adcc5fd23
basic WebDAV test in place now
2013-02-05 23:33:44 +01:00
Thomas Mueller
ac11c842e6
setlocale test is pointless on Windows
2013-02-05 15:46:55 +01:00
Thomas Mueller
d8084c132e
new function \OC_Util::runningOnWindows()
2013-02-05 15:43:12 +01:00
Brice Maron
c5079a63a8
Add Redirect to getUrlContent fix #1065
2013-02-04 23:38:10 +01:00
Thomas Müller
a7e62b0366
Merge pull request #1444 from owncloud/writable-temp-folder-for-session-data-master
...
in case file based session handling in enabled - we need to make sure th...
2013-02-04 11:11:15 -08:00
Thomas Mueller
0a113600f7
in case file based session handling in enabled - we need to make sure the configured folder is writable
2013-02-04 15:32:01 +01:00
Thomas Mueller
6058c2f734
we get best results regarding mime type detection if we use fileinfo - let's tell the admin about that
2013-02-04 15:04:26 +01:00
Thomas Müller
b20529ee44
Merge pull request #1171 from owncloud/move-datadirectory-checks
...
Move data directory permission checks after data directory existence checks
2013-01-31 14:54:46 -08:00
Stefan Herbrechtsmeier
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
Robin Appelman
6043789394
Bumb version number for displayname db upgrade
2013-01-30 19:37:02 +01:00
Robin Appelman
207aa22d12
merge master into filesystem
2013-01-30 19:24:24 +01:00
Björn Schießle
007bddceba
version dump to trigger db update
2013-01-29 21:04:28 +01:00
Thomas Mueller
825cdf8560
add support for apps to register alternative login methods
...
below the standard login a list of icons/button will be displayed
2013-01-29 17:28:08 +01:00
Robin Appelman
8ede3290ae
Cache: add database indexes for mimetype and mimepart
2013-01-21 22:31:44 +01:00
Michael Gapczynski
9e28f924c2
Merge branch 'master' into move-datadirectory-checks
2013-01-18 23:31:06 -05:00
Michael Gapczynski
da34e58589
Move permissions check to new function checkDataDirectoryPermissions()
2013-01-18 23:30:56 -05:00
Robin Appelman
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
Lukas Reschke
ab287d2ba4
Move { to same line
2013-01-14 22:04:31 +01:00
Lukas Reschke
c845e75693
Expand if to multiple lines
...
Oneliners are ugly.
2013-01-14 22:01:52 +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
Lukas Reschke
31b1a73e1f
Check if user is admin - bool
...
There was no "isAdminUser()" function which returned bool. This is
irritiating as there were a loooooooot of places in the code which
checked this itself with `OC_Group::inGroup($uid, 'admin)` - why not
use a function for this?
(Especially if you consider that we might change the group name in the
future, which would lead to problems then)
Additionally, @Raydiation needed such a method for his AppFramework :)
2013-01-14 19:45:17 +01:00
Michael Gapczynski
ebcf41b420
Move data directory permission checks after data directory existence checks
2013-01-12 23:35:13 -05:00
Michael Gapczynski
a00b9e0a03
Bump version
2013-01-11 21:01:28 -05:00
Michael Gapczynski
106541361c
Change length of mimetypes to 255, the maximum length according to RFC 4288
2013-01-09 22:57:42 -05:00
Robin Appelman
d0377b1951
Cache: normalize mimetypes
2013-01-07 02:09:21 +01:00
Robin Appelman
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
Thomas Mueller
34e5cb5070
fixing indent
2013-01-03 00:13:30 +01:00
Michael Gapczynski
8bdfb04056
Fix shared folders
2012-12-28 15:06:12 -05:00
Robin Appelman
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
irgsmirx
1e3231c732
Update lib/util.php
...
getUrlContent should take proxy setting into consideration when not using curl, as well
2012-12-20 12:01:11 +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
f012135992
make it more readable as deepdiver suggested
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
Frank Karlitschek
b162e72f94
Merge pull request #961 from owncloud/check_locale
...
add a check and a warning if setlocale is working
2012-12-19 08:53:43 -08:00
Frank Karlitschek
d7fbe47583
Merge pull request #868 from owncloud/new_doc_system
...
New doc system
2012-12-19 06:40:37 -08:00
Frank Karlitschek
196f1c3786
add a check and a warning if setlocale is working
2012-12-19 15:10:33 +01:00
Robin Appelman
b12abb2c94
use numeric ids for storages in the filecache
2012-12-15 23:35:07 +01:00
Robin Appelman
946d58eaa8
merge master into filesystem
2012-12-15 02:21:26 +01:00
Bart Visscher
df7d6cb26c
More style fixes
2012-12-15 00:43:46 +01:00