Commit graph

2622 commits

Author SHA1 Message Date
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
Jenkins for ownCloud
3bcdd8c900 [tx-robot] updated from transifex 2013-01-03 00:05:19 +01:00
Thomas Müller
9dc5ea172e Merge pull request #975 from irgsmirx/patch-1
Update lib/util.php
2013-01-02 14:01:38 -08:00
Michael Gapczynski
a068ddff64 Use the sub storage's permission cache for retrieving the correct permission 2013-01-02 14:40:06 -05:00
Thomas Mueller
1727b2e84d add smtp port configuration option 2013-01-02 19:04:08 +01:00
Robin Appelman
54f6f1e6b7 phpdoc fixes for public api 2013-01-02 16:38:20 +01:00
Robin Appelman
a164fd160f Cache: provide path hints to getCache/etc where available 2013-01-01 20:20:20 +01:00
Robin Appelman
04f83e3b53 Cache: optional path argument for getCache/Scanner/etc 2013-01-01 20:20:20 +01:00
Michael Gapczynski
f4e4a06826 Forgot to select storage from filecache 2013-01-01 12:17:54 -05:00
Robin Appelman
b41189de44 Cache: allow storage backends to overwrite Watcher 2013-01-01 18:04:29 +01:00
Michael Gapczynski
f2ca7023e1 Fix Shared root problems with Watcher and Quota proxy 2013-01-01 11:19:33 -05:00
Michael Gapczynski
3ee3323b87 Fix retrieving of cache and scanner in Updater class 2012-12-30 20:27:38 -05:00
Jenkins for ownCloud
329bddab48 [tx-robot] updated from transifex 2012-12-31 00:05:31 +01:00
Jenkins for ownCloud
66e57f5fb1 [tx-robot] updated from transifex 2012-12-30 00:05:52 +01:00
Michael Gapczynski
cfc3526b25 Fix data for shared root folder 2012-12-29 11:45:13 -05:00
Michael Gapczynski
8bdfb04056 Fix shared folders 2012-12-28 15:06:12 -05:00
Jenkins for ownCloud
e9c51b319e [tx-robot] updated from transifex 2012-12-28 00:20:34 +01:00
Michael Gapczynski
b035626709 Retrieve storage correctly, filename is not the mountpoint 2012-12-27 16:53:32 -05:00
Michael Gapczynski
65f1e52107 Change old is_readable to isReadable, fixes downloads 2012-12-27 15:49:48 -05:00
Jenkins for ownCloud
27f9ea2abb [tx-robot] updated from transifex 2012-12-27 00:05:17 +01:00
Michael Gapczynski
1910057900 Fix shared statuses inside folders 2012-12-26 16:20:10 -05:00
Michael Gapczynski
b4515d874e Only folders have Create permission 2012-12-26 15:36:50 -05:00
Robin Appelman
7e36f730ec merge master into filesystem 2012-12-25 14:29:29 +01:00
Jenkins for ownCloud
7d52c39419 [tx-robot] updated from transifex 2012-12-24 00:12:16 +01:00
Frank Karlitschek
15da11effe Merge pull request #845 from owncloud/sqlite_error
Try to fix #836
2012-12-22 15:22:09 -08:00
Thomas Müller
986f5d9f3e fixing variable name 2012-12-21 00:04:58 +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
Thomas Müller
7d811e57e6 setting the timezone is now part of the login process and true part of the core. 2012-12-20 11:10:45 +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
Thomas Mueller
186147d1ee refs #933 send content length header - this will allow the browser to show the progressbar 2012-12-19 11:22:01 +01:00
Randolph Carter
d2828bab07 fixes default email sender address 2012-12-19 01:09:14 +01:00
Jenkins for ownCloud
a4b0df419e [tx-robot] updated from transifex 2012-12-18 00:14:58 +01:00
Jörn Friedrich Dreyer
b6eb95349e fix utf8 filenames in ie download response header according to rfc5987, see http://stackoverflow.com/questions/93551/how-to-encode-the-filename-parameter-of-content-disposition-header-in-http 2012-12-17 16:46:07 +01:00
Michael Gapczynski
39eebebd99 Fall back to default log file if logfile config file not found, suppress writing errors, fixes issue #826 2012-12-16 19:43:32 -05:00
Robin Appelman
4301cd7f61 wrap hooks into a try, catch to prevent a faulty app from crashing the request 2012-12-16 20:29:36 +01:00
Michael Gapczynski
bf05ff351f Initial support for file sharing with filesystem branch 2012-12-15 19:44:59 -05:00
Robin Appelman
b12abb2c94 use numeric ids for storages in the filecache 2012-12-15 23:35:07 +01:00
Michael Gapczynski
8951769cae Check sub storage isn't null or false 2012-12-15 17:16:26 -05:00
Robin Appelman
cf3665057c make sure folders that are not fully scanned are at least shallow scanned when we open them
the fact that they are in the cache does not mean they are scanned
2012-12-15 03:21:39 +01:00
Robin Appelman
4be039e6cb Filecache Watcher: use scan or scanFile based on the current item, not the cached item 2012-12-15 03:10:56 +01:00
Robin Appelman
bc52f12162 dont insert and entry in the filecache during upgrade if the id already exists in the filecache
most likely the result from an incompelte upgrade
2012-12-15 02:29:34 +01:00
Robin Appelman
c6a5ce54a7 these functions should be static 2012-12-15 02:22:09 +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