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

29999 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
37d6fff976 Merge pull request #22055 from owncloud/systemtags-checkfileidowner 
Make sure user has access to file for system tag operations
 2016-02-02 12:37:52 +01:00
Thomas Müller
eee6f3d406 Merge pull request #22057 from owncloud/share2_update_hash 
Update old password hashed for link shares on access
 2016-02-02 12:37:31 +01:00
Thomas Müller
c9006d6d56 Merge pull request #21988 from owncloud/allow-search-in-synced-addressbooks 
Allow search in synced addressbooks
 2016-02-02 12:37:12 +01:00
Roeland Douma
8ebdfd0e05 Merge pull request #22005 from owncloud/share2_getshare_byid_as_recipient 
[Share 2.0] Allow recipient to be passed in to getShareById
 2016-02-02 11:34:20 +01:00
Thomas Müller
dfb88612af Filter contacts from the local system addressbook - remote share with local users is not allowed 2016-02-02 11:24:26 +01:00
Thomas Müller
22de25c382 PHP 5.4 compatibility 2016-02-02 10:56:33 +01:00
Thomas Müller
847b1e3af0 In some cases $contact['CLOUD'] is not an array 2016-02-02 10:56:33 +01:00
Thomas Müller
ca25055cc8 Register all system address books to the contacts manager 2016-02-02 10:56:33 +01:00
Thomas Müller
b01d50216e The local address book is replaced now by the system addressbook as part of the dav app 2016-02-02 10:56:33 +01:00
Roeland Jago Douma
df690cd1f2 getChildren should not return usergroup shares 2016-02-02 10:41:57 +01:00
Roeland Jago Douma
403547f0ea [Share 2.0] Allow recipient to be passed in to getShareById 
* This allows us to retrieve usergroup shares for a given id.
  If the user deleted a share or moved it this will be a different share
 2016-02-02 10:41:57 +01:00
Thomas Müller
4777f78187 Merge pull request #20903 from owncloud/sharing-mount-option 
Add mount option to disable sharing
 2016-02-02 10:26:24 +01:00
Thomas Müller
e60b217156 Merge pull request #22015 from owncloud/share-no-permissions 
Block shares that dont have the correct source permissions
 2016-02-02 10:26:06 +01:00
Jenkins for ownCloud
9861a7f6cc [tx-robot] updated from transifex 2016-02-02 01:55:41 -05:00
Thomas Müller
333bb5a227 Merge pull request #22050 from owncloud/fix_sync_addressbook 
pass parameter in the right order to syncRemoteAddressBook()
 2016-02-01 23:20:42 +01:00
Roeland Jago Douma
619a4d2e52 Update old password hashed for link shares on access 
Fixes https://github.com/owncloud/core/issues/16594
 2016-02-01 21:46:32 +01:00
Vincent Petry
d72c0ffbc6 Make sure user has access to file for system tag operations 
Fixes DAV's SystemTagsObjectTypeCollection to not give access to files
where the current user doesn't have access to.
 2016-02-01 18:23:40 +01:00
Björn Schießle
2f739a89f5 pass parameter in the right order to syncRemoteAddressBook() 2016-02-01 16:30:05 +01:00
Thomas Müller
b4853f3fce Merge pull request #21967 from owncloud/comments-webdav 
Comments WebDAV adjustements
 2016-02-01 16:17:45 +01:00
Thomas Müller
a2e13aea15 Merge pull request #21909 from owncloud/files-external-visibility 
Prevent invalid storages being displayed in the storages view
 2016-02-01 15:05:54 +01:00
Thomas Müller
84d9704121 Merge pull request #22028 from owncloud/share_hook_expirationdate 
Share hook expirationdate
 2016-02-01 14:13:54 +01:00
Thomas Müller
1232943aaa Merge pull request #22046 from owncloud/improved_error_handling 
Improved error handling
 2016-02-01 14:10:24 +01:00
Thomas Müller
e23cd35019 Merge pull request #21953 from owncloud/make-enable_avatars-more-robust 
Make enable_avatars setting more robust
 2016-02-01 14:08:40 +01:00
