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

288 commits

Author SHA1 Message Date
Frank Karlitschek
7f1ff3e9e1 Merge pull request #2204 from owncloud/chache_updater_rename 
Cache: better rename hook for cache updater
 2013-03-17 05:03:18 -07:00
Bernhard Posselt
a3db54f9b0 Merge pull request #2383 from owncloud/error-handling-upgrade 
Add error handling to the file cache upgrade
 2013-03-16 12:17:31 -07:00
Michael Gapczynski
c69dc3483a Add error handling to the file cache upgrade 2013-03-16 14:28:42 -04:00
Robin Appelman
32b8fd8fb7 Improve handeling of unlimited max upload size 2013-03-15 16:31:35 +01:00
Andreas Schönebeck
387be37427 Filter display of blacklisted files 
Blacklisted files like ".htaccess" and ".git" should not only be
blacklisted for upload and rename, but they should also not be displayed
in the directory listings.

I needed this personally to hide ".git" folders in shared folders. Its
also a simple implementation of feature requests like
http://forum.owncloud.org/viewtopic.php?f=4&t=3279 and
http://forum.owncloud.org/viewtopic.php?f=3&t=5708
 2013-03-15 12:11:42 +01:00
Robin Appelman
ed83597371 Return unknown freespace if the free_space call failed 
Fixes #2312
 2013-03-14 17:00:30 +01:00
Björn Schießle
abe408e934 replace \MDB with \OC_DB, approved in #2278 2013-03-14 14:59:12 +01:00
Thomas Müller
2e9d641337 Merge pull request #2254 from owncloud/fixing-mssql-utf8-and-insert-empty-string-master 
Fixing mssql utf8 and insert empty string master
 2013-03-12 11:52:40 -07:00
