wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9710 commits 157 branches 562 tags 714 MiB
Commit graph

3135 commits

Author SHA1 Message Date
Thomas Mueller
a814361ca7 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 23:01:54 +01:00
Thomas Mueller
b31cc83a2d $this->numericId should be determined based on table storages not filecache 2013-02-12 17:26:58 +01:00
Thomas Müller
251b676a06 Merge pull request #1616 from owncloud/cache_fixes_rebase 
Cache: reuse known folder sizes when doing a shallow scan - rebase
 2013-02-12 08:07:49 -08:00
Robin Appelman
b54dcd1999 Cache: fix scanner trying to use existing data when file isn't in cache 2013-02-12 16:48:21 +01:00
Thomas Mueller
f2baf1ae0e fixing syntax error 2013-02-12 16:18:48 +01:00
Jenkins for ownCloud
8d9352a40d [tx-robot] updated from transifex 2013-02-12 15:12:46 +01:00
Robin Appelman
e1fe5279dd Cache: also preserve etags for files 2013-02-12 14:56:57 +01:00
Thomas Mueller
a953786d79 Merge branch 'master' into external_storage_ui_feedback 2013-02-12 11:01:14 +01:00
Michael Gapczynski
6eba790a75 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/dropbox.js
	apps/files_external/js/google.js
	apps/files_external/js/settings.js
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/dropbox.php
	apps/files_external/lib/google.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	lib/filestorage.php
 2013-02-11 20:27:05 -05:00
Thomas Müller
53111ccdc8 Merge pull request #1634 from irgsmirx/patch-6 
Update/Bugfix lib/files/cache/legacy.php during database upgrade
 2013-02-11 15:31:28 -08:00
Jenkins for ownCloud
fb23ac3ce2 [tx-robot] updated from transifex 2013-02-12 00:21:45 +01:00
Thomas Müller
04bf8c1b66 Merge pull request #1596 from owncloud/fix_470 
webdav put improvements
 2013-02-11 13:10:48 -08:00
irgsmirx
062befd1fc Update lib/files/cache/legacy.php 
Fixing a bug that occurs when trying to update a non-existent 'fscache' table in the database - if unfixed upgrading does not succeed.

Unfortunately I could not get a call to PEAR::isError working. That is why I check for the existence of a property present in class MDB2_Error.
 2013-02-11 20:28:36 +01:00
Jenkins for ownCloud
39d19a9274 [tx-robot] updated from transifex 2013-02-11 15:42:41 +01:00
Thomas Müller
766fbead96 Merge pull request #1578 from owncloud/mysql_admin_fix 
added l10n for db error messages
 2013-02-11 06:35:49 -08:00
Lukas Reschke
eed48c8159 Merge pull request #1608 from owncloud/fix-shared-links 
Fix shared links
 2013-02-11 05:17:24 -08:00
Thomas Mueller
c544a631d5 fixing indent 2013-02-11 14:14:37 +01:00
Bernhard Posselt
e70aef603f Merge pull request #1573 from owncloud/fixing-ctor-local-storage-master 
adding dtor to Local and revert call to it within Temporary
 2013-02-11 04:40:54 -08:00
Robin Appelman
2921d2fb78 Cache: don't create a new etag when the mtime hasn't changed 2013-02-11 13:33:56 +01:00
Robin Appelman
d84c3cd014 Cache: actually use parameter 2013-02-11 13:33:48 +01:00
Robin Appelman
299649b40e Cache: reuse known folder sizes when doing a shallow scan 2013-02-11 13:33:41 +01:00
Robin Appelman
56d10e9054 Cache: simplify scanner logic a bit when handeling with unknown folder sizes 2013-02-11 13:33:34 +01:00
Bernhard Posselt
36df2fbdfe fixed argument for translation 2013-02-11 13:11:43 +01:00
Robin Appelman
ad360296b9 Update tests and apps to the new \OC\Files\Filesystem::init signature 2013-02-11 11:06:09 +01:00
Jörn Friedrich Dreyer
99f41de7de only check content lenght on PUT to make litmus happy 2013-02-11 10:31:01 +01:00
Jörn Friedrich Dreyer
2cb2991c04 delete partial file when file upload is aborted 2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
15ab2fd52a check Content-Length to detect aborted uploads 2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
806522d007 also rename file when it has not been present before 2013-02-11 09:53:07 +01:00
Jörn Friedrich Dreyer
72a2075b1c readd renaming and mtime handling to new directory nodes 2013-02-11 09:43:26 +01:00
Jörn Friedrich Dreyer
2644003bf1 send back 'X-OC-MTime: accepted' when X-OC-MTime was applied 2013-02-11 09:34:03 +01:00
Jörn Friedrich Dreyer
d2332f60f3 add a custom header clients can use to skip a n additional propset request 2013-02-11 09:32:28 +01:00
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
Jenkins for ownCloud
04146f2059 [tx-robot] updated from transifex 2013-02-11 00:04:49 +01:00
Robin Appelman
3292dc3eea Cache: allow file sizes >2GB 2013-02-10 16:44:00 +01:00
blizzz
e4c9fc1381 Merge pull request #1592 from owncloud/display_name_setting 
add switch to enable/disable the possibility to change the display name by the user
 2013-02-10 06:52:03 -08:00
Frank Karlitschek
dc12dd523e Merge pull request #1581 from owncloud/mapper_md5 
Mapper: use md5 hashes for database indexes
 2013-02-10 06:47:44 -08:00
Frank Karlitschek
bc2bfea399 Merge pull request #1588 from owncloud/etag_quotes 
wrap etags in quotes when doing a propfind on a folder
 2013-02-10 06:44:45 -08:00
Lukas Reschke
d08a3bb46e Merge pull request #1590 from owncloud/fix_470 
append .part to put files
 2013-02-10 06:38:31 -08:00
Lukas Reschke
32b1c7ad5d Merge pull request #1589 from owncloud/use-sanitizeHTML 
Use sanitizeHTML instead of stripslashes + htmlspecialchars
 2013-02-10 06:23:01 -08:00
Björn Schießle
d8fee28b3b add switch to enable/disable the possibility to change the display name by the user 2013-02-10 14:43:31 +01:00
Jörn Friedrich Dreyer
1263511a17 append .part to put files 2013-02-10 14:16:45 +01:00
Lukas Reschke
46103e62d2 Coding style 2013-02-10 14:09:49 +01:00
Lukas Reschke
6f785e211b Merge pull request #1030 from hkjolhede/master 
SFTP support in files_external app
 2013-02-10 05:06:00 -08:00
Lukas Reschke
1b10032556 Use sanitizeHTML instead of stripslashes + htmlspecialchars 2013-02-10 14:03:40 +01:00
Robin Appelman
121c1f2fc0 wrap etags in quotes when doing a propfind on a folder 2013-02-10 13:55:20 +01:00
Robin Appelman
0c05244f8b Mapper: use md5 hashes for database indexes 
indexing the full path exeeds the maximum index length for MySQL
 2013-02-10 11:49:37 +01:00
Lukas Reschke
01fabd6c65 Merge pull request #1577 from owncloud/typo_catagory 
Typo
 2013-02-10 02:31:34 -08:00
Jenkins for ownCloud
f7d898d835 [tx-robot] updated from transifex 2013-02-10 00:10:29 +01:00
Lukas Reschke
bd2f8980cd Typo 2013-02-09 23:37:42 +01:00