Thomas Müller
95199013f0 Merge pull request #22045 from owncloud/ext-storage-auth-backend-rewording 
Reword external storage auth backends
 2016-02-01 13:52:30 +01:00
Björn Schießle
2d469e39af catch all exceptions 2016-02-01 13:39:13 +01:00
Björn Schießle
8e3fcb120f add context to the error messages 2016-02-01 13:38:46 +01:00
Vincent Petry
04b88b4aaa Reword external storage auth backends 2016-02-01 12:20:21 +01:00
Thomas Müller
181b43da4e Merge pull request #22004 from Pookay/patch-1 
Fix the result at the bottom on IE
 2016-02-01 11:26:33 +01:00
Thomas Müller
c091ac5d19 Merge pull request #22021 from owncloud/fix-system-addressbook-sync-with-encryption 
Catch potential exceptions when accessing the users avatar - e.g. iss…
 2016-02-01 11:26:08 +01:00
Thomas Müller
d1313b361c Merge pull request #22034 from matthias-g/patch-1 
Update explanation in comment of how to enable the debug mode
 2016-02-01 10:47:48 +01:00
Thomas Müller
32067ac49b Merge pull request #21989 from owncloud/make-csp-modifiable 
Add public API to give developers the possibility to adjust the global CSP defaults
 2016-02-01 10:10:40 +01:00
Thomas Müller
a025b2865f Merge pull request #22022 from owncloud/share_ocs_filter_path_sharedwithme 
Add path filter to OCS Share API shared_with_me=true
 2016-02-01 09:00:31 +01:00
Thomas Müller
5f4b204a49 Merge pull request #22012 from owncloud/storagenotavailableexception-code 
Default to STATUS_ERROR in StorageNotAvailableException
 2016-02-01 09:00:14 +01:00
Thomas Müller
21e9c6d1d0 Merge pull request #21999 from owncloud/properly-decode-cached-objects 
[user_ldap] properly decode cached objects
 2016-02-01 08:59:55 +01:00
Jenkins for ownCloud
3ada5c02a6 [tx-robot] updated from transifex 2016-02-01 01:54:40 -05:00
Jenkins for ownCloud
2b376b9e5c [tx-robot] updated from transifex 2016-01-31 01:54:49 -05:00
matthias-g
41c87531ff Update explanation of how to enable debug mode 2016-01-30 18:26:10 +01:00
Roeland Jago Douma
d3e79f3bb6 Add Unit tests 2016-01-30 15:40:35 +01:00
Roeland Jago Douma
1efe877d00 Emit hook for expirationDate verification 2016-01-30 15:40:31 +01:00
Jenkins for ownCloud
c14464875f [tx-robot] updated from transifex 2016-01-30 01:55:56 -05:00
Thomas Müller
b961ada089 Merge pull request #22018 from owncloud/occ-external-delete 
Add delete command for external storages
 2016-01-29 17:03:42 +01:00
Thomas Müller
67bf225fbe Merge pull request #21956 from owncloud/cross-cache-move 
Add fallback moveFromCache implementation
 2016-01-29 17:03:16 +01:00
Vincent Petry
7d27af5b18 Merge pull request #21790 from owncloud/ext-auth-user-provided 
Add user provided auth mechanism
 2016-01-29 16:56:43 +01:00
Thomas Müller
ca5d72e6b0 Catch potential exceptions when accessing the users avatar - e.g. issues with the encrypted file system - fixes #21983 2016-01-29 15:39:39 +01:00
Roeland Jago Douma
d8114d6ce6 Add intergration test 2016-01-29 15:36:37 +01:00
Roeland Jago Douma
a24e7f6558 Add path filter to OCS Share API ?shared_with_me=true 
This allows all clients to quickly get the share info for a given path.
Instead of returning everything and filtering it then manually on the
client side.
 2016-01-29 15:36:23 +01:00
Robin Appelman
6b18134ceb inject logger 2016-01-29 14:51:30 +01:00
Robin Appelman
d0f5687687 Dont set null values when validating storage definition 2016-01-29 14:51:30 +01:00
Robin Appelman
efcf790eff minor fixes 2016-01-29 14:51:30 +01:00
Robin Appelman
eb29bc64de set auth mechanism in tests 2016-01-29 14:51:30 +01:00