Thomas Mueller
9d4d399aa3 write error message to log file in case insert to file cache failed - took hours to find that the insert failed :-( 2013-03-12 15:39:29 +01:00
Thomas Mueller
a05820c659 fixing various filesystem/storage unit tests on windows 
fixing copy operation on mapper
 2013-03-12 15:30:10 +01:00
Thomas Mueller
eedbebd40e adding //IGNORE to iconv to prevent nasty php warnings 2013-03-12 09:26:21 +01:00
Thomas Mueller
06992fec6d slug generates uniqid in case the file/folder name contains not one single valid character 2013-03-12 09:24:58 +01:00
Thomas Mueller
0900301668 indexed slug should be created based on logic path 2013-03-12 09:15:53 +01:00
Bernhard Posselt
11251ec8a8 Merge pull request #2218 from owncloud/fix-mounting-all 
Fix variable for mounting for all users, fix #357
 2013-03-11 02:41:41 -07:00
Michael Gapczynski
8a5946fadc Fix variable for mounting for all users, fix #357 2013-03-09 21:09:31 -05:00
Robin Appelman
be4806d031 Store the global mount configuration file in the datadir 2013-03-10 02:25:03 +01:00
Robin Appelman
1d3beffacf Cache: better rename hook for cache updater 2013-03-08 19:08:07 +01:00
Bernhard Posselt
0525bbd73c Merge pull request #2189 from owncloud/versioning_sync_client 
fix versioning for the sync client - distinguish between touch and write operation
 2013-03-08 03:05:28 -08:00
Björn Schießle
8d26400cb5 remove some debug output; move code to the right function 2013-03-08 11:27:25 +01:00
Michael Gapczynski
a5cab28bea Fix fetching source path of shared files 2013-03-07 11:12:59 -05:00
Björn Schießle
48bb53030c distinguish between touch and write 2013-03-07 15:51:44 +01:00
Michael Gapczynski
db23c885d9 Merge pull request #2096 from owncloud/cache-upgrade-id 
Cache: also check if the file id is already in the cache during upgrade
 2013-03-04 14:55:20 -08:00
Robin Appelman
9d9acf24de Cache: more efficient detection for existing entries during upgrade 2013-03-04 23:19:55 +01:00
Robin Appelman
56ae4bb6e9 Cache: also check if the file id is already in the cache during upgrade 
Should solve upgrade issues if only some of the configured storages were migrated previously
 2013-03-04 22:26:03 +01:00
Michael Gapczynski
71bdccf347 Chunk size comment should say kB, not MB 2013-03-03 12:03:26 -05:00
Robin Appelman
ee1eb98d4a Cache: cleanup permissions cache when removing a file from the cache 2013-02-28 17:04:50 +01:00
Robin Appelman
f7a43391a7 Cache: add option to delete file from permissions cache for all users 2013-02-28 17:04:34 +01:00
Michael Gapczynski
766a301a6b Merge pull request #1031 from owncloud/external_storage_ui_feedback 
External Storage UI Improvements
 2013-02-27 10:00:22 -08:00
Robin Appelman
52dccd4aa1 Storage: don't throw warnings when a stat fails 2013-02-26 02:53:02 +01:00
Robin Appelman
6b33a23a51 Code style 2013-02-26 02:51:57 +01:00
Michael Gapczynski
4a05e8820f Merge branch 'master' into external_storage_ui_feedback 2013-02-25 17:56:40 -05:00
Thomas Müller
6dd1d479da Merge pull request #1706 from owncloud/master-sqlserver 
Microsoft SQL-Server support for ownCloud!
 2013-02-25 12:50:32 -08:00
Frank Karlitschek
9ee5069f2a Merge pull request #1856 from owncloud/fix_error_handling_stream_copy 
don't use the number of written bytes as indicator if streamCopy() was successful
 2013-02-25 02:04:12 -08:00
Thomas Mueller
9898ba4daf Merge branch 'master' into master-sqlserver 
Conflicts:
	core/templates/installation.php
 2013-02-22 22:59:09 +01:00
Bart Visscher
bb75dfc021 Whitespace fixes 2013-02-22 19:05:36 +01:00
Bernhard Posselt
608ebb59dd Merge pull request #1859 from owncloud/blacklist-fix 
Add OC\Files\Filesystem::isFileBlacklisted
 2013-02-22 07:43:13 -08:00
Björn Schießle
d8137fdf66 return both, count and result if the operation succeeded or failed. Maybe in some cases it is useful to know how much bytes where copied 2013-02-22 16:43:11 +01:00
Robin Appelman
62c65bc1c8 Add OC\Files\Filesystem::isFileBlacklisted 2013-02-22 16:13:08 +01:00
Björn Schießle
5b94959686 using the number of writen bytes as indicator if streamCopy() was successfully. Instead check if fwrite returns the number of bytes or false 2013-02-22 14:56:50 +01:00
Georg Ehrke
f51d8c1cd9 fix order of mount commands 2013-02-22 14:19:29 +01:00
Thomas Mueller
5062ae250b Merge branch 'master' into master-sqlserver 
Conflicts:
	lib/files/cache/cache.php
 2013-02-20 10:55:20 +01:00
Michael Gapczynski
702c27b0e6 Merge branch 'master' into external_storage_ui_feedback 
Conflicts:
	apps/files_external/js/settings.js
	apps/files_external/lib/smb.php
	apps/files_external/templates/settings.php
	lib/files/storage/common.php
 2013-02-19 19:12:14 -05:00
Frank Karlitschek
3878203679 Merge pull request #1731 from owncloud/unknown-freespace 
Give storage backends the option to define having no known free space
 2013-02-19 15:18:12 -08:00
Thomas Müller
d9035d4fdc Merge pull request #1728 from owncloud/mountconfig 
Use json for new mount configuration files
 2013-02-18 14:56:25 -08:00
Frank Karlitschek
f554347db5 Merge pull request #1724 from owncloud/long-storage-id 
Cache: hash long storage ids to ensure they fit in the database
 2013-02-18 07:17:27 -08:00
Robin Appelman
2bbb57e429 merge master into mountconfig 2013-02-18 15:12:15 +01:00
Thomas Mueller
2675290325 Merge branch 'master' into master-sqlserver 2013-02-18 11:39:04 +01:00
Robin Appelman
d96146a017 Give storage backends the option to define having no known free space 
When this is the case only the configured max upload size is taking into account for uploading
 2013-02-16 03:27:50 +01:00
Robin Appelman
6da2c6c83e Create new mountconfig files in json 2013-02-16 01:50:40 +01:00
Robin Appelman
46626915ef Use a parser to read custom mount configuration instead of including the php files 2013-02-16 01:30:44 +01:00
Robin Appelman
0c1ec758e8 Cache: hash long storage ids to ensure they fit in the database 2013-02-15 22:11:39 +01:00
Thomas Mueller
40739350c9 class Mapper no respects an unchanged physical root which will be excluded from slugifying the path 2013-02-15 17:42:17 +01:00
Thomas Mueller
b488800bd5 fix error in recursive search 2013-02-15 17:41:22 +01:00
Thomas Mueller
4b80466880 Merge branch 'master' into master-sqlserver 
Conflicts:
	lib/db.php
	lib/files/cache/cache.php
	lib/files/cache/legacy.php
	lib/setup.php
 2013-02-14 22:54:48 +01:00
Thomas Mueller
78a3625ddf final adoptions for mssql connectivity 2013-02-14 21:59:24 +01:00
Bart Visscher
ffae6f4b84 Style-fix: Breakup long lines 2013-02-14 08:38:37 +01:00
Bart Visscher
cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Bart Visscher
d3ef967993 Fix indentation style 2013-02-14 08:36:26 +01:00
Bart Visscher
5c4a804ddb Fix SpaceBeforeOpenBrace errors 2013-02-14 08:36:26 +01:00
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
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 Mueller
76b31f870c Merge branch 'master' into master-sqlserver 2013-02-12 00:32:38 +01: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
Lukas Reschke
eed48c8159 Merge pull request #1608 from owncloud/fix-shared-links 
Fix shared links
 2013-02-11 05:17:24 -08: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
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
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
Lukas Reschke
d08a3bb46e Merge pull request #1590 from owncloud/fix_470 
append .part to put files
 2013-02-10 06:38:31 -08:00
Jörn Friedrich Dreyer
1263511a17 append .part to put files 2013-02-10 14:16:45 +01:00
Administrator
4e5a3fbcaf - Fixed indentations. 
- Fixed a bug in legacy.php: there was an error that was not checked for if the table 'fscache' did not exist in the database.
 2013-02-10 14:08:00 +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
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
Thomas Müller
2b0b6bb63c Merge pull request #1566 from owncloud/fixing-1505-master 
fixes zip download for folders containing a dot .....
 2013-02-09 08:33:44 -08:00
icewind1991
5a309c11ca Merge pull request #1572 from owncloud/fix_empty_path_handling 
fix empty path handling
 2013-02-09 08:25:25 -08:00
Thomas Müller
e0da721a7d adding ctor to Local and revert call to it within Temporary 2013-02-09 17:16:13 +01:00
Lukas Reschke
06bba59249 Merge pull request #1618 from owncloud/mapped-storage-unit-testing-linux-master 
Mapped storage unit testing linux master
 2013-02-12 22:58:37 -08:00
Thomas Mueller
92e6409f40 fixing mappedlocal storage to work on non-windows as well 
this allows us to run unit tests on linux - necessary to enable easy regression testing
 2013-02-11 13:53:10 +01:00
Thomas Mueller
f223ab796b Merge branch 'master' into mapped-storage-unit-testing-linux-master 2013-02-11 12:59:23 +01:00
Thomas Müller
8174e5faf1 make MappedLocal available and testable within Linux as well 2013-02-09 19:03:03 +01:00
Jörn Friedrich Dreyer
420b63cbe4 fix empty path handling 2013-02-09 16:58:55 +01:00
Bart Visscher
60411f7d3d Remove unneeded __destruct call in OC\Files\Storage\Temporary 2013-02-09 16:18:30 +01:00
Henrik Kjölhede
d6b4d25d1d Merge branch 'master' of https://github.com/hkjolhede/owncloud_core 2013-02-09 14:13:54 +01:00
Henrik Kjölhede
41fa65e7be Merge branch 'master' of https://github.com/owncloud/core 
Conflicts:
	apps/files_external/appinfo/app.php
 2013-02-09 14:05:33 +01:00
Thomas Müller
ddc7af9a53 know your libraries ;-) 
strrpos fails in cases the file in the path has no dot but the parent folder
 2013-02-09 13:51:44 +01:00
Thomas Mueller
fd8cb9974b initial version of a local storage implementation which will use unique slugified filename on the local filesystem. 
This implementation will only be enabled on windows based system to solve the issues around UTF-8 file names with php on windows.
 2013-02-06 23:41:52 +01:00
Lukas Reschke
e6400b3059 Merge pull request #1474 from samtuke/master 
Improvements to files_encryption
 2013-02-05 09:58:35 -08:00
Sam Tuke
50faddfa40 Minor improvement to comments 2013-02-05 15:37:40 +00:00
Thomas Mueller
9446017821 spell check 2013-02-05 16:24:40 +01:00
Thomas Mueller
1fd807a7d6 pass the argument to the ctor 
Conflicts:
	lib/files/storage/temporary.php
 2013-02-05 16:24:11 +01:00