]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Fri, 5 Feb 2016 10:52:40 +0000 (11:52 +0100)]
Merge pull request #22149 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
Scrutinizer Auto-Fixer [Fri, 5 Feb 2016 09:38:43 +0000 (09:38 +0000)]
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
Thomas Müller [Fri, 5 Feb 2016 09:05:23 +0000 (10:05 +0100)]
Merge pull request #20920 from owncloud/issue_20888
Add dialog to enter credentials on errored mount point
Thomas Müller [Fri, 5 Feb 2016 09:04:41 +0000 (10:04 +0100)]
Merge pull request #22118 from owncloud/post_update_permissions_hook
[Share 2.0] Add missing post_update_permissions hook
Thomas Müller [Fri, 5 Feb 2016 09:04:22 +0000 (10:04 +0100)]
Merge pull request #22135 from owncloud/global-auth-warning
fix warning caused by global auth
Jenkins for ownCloud [Fri, 5 Feb 2016 06:56:20 +0000 (01:56 -0500)]
[tx-robot] updated from transifex
Roeland Jago Douma [Thu, 4 Feb 2016 12:25:24 +0000 (13:25 +0100)]
Path should be relative
Roeland Jago Douma [Thu, 4 Feb 2016 08:53:47 +0000 (09:53 +0100)]
[Share 2.0] Add missing post_update_permissions hook
Thomas Müller [Thu, 4 Feb 2016 16:40:31 +0000 (17:40 +0100)]
Merge pull request #22133 from owncloud/add-check-for-content
Add check for content
Vincent Petry [Thu, 4 Feb 2016 16:18:21 +0000 (17:18 +0100)]
Improve credentials dialog usability a bit
Automatically focus on the first field.
Pressing enter submits the form.
Robin Appelman [Thu, 4 Feb 2016 15:53:13 +0000 (16:53 +0100)]
fix warning caused by global auth
Thomas Müller [Thu, 4 Feb 2016 15:49:58 +0000 (16:49 +0100)]
Merge pull request #22130 from owncloud/fix-jsunit-filesclient
Fix jsunit filesclient
Thomas Müller [Thu, 4 Feb 2016 15:49:31 +0000 (16:49 +0100)]
Merge pull request #21766 from farukuzun/master
Add some mimetypes
Robin Appelman [Thu, 4 Feb 2016 15:47:41 +0000 (16:47 +0100)]
fix error code for unconfigured user provided auth
Robin Appelman [Thu, 4 Feb 2016 15:41:27 +0000 (16:41 +0100)]
set read permissions on failed mount root
Robin Appelman [Thu, 4 Feb 2016 15:24:41 +0000 (16:24 +0100)]
handle exception in availibilty check
Robin Appelman [Thu, 4 Feb 2016 15:20:45 +0000 (16:20 +0100)]
fix input type
Robin Appelman [Mon, 1 Feb 2016 13:45:14 +0000 (14:45 +0100)]
show failed external storages properly
Robin Appelman [Mon, 1 Feb 2016 13:44:17 +0000 (14:44 +0100)]
Use handlebars template
Jesús Macias [Mon, 1 Feb 2016 13:25:24 +0000 (14:25 +0100)]
Fix PR from comments
Jesús Macias [Thu, 3 Dec 2015 11:28:52 +0000 (12:28 +0100)]
Add credentials dialog for user provided auth
Thomas Müller [Thu, 4 Feb 2016 15:18:23 +0000 (16:18 +0100)]
Merge pull request #22107 from owncloud/external-auth-global
Add global auth backend for files external
Thomas Müller [Thu, 4 Feb 2016 15:17:47 +0000 (16:17 +0100)]
Merge pull request #22111 from owncloud/use-intermediate-certificate
Use intermediate root authority + sign other release channels
Lukas Reschke [Thu, 4 Feb 2016 15:13:27 +0000 (16:13 +0100)]
Add check for content
The response may be a redirect which is always followed by jQuery. Thus leading to false positives depending on the server configuration (e.g. when it issues a 302)
To prevent that there is also a check performed on the response content.
Vincent Petry [Thu, 4 Feb 2016 14:39:18 +0000 (15:39 +0100)]
Fix JS DAV files client unit tests
Instead of trying to mock the promise, just stub davclient.js' request
object.
Vincent Petry [Thu, 4 Feb 2016 14:38:54 +0000 (15:38 +0100)]
Small fixes in Dav files client
Remove double leading slash in path.
Add utf-8 in default content type.
Thomas Müller [Thu, 4 Feb 2016 14:16:33 +0000 (15:16 +0100)]
Merge pull request #22124 from owncloud/comments-author-check
Check for authorship on edit attempt
Thomas Müller [Thu, 4 Feb 2016 14:16:16 +0000 (15:16 +0100)]
Merge pull request #22126 from owncloud/share2_lazy_shares
Lazy shares
Robin Appelman [Wed, 3 Feb 2016 17:29:24 +0000 (18:29 +0100)]
Add global auth backend for files external
Roeland Jago Douma [Thu, 4 Feb 2016 13:28:09 +0000 (14:28 +0100)]
Also add type (file/folder) to IShare object
We need this for the hooks :(
Roeland Jago Douma [Thu, 4 Feb 2016 12:28:48 +0000 (13:28 +0100)]
Unit test for delete lazy shares
Roeland Jago Douma [Thu, 4 Feb 2016 12:05:05 +0000 (13:05 +0100)]
Add unit tests
Thomas Müller [Thu, 4 Feb 2016 12:03:18 +0000 (13:03 +0100)]
Merge pull request #22121 from owncloud/comments-deleteduser
Special label for deleted users in comments list
Arthur Schiwon [Thu, 4 Feb 2016 11:57:48 +0000 (12:57 +0100)]
Check for authorship on edit and delete attempts
Roeland Jago Douma [Thu, 4 Feb 2016 11:51:23 +0000 (12:51 +0100)]
Make the share object lazy
Share providers can now just pass in a fileId. And the node will only be
created once needed.
Faruk Uzun [Sun, 17 Jan 2016 23:38:53 +0000 (01:38 +0200)]
Introduce some mimetypes for richdocuments
* application/vnd.lotus-wordpro
* application/vnd.visio
* application/vnd.wordperfect
* application/msonenote
Thomas Müller [Thu, 4 Feb 2016 10:58:45 +0000 (11:58 +0100)]
Merge pull request #22025 from owncloud/21838-jenkins
[jenkins] + rebased, of #21838
Vincent Petry [Thu, 4 Feb 2016 10:26:11 +0000 (11:26 +0100)]
Special label for deleted users in comments list
Thomas Müller [Thu, 4 Feb 2016 09:55:49 +0000 (10:55 +0100)]
Merge pull request #22110 from owncloud/comment-types-always-plural
types shall always be plural
Thomas Müller [Thu, 4 Feb 2016 09:49:41 +0000 (10:49 +0100)]
Merge pull request #22103 from ErikPel/tag-css-fix
Fixes #22097
Thomas Müller [Thu, 4 Feb 2016 09:48:36 +0000 (10:48 +0100)]
Merge pull request #21964 from owncloud/calendar-sharing-3
Add calendar sharing
Thomas Müller [Thu, 4 Feb 2016 09:47:49 +0000 (10:47 +0100)]
Merge pull request #22108 from owncloud/comments-edit
Comment owner can now edit or delete
Thomas Müller [Thu, 4 Feb 2016 09:33:30 +0000 (10:33 +0100)]
Merge pull request #22072 from vincchan/trim-newusername-whitespace
Do not allow username to have whitespace at the beginning or at the end
Jenkins for ownCloud [Thu, 4 Feb 2016 06:55:08 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Arthur Schiwon [Wed, 3 Feb 2016 21:45:33 +0000 (22:45 +0100)]
fix unit tests
alexweirig [Fri, 29 Jan 2016 13:21:20 +0000 (14:21 +0100)]
change error logging
replaced variable with print_r call
alexweirig [Fri, 29 Jan 2016 07:27:59 +0000 (08:27 +0100)]
Fixed undefined variable $dnGroup and variable name
I renamed $memberURL into $dynamicGroup and print that variable in the writeLog.
I think this makes more sense.
alexweirig [Thu, 28 Jan 2016 13:43:55 +0000 (14:43 +0100)]
Refactored code to avoid performance problem
Moved the dynamic group processing to the top and removed condition in memberOf processing.
Also, changed variable name $value to $memberUrl
Alex Weirig [Thu, 14 Jan 2016 12:26:40 +0000 (13:26 +0100)]
code changes for user_ldap Dynamic Group Membership
Added new setting of “Dynamic Group Member URL”
(ldapDynamicGroupMemberURL) - see LDAP settings advanced tab.
Added public function getDynamicGroupMembers.
Updated function _groupMembers.
Updated function getUserGroups.
Lukas Reschke [Wed, 3 Feb 2016 20:38:13 +0000 (21:38 +0100)]
Add proper line ending
Vincent Petry [Wed, 3 Feb 2016 20:06:37 +0000 (21:06 +0100)]
Added unit tests for edit/delete comments
Vincent Petry [Wed, 3 Feb 2016 19:32:37 +0000 (20:32 +0100)]
Move comment delete action into edit mode
Vincent Petry [Wed, 3 Feb 2016 17:44:14 +0000 (18:44 +0100)]
Comment owner can now edit or delete
Thomas Müller [Wed, 3 Feb 2016 19:53:40 +0000 (20:53 +0100)]
Merge pull request #22101 from owncloud/comments-filerow
Add file row indicator for unread comments
Thomas Müller [Wed, 3 Feb 2016 19:53:25 +0000 (20:53 +0100)]
Merge pull request #22088 from owncloud/share2_ishare
[Share 2.0] Pass around userid/groupid/federatedid
Thomas Müller [Wed, 3 Feb 2016 19:18:56 +0000 (20:18 +0100)]
Remove entries in dav_shares on deletion of a calendar
Lukas Reschke [Wed, 3 Feb 2016 18:57:39 +0000 (19:57 +0100)]
Also check daily and testing channel
Lukas Reschke [Wed, 3 Feb 2016 18:56:38 +0000 (19:56 +0100)]
Allow specifing the signing path
Arthur Schiwon [Wed, 3 Feb 2016 18:28:15 +0000 (19:28 +0100)]
types shall always be plural
Roeland Jago Douma [Wed, 3 Feb 2016 07:25:57 +0000 (08:25 +0100)]
[Share 2.0] Fix public link sharing
Roeland Jago Douma [Wed, 3 Feb 2016 07:14:48 +0000 (08:14 +0100)]
[Share 2.0] Fix OCS endpoint
Roeland Jago Douma [Tue, 2 Feb 2016 20:02:09 +0000 (21:02 +0100)]
[Share 2.0] Fix shareManager
Roeland Jago Douma [Tue, 2 Feb 2016 15:57:50 +0000 (16:57 +0100)]
[Share 2.0] Fix defaultshare provider
Roeland Jago Douma [Tue, 2 Feb 2016 15:55:41 +0000 (16:55 +0100)]
[Share 2.0] Use strings for ids
* sharedWith
* sharedBy
* shareOwner
Now all set/get strings with the id. (userId, groupId,
federatedsharerId).
This to avoid a huge amount of if statements
Lukas Reschke [Wed, 3 Feb 2016 18:07:50 +0000 (19:07 +0100)]
Use intermediate root authority
Danimo proposed to use an intermediate root authority for signing purposes which makes sense considering that we may also sign updates this way in the future. So this uses now an intermediate authority.
Daniel Molkentin [Wed, 3 Feb 2016 17:19:24 +0000 (18:19 +0100)]
Merge pull request #22106 from owncloud/use-newly-generated-keys
Use newly generated certificate authority
Lukas Reschke [Wed, 3 Feb 2016 17:17:43 +0000 (18:17 +0100)]
Use newly generated certificate authority
Thomas Müller [Tue, 2 Feb 2016 14:13:28 +0000 (15:13 +0100)]
Adding propfind property to retrieve sharee information from a dav resource
Thomas Müller [Tue, 2 Feb 2016 12:50:46 +0000 (13:50 +0100)]
Deleting a shared address book results in unshare
Thomas Müller [Tue, 2 Feb 2016 12:07:14 +0000 (13:07 +0100)]
Deleting a shared calendar results in unshare
Thomas Müller [Mon, 1 Feb 2016 10:47:41 +0000 (11:47 +0100)]
Disallow to share with the owner of the resource
Thomas Müller [Thu, 28 Jan 2016 19:30:40 +0000 (20:30 +0100)]
Fix ACLs on shared calendars
Thomas Müller [Thu, 28 Jan 2016 16:40:59 +0000 (17:40 +0100)]
No duplicate address book if shared with user and group and the user is part of the group
Thomas Müller [Thu, 28 Jan 2016 16:16:11 +0000 (17:16 +0100)]
No duplicate calendars if shared with user and group and the user is part of the group
Thomas Müller [Tue, 26 Jan 2016 11:06:02 +0000 (12:06 +0100)]
Add calendar sharing
Erik Pellikka [Wed, 3 Feb 2016 13:11:59 +0000 (08:11 -0500)]
Fixes #22097
Updated with more specific css selector
Moved the curly brace to the same line as the selector
firefox fix
Vincent Petry [Wed, 3 Feb 2016 15:18:14 +0000 (16:18 +0100)]
Reset comments read marker after loading comments
Thomas Müller [Wed, 3 Feb 2016 15:09:02 +0000 (16:09 +0100)]
Merge pull request #22086 from RealRancor/RealRancor-patch-1
Remove files_locking from shipped.json
Thomas Müller [Wed, 3 Feb 2016 15:06:54 +0000 (16:06 +0100)]
Merge pull request #22095 from owncloud/public_link_with_port
Public link downloads should work on instance on non default port
Thomas Müller [Wed, 3 Feb 2016 13:32:28 +0000 (14:32 +0100)]
Merge pull request #22071 from owncloud/cache-split-insert
split cache->insert from cache->put
Thomas Müller [Wed, 3 Feb 2016 13:17:10 +0000 (14:17 +0100)]
Merge pull request #22098 from owncloud/cleanup-core-apps
Cleanup core apps
Vincent Chan [Wed, 3 Feb 2016 13:09:15 +0000 (14:09 +0100)]
move whitspace check to user manager
Thomas Müller [Wed, 3 Feb 2016 12:57:09 +0000 (13:57 +0100)]
Merge pull request #21996 from owncloud/flysystem-1.0.16
[3rdparty] Bump flysystem to 1.0.16
Thomas Müller [Wed, 3 Feb 2016 12:36:14 +0000 (13:36 +0100)]
Merge pull request #22070 from owncloud/share2_exceptions
Add sharing exceptions to OCP
Thomas Müller [Wed, 3 Feb 2016 12:03:43 +0000 (13:03 +0100)]
Merge pull request #22099 from owncloud/revert-22090-skip-migration-tests-setting
Revert "setting to skip migration tests by default"
Vincent Petry [Wed, 3 Feb 2016 12:00:55 +0000 (13:00 +0100)]
Add file row indicator for unread comments
Morris Jobke [Wed, 3 Feb 2016 11:59:47 +0000 (12:59 +0100)]
Revert "setting to skip migration tests by default"
Joas Schilling [Wed, 3 Feb 2016 11:57:22 +0000 (12:57 +0100)]
Make sure tests don't leave a stray directory behind
Joas Schilling [Wed, 3 Feb 2016 11:57:03 +0000 (12:57 +0100)]
Make sure encryption has a valid licence tag
Joas Schilling [Wed, 3 Feb 2016 11:56:42 +0000 (12:56 +0100)]
Remove deprecated and unused standalone tag
Joas Schilling [Wed, 3 Feb 2016 11:56:17 +0000 (12:56 +0100)]
Remove invalid app user doc links
Robin Appelman [Tue, 2 Feb 2016 13:41:14 +0000 (14:41 +0100)]
split cache->insert from cache->put
Thomas Müller [Wed, 3 Feb 2016 10:36:22 +0000 (11:36 +0100)]
Merge pull request #21997 from owncloud/checksums
Checksums
Thomas Müller [Wed, 3 Feb 2016 10:36:04 +0000 (11:36 +0100)]
Merge pull request #22081 from owncloud/mount-cache-invalid-storage
filter invalid storages from the mount cache early
Thomas Müller [Wed, 3 Feb 2016 10:35:43 +0000 (11:35 +0100)]
Merge pull request #22084 from owncloud/configphp-fixes
small corrections; Web is capitalized, webroot is one lowercase word
Thomas Müller [Wed, 3 Feb 2016 10:35:16 +0000 (11:35 +0100)]
Merge pull request #22090 from owncloud/skip-migration-tests-setting
setting to skip migration tests by default
Roeland Jago Douma [Wed, 3 Feb 2016 10:29:36 +0000 (11:29 +0100)]
Construct valid URL
Roeland Jago Douma [Wed, 3 Feb 2016 10:28:07 +0000 (11:28 +0100)]
host and hostname are different things
host can contain the port (host of http://example.com:1234 is
example.com:1234) while hostname never contains a port. They can however
be similar. If you navigate to http://example.com then both host and
hostname will be example.com.
* Fixed docs
* added getHostName function
Carla Schroder [Tue, 2 Feb 2016 23:30:07 +0000 (15:30 -0800)]
small corrections; Web is capitalized, webroot is one lowercase word
RealRancor [Wed, 3 Feb 2016 07:14:08 +0000 (08:14 +0100)]
Remove files_locking from shipped.json