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

3907 commits

Author SHA1 Message Date
Thomas Müller
6c3a4282e5 Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book 
Search address book for federated cloud id
 2015-06-26 10:53:02 +02:00
Vincent Petry
538e466c30 Keep shared locks in post hooks 
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.

Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
 2015-06-25 16:33:02 +02:00
Morris Jobke
f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Bjoern Schiessle
a288d0eea3 ne need to check twice if $row['share_with'] is set 2015-06-25 12:14:46 +02:00
Bjoern Schiessle
dd9dfc4461 show nice display name for remote shares if possible 2015-06-25 12:14:03 +02:00
Morris Jobke
1601867c9d Remove unneeded getetag entries in properties table 
* fixes #13281
 2015-06-25 08:44:26 +02:00
Vincent Petry
58439c337c Merge pull request #17070 from owncloud/lock-movemountbug 
Lock correct paths when moving mount
 2015-06-24 18:37:48 +02:00
Morris Jobke
5f59393b30 Merge pull request #17110 from owncloud/share-error-handling 
[sharing] handle shares of users that aren't available anymore
 2015-06-24 17:38:34 +02:00
Lukas Reschke
004280e407 Merge pull request #17136 from rullzer/fix_remove_link_OCS 
Allow removing of link password in OCS again
 2015-06-24 16:45:00 +02:00
Vincent Petry
8859004a2b Rollback folder scan if an entry was locked 2015-06-24 15:42:00 +02:00
Thomas Müller
161ca900e0 Merge pull request #17130 from owncloud/update-mime-types 
Update wmv and add mts and mt2s
 2015-06-24 13:35:58 +02:00
Roeland Jago Douma
6977eff106 set NULL correctly in password update 
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
 2015-06-24 12:37:59 +02:00
Morris Jobke
300d1c88d0 Merge pull request #17106 from owncloud/htaccess-update-only-once 
Only update the htaccess ErrorDocument links when they are not set yet
 2015-06-24 12:20:22 +02:00
Vincent Petry
35047a2300 Fix locked paths in the moveMount case 
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.

Other operations will still lock the attached storage root.
 2015-06-24 11:33:28 +02:00
Thomas Müller
5c213539af Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107 2015-06-24 11:06:29 +02:00
Morris Jobke
5ff536b45a [upgrade] add verbosity check and show repair info & steps 2015-06-24 10:25:05 +02:00
Joas Schilling
dba5d5e205 Use a OutputFormatter instead of hacking into writeln() 2015-06-24 09:26:30 +02:00
Morris Jobke
4f2f8a6f28 [sharing] handle shares of users that aren't available anymore 
* properly handle the case where an abandoned share is left and
  simply skip it
 2015-06-23 18:22:36 +02:00
Morris Jobke
02b2b60581 Merge pull request #17095 from owncloud/proper-error-handling 
Proper error handling
 2015-06-23 17:40:55 +02:00
Joas Schilling
0db311c9db Only update the htaccess ErrorDocument links when they are not set yet 2015-06-23 16:45:56 +02:00
Morris Jobke
c86e129ce9 [updater] keep maintenance active on failure and mark failure in red 2015-06-23 14:45:53 +02:00
Björn Schießle
cce841c665 Merge pull request #17045 from owncloud/enc_improvements 
encryption improvements
 2015-06-23 14:30:21 +02:00
Morris Jobke
1ba9fd3ada [upgrade] print update message before running the update code 
* otherwise you don't know during which app update something failed
 2015-06-23 13:13:44 +02:00
Bjoern Schiessle
95602d4069 make sure that we always read the header from the original file 2015-06-23 11:41:21 +02:00
Morris Jobke
fe42553e8a [updater] propagate error case properly 
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
 2015-06-23 10:03:27 +02:00
Morris Jobke
fdd01cf15c Added error message on initMountpoints exception 2015-06-23 09:54:03 +02:00
Joas Schilling
738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Joas Schilling
2b7e5f841a Merge spliteUserRemote with fixRemoteUrlInShareWith 2015-06-22 15:25:23 +02:00
Bjoern Schiessle
d38a378b8c make sure that we split username and server address at the first '@' from the right to allow usernames containing '@' 2015-06-22 15:25:23 +02:00
Björn Schießle
a88b370dc8 Merge pull request #12546 from oparoz/patch-1 
Send the mime icon if we can't generate a preview
 2015-06-22 13:55:17 +02:00
Lukas Reschke
4d23e06097 Fix undefined offset 
There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
 2015-06-22 12:28:07 +02:00
