]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Tue, 2 Feb 2016 09:26:06 +0000 (10:26 +0100)]
Merge pull request #22015 from owncloud/share-no-permissions
Block shares that dont have the correct source permissions
Jenkins for ownCloud [Tue, 2 Feb 2016 06:55:41 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Mon, 1 Feb 2016 22:20:42 +0000 (23:20 +0100)]
Merge pull request #22050 from owncloud/fix_sync_addressbook
pass parameter in the right order to syncRemoteAddressBook()
Björn Schießle [Mon, 1 Feb 2016 15:30:05 +0000 (16:30 +0100)]
pass parameter in the right order to syncRemoteAddressBook()
Thomas Müller [Mon, 1 Feb 2016 15:17:45 +0000 (16:17 +0100)]
Merge pull request #21967 from owncloud/comments-webdav
Comments WebDAV adjustements
Thomas Müller [Mon, 1 Feb 2016 14:05:54 +0000 (15:05 +0100)]
Merge pull request #21909 from owncloud/files-external-visibility
Prevent invalid storages being displayed in the storages view
Thomas Müller [Mon, 1 Feb 2016 13:13:54 +0000 (14:13 +0100)]
Merge pull request #22028 from owncloud/share_hook_expirationdate
Share hook expirationdate
Thomas Müller [Mon, 1 Feb 2016 13:10:24 +0000 (14:10 +0100)]
Merge pull request #22046 from owncloud/improved_error_handling
Improved error handling
Thomas Müller [Mon, 1 Feb 2016 13:08:40 +0000 (14:08 +0100)]
Merge pull request #21953 from owncloud/make-enable_avatars-more-robust
Make enable_avatars setting more robust
Thomas Müller [Mon, 1 Feb 2016 12:52:30 +0000 (13:52 +0100)]
Merge pull request #22045 from owncloud/ext-storage-auth-backend-rewording
Reword external storage auth backends
Björn Schießle [Mon, 1 Feb 2016 12:39:13 +0000 (13:39 +0100)]
catch all exceptions
Björn Schießle [Mon, 1 Feb 2016 12:38:46 +0000 (13:38 +0100)]
add context to the error messages
Vincent Petry [Mon, 1 Feb 2016 11:20:21 +0000 (12:20 +0100)]
Reword external storage auth backends
Thomas Müller [Mon, 1 Feb 2016 10:26:33 +0000 (11:26 +0100)]
Merge pull request #22004 from Pookay/patch-1
Fix the result at the bottom on IE
Thomas Müller [Mon, 1 Feb 2016 10:26:08 +0000 (11:26 +0100)]
Merge pull request #22021 from owncloud/fix-system-addressbook-sync-with-encryption
Catch potential exceptions when accessing the users avatar - e.g. iss…
Thomas Müller [Mon, 1 Feb 2016 09:47:48 +0000 (10:47 +0100)]
Merge pull request #22034 from matthias-g/patch-1
Update explanation in comment of how to enable the debug mode
Thomas Müller [Mon, 1 Feb 2016 09:10:40 +0000 (10:10 +0100)]
Merge pull request #21989 from owncloud/make-csp-modifiable
Add public API to give developers the possibility to adjust the global CSP defaults
Thomas Müller [Mon, 1 Feb 2016 08:00:31 +0000 (09:00 +0100)]
Merge pull request #22022 from owncloud/share_ocs_filter_path_sharedwithme
Add path filter to OCS Share API shared_with_me=true
Thomas Müller [Mon, 1 Feb 2016 08:00:14 +0000 (09:00 +0100)]
Merge pull request #22012 from owncloud/storagenotavailableexception-code
Default to STATUS_ERROR in StorageNotAvailableException
Thomas Müller [Mon, 1 Feb 2016 07:59:55 +0000 (08:59 +0100)]
Merge pull request #21999 from owncloud/properly-decode-cached-objects
[user_ldap] properly decode cached objects
Jenkins for ownCloud [Mon, 1 Feb 2016 06:54:40 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 31 Jan 2016 06:54:49 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
matthias-g [Sat, 30 Jan 2016 17:26:10 +0000 (18:26 +0100)]
Update explanation of how to enable debug mode
Roeland Jago Douma [Fri, 29 Jan 2016 22:04:42 +0000 (23:04 +0100)]
Add Unit tests
Roeland Jago Douma [Fri, 29 Jan 2016 21:42:59 +0000 (22:42 +0100)]
Emit hook for expirationDate verification
Jenkins for ownCloud [Sat, 30 Jan 2016 06:55:56 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Thomas Müller [Fri, 29 Jan 2016 16:03:42 +0000 (17:03 +0100)]
Merge pull request #22018 from owncloud/occ-external-delete
Add delete command for external storages
Thomas Müller [Fri, 29 Jan 2016 16:03:16 +0000 (17:03 +0100)]
Merge pull request #21956 from owncloud/cross-cache-move
Add fallback moveFromCache implementation
Vincent Petry [Fri, 29 Jan 2016 15:56:43 +0000 (16:56 +0100)]
Merge pull request #21790 from owncloud/ext-auth-user-provided
Add user provided auth mechanism
Thomas Müller [Fri, 29 Jan 2016 14:39:39 +0000 (15:39 +0100)]
Catch potential exceptions when accessing the users avatar - e.g. issues with the encrypted file system - fixes #21983
Roeland Jago Douma [Fri, 29 Jan 2016 14:28:28 +0000 (15:28 +0100)]
Add intergration test
Roeland Jago Douma [Fri, 29 Jan 2016 14:26:04 +0000 (15:26 +0100)]
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.
Robin Appelman [Thu, 28 Jan 2016 12:07:19 +0000 (13:07 +0100)]
inject logger
Robin Appelman [Tue, 26 Jan 2016 13:40:55 +0000 (14:40 +0100)]
Dont set null values when validating storage definition
Robin Appelman [Tue, 26 Jan 2016 12:22:27 +0000 (13:22 +0100)]
minor fixes
Robin Appelman [Mon, 25 Jan 2016 15:24:33 +0000 (16:24 +0100)]
set auth mechanism in tests
Robin Appelman [Tue, 19 Jan 2016 15:57:20 +0000 (16:57 +0100)]
remove custom controler for user provided password auth
Robin Appelman [Tue, 19 Jan 2016 13:21:59 +0000 (14:21 +0100)]
dont show user provided auth as option for personal mounts
Robin Appelman [Tue, 19 Jan 2016 13:16:11 +0000 (14:16 +0100)]
Allow setting user provided credentials from the personal settings page
Robin Appelman [Tue, 19 Jan 2016 11:18:09 +0000 (12:18 +0100)]
expose user provided credentials for admin mounts
Robin Appelman [Tue, 19 Jan 2016 11:15:20 +0000 (12:15 +0100)]
Add user provided credentials mechanism
Robin Appelman [Tue, 19 Jan 2016 11:04:34 +0000 (12:04 +0100)]
Fix invalid storages not showing in directory listing
Thomas Müller [Fri, 29 Jan 2016 13:43:16 +0000 (14:43 +0100)]
Merge pull request #21660 from owncloud/sharing2_update_reshares
upgrade to sharing 2.0, remove hierarchical re-shares
Thomas Müller [Fri, 29 Jan 2016 13:42:57 +0000 (14:42 +0100)]
Merge pull request #21992 from owncloud/share-dialog-error-handling
Properly forward error messages in share dialog
Thomas Müller [Fri, 29 Jan 2016 13:18:13 +0000 (14:18 +0100)]
Merge pull request #21928 from owncloud/files-external-js-checkbox-fix
Fix validation of inputs that aren't text
Thomas Müller [Fri, 29 Jan 2016 13:16:50 +0000 (14:16 +0100)]
Merge pull request #21990 from owncloud/systemtags-cleanup-orphans
Background cleanup job for system and user tag orphaned when file was deleted
Robin Appelman [Fri, 29 Jan 2016 13:10:43 +0000 (14:10 +0100)]
Add delete command for external storages
Arthur Schiwon [Fri, 29 Jan 2016 12:28:17 +0000 (13:28 +0100)]
url encode id
Arthur Schiwon [Thu, 28 Jan 2016 21:59:48 +0000 (22:59 +0100)]
introduce comments read marke tables, comes with user cleanup after deletion
Arthur Schiwon [Thu, 28 Jan 2016 20:45:04 +0000 (21:45 +0100)]
standardize datetime output
Arthur Schiwon [Wed, 27 Jan 2016 17:30:09 +0000 (18:30 +0100)]
Comments WebDAV adjustements
Robin Appelman [Wed, 27 Jan 2016 14:45:19 +0000 (15:45 +0100)]
Add fallback moveFromCache implementation
Robin Appelman [Fri, 29 Jan 2016 12:05:53 +0000 (13:05 +0100)]
Block shares that dont have the correct source permissions
Robin McCorkell [Fri, 29 Jan 2016 11:57:25 +0000 (11:57 +0000)]
Default to STATUS_ERROR in StorageNotAvailableException
Robin McCorkell [Fri, 29 Jan 2016 11:47:23 +0000 (11:47 +0000)]
Add storage validation JS unit tests
Vincent Petry [Thu, 28 Jan 2016 14:49:33 +0000 (15:49 +0100)]
Cleanup job for system and user tag orphaned when file was deleted
Whenever a file was deleted (also from trash), the tag mapping is
pointing at a fileid that doesn't exist any more.
This cleanup job will delete such orphaned mapping entries.
Thomas Müller [Fri, 29 Jan 2016 10:41:36 +0000 (11:41 +0100)]
Merge pull request #21701 from owncloud/scan_files_more_details_II
occ scan:files Adding more details in the base print out (II)
Thomas Müller [Fri, 29 Jan 2016 10:34:38 +0000 (11:34 +0100)]
Merge pull request #21995 from owncloud/share2_delete_user_defined_group_shares
[Share 2.0] When deleting a group share delete children
Pookay [Fri, 29 Jan 2016 09:07:15 +0000 (10:07 +0100)]
Fix the result at the bottom on IE
view issue #21898
Thomas Müller [Fri, 29 Jan 2016 09:03:20 +0000 (10:03 +0100)]
Merge pull request #21932 from owncloud/comments-dav-refinements
provide info about plugin, and do not run commit ourselves on proppatch
Thomas Müller [Fri, 29 Jan 2016 09:02:52 +0000 (10:02 +0100)]
Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-away
Do not create a loop that generates thousands of jobs
Thomas Müller [Fri, 29 Jan 2016 09:02:23 +0000 (10:02 +0100)]
Merge pull request #21981 from owncloud/systemtags-trim-name
Trim tag names to avoid problems
Thomas Müller [Fri, 29 Jan 2016 09:02:04 +0000 (10:02 +0100)]
Merge pull request #21993 from owncloud/updater-htacces
Do not rewrite requests to updater
Joas Schilling [Fri, 29 Jan 2016 07:50:29 +0000 (08:50 +0100)]
Remove other broken usages in deprecated methods
martin.mattel@diemattels.at [Tue, 26 Jan 2016 17:42:03 +0000 (18:42 +0100)]
occ scan:files Adding more details in the base print out (II)
Use proper method name
Fixed the interruption logic
Checks the availability of the pcntl_signal function
Fixed typo crtl-c --> ctrl-c
one overseen crtl-c typo
Jenkins for ownCloud [Fri, 29 Jan 2016 06:55:53 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Fri, 29 Jan 2016 06:51:16 +0000 (07:51 +0100)]
[user_ldap] properly decode cached objects
* fixes #21896
Joas Schilling [Thu, 28 Jan 2016 13:23:56 +0000 (14:23 +0100)]
Trim tag names to avoid problems
Roeland Jago Douma [Thu, 28 Jan 2016 19:35:46 +0000 (20:35 +0100)]
[Share 2.0] When deleting a group share delete children
For group shares we can have children. Those are custom shares when a
user has moved or deleted a group share. Those also have to be deleted
if the group share is removed.
Thomas Müller [Thu, 28 Jan 2016 18:47:48 +0000 (19:47 +0100)]
Merge pull request #21333 from owncloud/migrate-contacts
Migrate contacts
Lukas Reschke [Thu, 28 Jan 2016 18:27:04 +0000 (19:27 +0100)]
Add copyright header
Roeland Jago Douma [Mon, 25 Jan 2016 17:06:34 +0000 (18:06 +0100)]
Update the initiator of the share as well in migration
Roeland Jago Douma [Mon, 25 Jan 2016 16:57:41 +0000 (17:57 +0100)]
Update reshares in batches as not to run out of memory
Björn Schießle [Tue, 12 Jan 2016 15:28:47 +0000 (16:28 +0100)]
upgrade to sharing 2.0, remove hierarchical re-shares
Lukas Reschke [Thu, 28 Jan 2016 13:33:02 +0000 (14:33 +0100)]
Add public API to give developers the possibility to adjust the global CSP defaults
Allows to inject something into the default content policy. This is for
example useful when you're injecting Javascript code into a view belonging
to another controller and cannot modify its Content-Security-Policy itself.
Note that the adjustment is only applied to applications that use AppFramework
controllers.
To use this from your `app.php` use `\OC::$server->getContentSecurityPolicyManager()->addDefaultPolicy($policy)`,
$policy has to be of type `\OCP\AppFramework\Http\ContentSecurityPolicy`.
To test this add something like the following into an `app.php` of any enabled app:
```
$manager = \OC::$server->getContentSecurityPolicyManager();
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFrameDomain('asdf');
$policy->addAllowedScriptDomain('yolo.com');
$policy->allowInlineScript(false);
$manager->addDefaultPolicy($policy);
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFontDomain('yolo.com');
$manager->addDefaultPolicy($policy);
$policy = new \OCP\AppFramework\Http\ContentSecurityPolicy(false);
$policy->addAllowedFrameDomain('banana.com');
$manager->addDefaultPolicy($policy);
```
If you now open the files app the policy should be:
```
Content-Security-Policy:default-src 'none';script-src yolo.com 'self' 'unsafe-eval';style-src 'self' 'unsafe-inline';img-src 'self' data: blob:;font-src yolo.com 'self';connect-src 'self';media-src 'self';frame-src asdf banana.com 'self'
```
Victor Dubiniuk [Thu, 28 Jan 2016 17:04:56 +0000 (20:04 +0300)]
Do not rewrite updater requests
Vincent Petry [Thu, 28 Jan 2016 16:07:51 +0000 (17:07 +0100)]
Properly forward error messages in share dialog
Vincent Petry [Thu, 28 Jan 2016 15:56:29 +0000 (16:56 +0100)]
Merge pull request #21860 from owncloud/sharedialog-ocs-adapter
Share dialog use OCS API
Joas Schilling [Thu, 28 Jan 2016 14:36:33 +0000 (15:36 +0100)]
Deprecate the method and warn against using it
Joas Schilling [Thu, 28 Jan 2016 14:34:50 +0000 (15:34 +0100)]
Do not create a loop that generates thousands of jobs
Vincent Petry [Thu, 28 Jan 2016 11:28:30 +0000 (12:28 +0100)]
Fix share default expiration date calculation
Now using UTC dates with moment js to accurately add the number of days
Vincent Petry [Fri, 22 Jan 2016 16:30:18 +0000 (17:30 +0100)]
Share dialog use OCS API
Thomas Müller [Thu, 28 Jan 2016 14:09:31 +0000 (15:09 +0100)]
Merge pull request #21975 from owncloud/fix_ocs_unit_tests
Fix OCS unit tests after two share merges
Roeland Jago Douma [Thu, 28 Jan 2016 12:17:16 +0000 (13:17 +0100)]
Fix OCS unit tests after two share merges
* Use getNode
* Return IShare object so typechecking is happy
Thomas Müller [Thu, 28 Jan 2016 11:54:52 +0000 (12:54 +0100)]
Merge pull request #21958 from owncloud/systemtags-style
Use boxes for system tags, shorten permission text
Thomas Müller [Thu, 28 Jan 2016 10:58:35 +0000 (11:58 +0100)]
Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings
Share2 ocs fix passing empty strings
Thomas Müller [Thu, 28 Jan 2016 10:57:37 +0000 (11:57 +0100)]
Merge pull request #21952 from owncloud/systemtags-fix-conflicts
Fix system tags conflict situations
Thomas Müller [Thu, 28 Jan 2016 10:57:18 +0000 (11:57 +0100)]
Merge pull request #21851 from owncloud/shared-unreadable
Base shared cache on CacheJail
Robin Appelman [Mon, 25 Jan 2016 12:20:59 +0000 (13:20 +0100)]
fix cachejail->update
Robin Appelman [Fri, 22 Jan 2016 12:01:37 +0000 (13:01 +0100)]
cleanup shared cache
Vincent Petry [Wed, 27 Jan 2016 14:49:11 +0000 (15:49 +0100)]
Use boxes for system tags, shorten permission text
Permission text now doesn't appear when all permissions are there, or
shows as "invisible" or "not assignable", which should better cover all
use cases.
Changed select2 style to use boxes in the input field.
Thomas Müller [Thu, 28 Jan 2016 10:20:42 +0000 (11:20 +0100)]
Merge pull request #21858 from owncloud/getMountsForFileId
add IUserMountCache->getMountsForFileId
Thomas Müller [Thu, 28 Jan 2016 10:20:25 +0000 (11:20 +0100)]
Merge pull request #21970 from zander/mentionbot
Stop spamming me.
Thomas Müller [Thu, 28 Jan 2016 10:19:25 +0000 (11:19 +0100)]
Merge pull request #21971 from owncloud/notify-me
Notify me on activity and notifications for sure
Joas Schilling [Thu, 28 Jan 2016 10:15:06 +0000 (11:15 +0100)]
More more more, kidding, just to be sure
Morris Jobke [Thu, 28 Jan 2016 09:41:39 +0000 (10:41 +0100)]
Merge pull request #21957 from owncloud/share2_to_ocp
[Share 2.0] Move interfaces to OCP
Tom [Thu, 28 Jan 2016 09:26:21 +0000 (09:26 +0000)]
Stop spamming me.
Honestly, the bot should be improved, if a person hasn't contributed for
a long time it really doens't make sense to email him.
I would also argue that altering the .gitignore doesn't make me an
expert on that file. So classes of files really should not cause
the mention bot spamming me.
Roeland Jago Douma [Wed, 27 Jan 2016 21:34:27 +0000 (22:34 +0100)]
[Share 2.0] Remove setId and setProviderId from the interface
Those should only ever be set by the providers
Roeland Jago Douma [Wed, 27 Jan 2016 19:51:26 +0000 (20:51 +0100)]
[Share 2.0] Fix interfaces and comments
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
Roeland Jago Douma [Wed, 27 Jan 2016 13:48:52 +0000 (14:48 +0100)]
[Share 2.0] Add getShareManager to OCP\IServerContainer