mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
30,018 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

30018 Commits

Author SHA1 Message Date
Carla Schroder 7d49bb6323 small corrections; Web is capitalized, webroot is one lowercase word 2016-02-03 10:06:44 +01:00
Morris Jobke d7892619b1 Merge pull request #22076 from owncloud/activities-yes-default-enabled-no 
Don't enable tag activities for email by default
 2016-02-02 18:20:20 +01:00
Joas Schilling 5a3d2ef2a1 Don't enable tag activities by default 2016-02-02 16:29:49 +01:00
Thomas Müller 0e95b9f2d5 Merge pull request #22054 from vincchan/vincchan/fix#20199 
Move data protection check to javascript
 2016-02-02 15:59:07 +01:00
Thomas Müller 8049b6e998 Merge pull request #22023 from owncloud/interruptable-commands 
Interruptable commands
 2016-02-02 14:07:07 +01:00
Thomas Müller ce053b9808 Merge pull request #22013 from owncloud/share2_moveshare 
[Share 2.0] Allow moving of shares
 2016-02-02 13:34:50 +01:00
Thomas Müller 2d1d89ee29 Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags 
Issue 22041 activities for systemtags
 2016-02-02 13:08:01 +01:00
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 Jago Douma 2316cb1f8b [Share 2.0] Allow moving of shares 
* Only recipient can move a share
* Unit tests
 2016-02-02 11:34:52 +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
Joas Schilling 7f563dc3e9 Fix path match 2016-02-02 11:12:16 +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
Vincent Chan 59cfeae2cd changed variables to lowercase 2016-02-02 10:32:50 +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
Joas Schilling b5e40bc8f6 Fix IManager::isFormattingFilteredObject() 2016-02-02 10:11:58 +01:00
Joas Schilling 25cbc17bec Add activities when a tag is (un-)assigned 2016-02-02 10:11:58 +01:00
Joas Schilling dfe677fabb Add activities for admins when a tag is created/updated/deleted 2016-02-02 09:57:43 +01:00
Joas Schilling aa3fdccb8e App needs to be of type logging to be able to have activities 2016-02-02 09:57:43 +01:00
Joas Schilling d5126b1ad4 Dispatch events when tags are added/updated/deleted 2016-02-02 09:57:42 +01:00
Joas Schilling 591613fce2 Dispatch some events when tags are un-/assigned 2016-02-02 09:57:42 +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 Chan faf48e42b7 Move data protection check to javascript 
fixes #20199
 2016-02-01 18:57:58 +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 79d2f3186c Add startup warning that the PCNTL extensions are missing 2016-02-01 09:47:13 +01:00
Thomas Müller 0202acb926 Move signal handling to the base class to allow other commands to reuse this feature 2016-02-01 09:47:13 +01:00