Thomas Müller
c74c8eff3a Enable x-sendfile only if we do not lock the file system 2015-06-22 12:07:53 +02:00
Thomas Müller
ced15c44b4 Merge pull request #16657 from owncloud/view-emit-path 
emit hooks from a view as long as the path is inside the default root
 2015-06-22 11:29:11 +02:00
Bernhard Posselt
7fe5ab4d4a Merge pull request #17056 from owncloud/appframework-type-cast 
Allow multiple whitespace in type hints in AppFramework
 2015-06-22 10:35:28 +02:00
Robin McCorkell
04b6f67f07 Allow multiple whitespace in type hints in AppFramework 
Type hints such as `@param bool     $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
 2015-06-20 23:52:01 +01:00
Lukas Reschke
1ead0b6f95 Use proper type 
This is a string
 2015-06-19 21:00:42 +02:00
Lukas Reschke
00a65e30ce Request approved state for disabled apps with ocsid 
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.

With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.

Fixes https://github.com/owncloud/core/issues/17003
 2015-06-19 19:04:54 +02:00
Olivier Paroz
ba3b6f9be4 Remove unneeded returns from private cropping methods 2015-06-19 15:07:49 +02:00
Morris Jobke
7e046d0595 Fix naming of param in private/server.php 2015-06-19 10:23:04 +02:00
Joas Schilling
6adddb3095 Merge pull request #16889 from owncloud/group-sorting-fixes 
Only sort by group name when LDAP is involved
 2015-06-19 08:29:25 +02:00
Vincent Petry
6697f9524c Merge pull request #16963 from owncloud/fileinfo-lock 
Acquire read lock when getting file or directory info
 2015-06-18 18:27:20 +02:00
Vincent Petry
0b34d888e6 Merge pull request #17017 from owncloud/cache-update-write-lock 
update the file cache within the write lock
 2015-06-18 18:27:02 +02:00
Robin Appelman
17be0993b4 remove unneeded normalize 2015-06-18 15:33:44 +02:00
Robin Appelman
6018567df2 unlock the file if the file doesnt exists 2015-06-18 15:26:17 +02:00
Robin Appelman
d7960d5db6 dont update the cache on rename fail 2015-06-18 14:45:13 +02:00
Robin Appelman
2a50dbd1a1 update noopscanner 2015-06-18 14:42:48 +02:00
Robin Appelman
3e54696f7f extends phpdoc 2015-06-18 14:30:25 +02:00
Robin Appelman
3526b352dc update the file cache within the write lock 2015-06-18 13:47:03 +02:00
Olivier Paroz
64f0fd0889 Remove unneeded returns from private cropping methods 2015-06-18 13:30:10 +02:00
Olivier Paroz
8193e1d7c1 Move media type icon preview creation to its own method 2015-06-18 13:24:15 +02:00
Vincent Petry
a9bca9e3aa Lock file before download 
This will throw a LockedException if a concurrent request is currently
touching that file.
 2015-06-18 12:05:26 +02:00
Olivier Paroz
13617a0475 Send the mime icon if we can't generate a preview 2015-06-18 11:35:08 +02:00
Morris Jobke
6856316122 Fix return value for OCP PHPDoc 2015-06-17 15:47:45 +02:00
Robin Appelman
72eedda16c use old cache data when locked 2015-06-17 14:13:10 +02:00
Robin Appelman
24f0151f81 handle locked exceptions when getting file/directory info in sabre 2015-06-17 14:13:10 +02:00
Vincent Petry
a89bb1d383 Merge pull request #16988 from owncloud/fix-avatar-fail 
Fix remaining avatar problems
 2015-06-17 13:20:29 +02:00
Lukas Reschke
70ca0102f5 Fix PHPDoc annotations 2015-06-17 11:57:12 +02:00
Thomas Müller
d2305f2527 Merge pull request #16729 from owncloud/scanner-read-lock 
keep a read lock while scanning a file or folder
 2015-06-17 11:52:54 +02:00
Vincent Petry
102c6ffc41 Normalize path in View's lock methods 2015-06-16 17:03:12 +02:00
Vincent Petry
e5d34a2733 Merge pull request #16892 from owncloud/lock-returnfullpath 
Rethrow LockedException with full path
 2015-06-16 16:47:10 +02:00
Lukas Reschke
829f6474ff Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-completion 
Load the update information asyncroniously to fix the page load speed
 2015-06-16 11:41:44 +02:00
Joas Schilling
497fe93b6c Do not return backends but add a method to check for one 2015-06-16 11:31:04 +02:00
Joas Schilling
171f86ca2e Only sort by group name when LDAP is involved 2015-06-16 11:10:00 +02:00
Joas Schilling
7d8b728066 Merge pull request #16832 from owncloud/memcache-fail 
Throw exception if memcache misconfigured or missing
 2015-06-16 11:00:18 +02:00
Joas Schilling
60005bea19 Merge pull request #16943 from owncloud/sabre-convertinvalidpath 
Convert invalid path exception to sabre exception on MOVE
 2015-06-16 10:49:22 +02:00
Vincent Petry
0e3a3dd5d7 Rethrow LockedException with full path 
Because the path is converted to md5 from the original exception,
rethrow the exception with the correct full path
 2015-06-16 10:48:31 +02:00
Lukas Reschke
15ba2a4100 Reintroduce user cache 
This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200

Fixes https://github.com/owncloud/core/issues/16942
 2015-06-15 17:54:48 +02:00
Vincent Petry
1f91e9e65d Convert invalid path exception to sabre exception on MOVE 2015-06-15 17:49:11 +02:00
Robin Appelman
4b181f73ca phpdoc 2015-06-15 15:41:52 +02:00
Robin Appelman
567df226e5 fix check if hooks should be emited in runHooks 2015-06-15 15:07:48 +02:00
Robin Appelman
9c0d69a3b2 ensure normalized path form when changing locks 2015-06-15 14:32:29 +02:00
Robin Appelman
a4f808b11d properly unlock in case of failed fopen 2015-06-15 14:32:29 +02:00
Robin Appelman
7d72f7d8ce keep a read lock while scanning a file or folder 2015-06-15 14:32:29 +02:00
Thomas Müller
911c43e5f9 Merge pull request #16727 from owncloud/file-put-content-lock 
add proper locking to file_put_contents when using streams
 2015-06-15 14:22:06 +02:00
Thomas Müller
de3ed8e077 Merge pull request #16821 from owncloud/compare-and-delete-locking-watch 
Compare and delete locking watch
 2015-06-15 14:09:06 +02:00
Thomas Müller
b8ab6fb68d Merge pull request #16915 from aidanamavi/add-opus-mimetype 
Added Opus Mimetype Support
 2015-06-15 13:27:44 +02:00
Thomas Müller
b6165b6865 Merge pull request #16912 from owncloud/webdav-smalltransferlockfix 
Webdav PUT small file lock must be shared during hooks
 2015-06-15 11:30:59 +02:00
Robin Appelman
2fb8a76705 add recursive copy polyfill for storage backends 2015-06-14 15:15:21 +02:00
Aidan Amavi
89a7aefad5 Added Opus Mimetype Support 
Added Opus audio mimetype support.
 2015-06-13 04:39:37 -04:00
Vincent Petry
4497aa4c68 Webdav PUT small file lock must be shared during hooks 
Fixed code path for Webdav PUT of small files to use shared locks during
hook execution, and exclusive during the file operation

This makes it possible for versions to be copied by accessing the file
in a post_write hook.
 2015-06-12 18:52:18 +02:00
Robin Appelman
a9ff242f6a switch to using watch to implement cas and cad on redis 2015-06-12 17:28:09 +02:00
Robin Appelman
520a741876 clear memcache keys in locking 2015-06-12 17:28:09 +02:00
Robin Appelman
ac9f998abd add compare-and-delete to the memcache interface 2015-06-12 17:28:09 +02:00
Robin Appelman
1bc56a99e9 compare-and-set and compare-and-delete using lua scripts for redis 2015-06-12 17:28:09 +02:00
Vincent Petry
446f628136 Merge pull request #16886 from owncloud/webdav-verify-path-again 
verify path when getting a node for sabredav
 2015-06-12 16:45:20 +02:00
Jan-Christoph Borchardt
bb0ea6336d Merge pull request #16888 from owncloud/feature/fix-titles 
fixing setting page titles
 2015-06-12 14:54:42 +02:00
Vincent Petry
3b08b26589 Throw exception if memcache misconfigured or missing 
Instead of falling back to null memcache, throw exceptions.
Also throw file locking specific exceptions in case the class is not
available.
 2015-06-12 12:33:06 +02:00
Joas Schilling
5586b2db09 Don't use limit on explode to have only 1 code path 2015-06-12 11:58:26 +02:00
Joas Schilling
a7d2b3b9ae Add return value to lock methods and check it in tests 2015-06-12 11:41:05 +02:00
Joas Schilling
caf16b083e Only lock files in data/username/files/ 2015-06-12 11:09:38 +02:00
Clark Tomlinson
62286f00a1 fixing setting page titles 2015-06-11 11:39:34 -04:00
Robin Appelman
05cecb101d verify path when getting a node for sabredav 2015-06-11 17:11:33 +02:00
Vincent Petry
f13a2d9251 Revert "verify path when getting a node for sabredav" 2015-06-11 15:25:06 +02:00
Robin Appelman
4d10dab813 verify path when getting a node for sabredav 2015-06-11 14:12:04 +02:00
Joas Schilling
4582d14832 Order all use statements correctly 2015-06-11 11:29:27 +02:00
Joas Schilling
05f1ff8715 Correctly import NullCache class 2015-06-11 10:48:30 +02:00
Thomas Müller
3090348bf7 Null -> NullCache 2015-06-11 00:44:13 +02:00
Thomas Müller
48e915c7be Revert "Null -> NullCache" 
This reverts commit ff24554e76.
 2015-06-11 00:40:26 +02:00
Thomas Müller
ff24554e76 Null -> NullCache 2015-06-11 00:34:03 +02:00
Joas Schilling
580155abe7 Load the update information asyncroniously to fix the page load speed 2015-06-10 12:11:05 +02:00
Thomas Müller
9d90421e62 Merge pull request #16803 from owncloud/issue/16801-group-reshare-part-file-enc-keys 
Check if the part files has keys when the original file does not
 2015-06-09 11:41:36 +02:00
Victor Dubiniuk
c7c6556187 Do not use digits in random index names 2015-06-08 19:02:07 +03:00
Thomas Müller
64c9c27f7e Merge pull request #16382 from oparoz/providers-are-responsible-for-the-size-of-their-preview 
Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly
 2015-06-08 16:14:35 +02:00
Joas Schilling
e6681857d2 Check if the part files has keys when the original file does not 2015-06-08 15:42:38 +02:00
Olivier Paroz
3d0a523217 Make sure we have a resource before measuring its size 2015-06-08 15:10:29 +02:00
Thomas Müller
97a3d8c313 Fix login handler for file cache - fixes #16795 2015-06-08 14:13:38 +02:00
Thomas Müller
a968b8409d Merge pull request #16158 from owncloud/mountprovider-after-setup 
Call newly registered mount providers after the filesystem is setup
 2015-06-08 13:42:02 +02:00
Thomas Müller
f051b7381b Merge pull request #16402 from owncloud/issue-15956-slow-group-usercount 
Sort user groups by group name and hide the user count
 2015-06-08 12:11:22 +02:00
Olivier Paroz
71d65cb713 Fix max preview, some resizing and caching issues and force preview providers to resize their previews properly 
* introduces a method in OC_Image which doesn't stretch images when trying to make them fit in a box
* adds the method to all key providers so that they can do their job, as expected by the Preview class
* improves the caching mechanism of Preview in order to reduce I/O and to avoid filling the available disk space
* fixes some long standing issues
* **contains mostly tests**
 2015-06-06 16:25:04 +02:00
Lukas Reschke
ca10ee4d0d Merge pull request #16771 from owncloud/fix-storage-full-message 
Add owner to the storage stats to enable better notifications
 2015-06-05 20:09:55 +02:00
Morris Jobke
3b188d0b72 Merge pull request #16768 from owncloud/add-missing-mime-types 
Adding mimetype x-h for header files
 2015-06-05 20:08:34 +02:00
Lukas Reschke
cbb15f3cbd Merge pull request #16767 from owncloud/webdav-preventdeleteroot 
Prevent deleting Webdav root
 2015-06-05 19:56:20 +02:00
Morris Jobke
62ae39208a Add owner to the storage stats to enable better notifications 
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
 2015-06-05 18:21:41 +02:00
Thomas Müller
5481a846c2 Adding mark down mime type mkd - fixes https://github.com/owncloud/files_texteditor/issues/45 2015-06-05 17:11:14 +02:00
Thomas Müller
5d93353a02 Adding mimetype x-h for header files - fixes https://github.com/owncloud/files_texteditor/issues/70 2015-06-05 16:57:01 +02:00
Vincent Petry
6ae5ae2e31 Prevent deleting Webdav root 2015-06-05 16:55:09 +02:00
Thomas Müller
85d1ca11d4 Merge pull request #16765 from owncloud/fix-chunked-upload-jenkins 
Fix chunked upload jenkins
 2015-06-05 16:20:33 +02:00
Thomas Müller
5e60795962 Bring back OC\Cache\File - fixes #16760 2015-06-05 14:21:17 +02:00
Joas Schilling
1df95ea1ca Fix "@throws" tags on doc blocks 2015-06-05 13:55:59 +02:00
Vincent Petry
06dda427f3 Validate path in getChild 2015-06-05 12:08:18 +02:00
Joas Schilling
bb0cb0aaec Merge pull request #15895 from owncloud/dav-getremoteetag 
Get etag from remote OC server
 2015-06-03 17:20:25 +02:00
Robin Appelman
bcf13aff6f change lock back to shared before updating the cache 2015-06-03 17:18:50 +02:00
Robin Appelman
6b0874203d add proper locking to file_put_contents when using streams 2015-06-03 17:18:50 +02:00
Clark Tomlinson
00742a9d68 Merge pull request #16721 from owncloud/fix-grammar-enc-module 
Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/t…
 2015-06-03 09:54:50 -04:00
Thomas Müller
5dc5b7f86d Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user. 2015-06-03 15:00:56 +02:00
Thomas Müller
259b6ac2c1 Fixing grammar - refs https://www.transifex.com/projects/p/owncloud/translate/#en_GB/lib/50330746 2015-06-03 14:56:18 +02:00
Thomas Müller
739c3f01aa Merge pull request #16434 from owncloud/persist-maintenance-state 
Persist the state of the maintenance after an upgrade
 2015-06-03 13:56:17 +02:00
Thomas Müller
69d1e7aaf4 Merge pull request #16687 from owncloud/issue-16113-redis-minimum-version 
Check for redis to be 2.2.5+
 2015-06-03 13:55:26 +02:00
Morris Jobke
e3440863bc Merge pull request #16708 from owncloud/enc_fix_move_to_trash 
make sure that we always use the correct owner for both source and target
 2015-06-03 13:49:46 +02:00
Vincent Petry
6ab38be40e Translate invalid path exception to sabre exception for files 2015-06-03 12:22:31 +02:00
Bjoern Schiessle
7eb2b31e34 make sure that we always use the correct owner for both source and target 2015-06-03 11:59:06 +02:00
Morris Jobke
259937680b Merge pull request #16667 from owncloud/issue-16510-fix-encryption-with-s2s-shares 
Add tests for the storage wrapper and fix the wrapping
 2015-06-02 16:42:32 +02:00
Joas Schilling
bdc82dcfb9 Check for redis to be 2.2.5+ 2015-06-02 15:42:48 +02:00
Robin Appelman
a9455be14a more hints 2015-06-02 14:16:37 +02:00
Robin Appelman
0497534a6e more type hints 2015-06-02 14:07:55 +02:00
Robin Appelman
8926bca0c7 phpdoc, strict and type hints 2015-06-02 14:07:55 +02:00
Robin Appelman
6f47a547d8 only use mount provider if we have a valid user 2015-06-02 14:07:54 +02:00
Robin Appelman
24131586d7 call mount providers that are registered after the filesystem is setup 2015-06-02 14:07:54 +02:00
Robin Appelman
c91b52d38c move emitter implementation to a trait 2015-06-02 14:07:54 +02:00
Robin Appelman
4b48dd424f emit hooks from a view as long as the path is inside the default root 2015-06-02 14:07:20 +02:00
Thomas Müller
3ebc8f0564 Merge pull request #16107 from owncloud/fix-getLocalFile-encryption-master 
Fix get local file encryption master
 2015-06-02 13:47:37 +02:00
Joas Schilling
be1f319511 Correctly ignore remote shares aswell 2015-06-02 12:33:51 +02:00
Joas Schilling
50a31fa8f9 Add unit tests for wrapStorage 2015-06-02 12:33:17 +02:00
Joas Schilling
9a4040c7ca Move the storage wrapping into a testable method 2015-06-02 12:29:06 +02:00
Vincent Petry
30d7f92763 Get etag from remote OC server 2015-06-02 11:42:03 +02:00
Morris Jobke
cf2c599218 Merge pull request #16200 from owncloud/kill-globalfilecache 
Drop file caching
 2015-06-02 09:11:33 +02:00
Lukas Reschke
73875da4b0 Clean application identifier before processing 2015-06-01 17:03:51 +02:00
Thomas Müller
2104c2ffdd Fixing undefined index 'foo' 2015-06-01 14:10:00 +02:00
Robin Appelman
8902e2be73 fix nooplockingprovider 2015-06-01 13:25:27 +02:00
Robin Appelman
ce04cf6610 shared lock around hooks 2015-06-01 13:24:02 +02:00