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

12804 commits

Author SHA1 Message Date
Thomas Müller
bfa404b441 Merge pull request #22217 from owncloud/fix_22215 
Federates shares have to set a file_target
 2016-02-09 09:10:17 +01:00
Jenkins for ownCloud
e749a02e6b [tx-robot] updated from transifex 2016-02-09 01:55:36 -05:00
Arthur Schiwon
cd68500731 throw hooks when accessing a link share 2016-02-09 00:34:10 +01:00
Vincent Petry
ae367c7e97 Fix elementToFile to also return path when defined 
Fixes issue when opening the share dialog for a file inside the favorite
list, and the file is from a subfolder
 2016-02-08 22:33:39 +01:00
Thomas Müller
b77a4b0c6a Merge pull request #22112 from owncloud/dav-filesreport 
Provide REPORT method on files DAV to filter/search files
 2016-02-08 21:41:40 +01:00
Thomas Müller
75bbd4f8b6 Merge pull request #22211 from owncloud/versions-hook-info 
versions provide more information when throwing hooks
 2016-02-08 21:06:03 +01:00
Vincent Petry
2f1a60a64d Add REPORT on files endpoint for filtering 
For now only supports filtering by system tags
 2016-02-08 21:04:53 +01:00
Roeland Jago Douma
7f2cb6ab60 Federates shares have to set a file_target 
The old code path is still used to get the sharing info in the webui.
This requires the file_target to be set. This does not mean anything
for federated shares.

Fixes #22215
 2016-02-08 18:30:51 +01:00
Arthur Schiwon
d2d6644702 use int values and constants instead of strings 2016-02-08 18:16:27 +01:00
Thomas Müller
698a6b07a8 Merge pull request #22206 from owncloud/share2_migration_with_federated 
Update the migration step to include federated shares
 2016-02-08 17:58:26 +01:00
Thomas Müller
703f3551dc Only set the header if the node exists and in case the request is a GET 2016-02-08 17:49:25 +01:00
Lukas Reschke
2cad9d2b8c Serve files with an attachment disposition for new DAV endpoint 
This adds a `Content-Disposition: attachment` header to all files served via the DAV endpoint.
 2016-02-08 17:08:34 +01:00
Arthur Schiwon
b6e03fe261 versions provide more information when throwing hooks 2016-02-08 16:33:49 +01:00
Robin Appelman
87179eaae2 Add tests 2016-02-08 15:53:46 +01:00
Thomas Müller
33eed35ae4 Merge pull request #21817 from owncloud/support-old-carddav-endpoint 
Adding pre oc 9.0 CardDAV endpoint for migration of old clients
 2016-02-08 15:46:38 +01:00
Thomas Müller
acc7d63a69 Merge pull request #22164 from owncloud/files_external-verify 
Add occ command to verify storage configurations
 2016-02-08 15:21:07 +01:00
Roeland Jago Douma
3c4e511792 Update the migration step to include federated shares 
Now federated shares will also be updated to the flat
reshare model.
 2016-02-08 15:11:48 +01:00
Thomas Müller
cf1f92cc12 Merge pull request #22080 from owncloud/fed_share_provider 
implementation of the federated share provider
 2016-02-08 14:12:20 +01:00
Robin Appelman
b95e388526 Add occ command to verify storage configurations 2016-02-08 14:07:58 +01:00
Robin Appelman
678a3abf6d handle no user set for personal global auth 2016-02-08 13:45:52 +01:00
Roeland Jago Douma
5486a2b149 For possible future usage allow multiple checksums 
Instead of returning

<oc:checksum>TYPE:CHECKSUM</oc:checksum>

Return

<oc:checksums>
  <oc:checksum>TYPE:CHECKSUM</oc:checksum>
</oc:checksums>

This will allow us to expand in the future to multiple checksums.
Without doing just string concatenation.

And even for a single checksum it is now correct.
 2016-02-08 11:55:07 +01:00
Lukas Reschke
7199ea2f5e Fix PHPDoc 2016-02-08 11:36:58 +01:00
Thomas Müller
c1ae8b0d81 Adding common name to sharee 2016-02-08 11:36:57 +01:00
Thomas Müller
5b86148d3a Original resources should not be overwritten by shared resources 2016-02-08 11:36:57 +01:00
Roeland Jago Douma
2f6ffdbce5 Added tests for used parts 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
a506f9ca3f Respect not allowing outgoing shares 2016-02-08 11:30:48 +01:00
Roeland Jago Douma
bec1de8a38 Update OCS Share API to use federated share provider 2016-02-08 11:30:48 +01:00
Bjoern Schiessle
9079388e02 implementation of the federated share provider 2016-02-08 11:30:48 +01:00
Thomas Müller
6a550d44e9 Fix path 2016-02-08 10:52:30 +01:00
Thomas Müller
0c9a469f74 Adding pre oc 9.0 CalDAV endpoint for migration of old clients 2016-02-08 10:52:30 +01:00
Thomas Müller
a67f7ad1f3 Remove calendar-proxy support - did this ever work? 2016-02-08 10:52:30 +01:00
Thomas Müller
cca2ade199 Adding pre oc 9.0 CardDAV endpoint for migration of old clients 2016-02-08 10:52:30 +01:00
Thomas Müller
9eef38c593 Merge pull request #22190 from owncloud/fix_22189 
Even single shares are returned as array
 2016-02-08 10:47:55 +01:00
Roeland Jago Douma
ca32778975 Even single shares are returned as array 
When fetching a single share using ../shares/<ID> we should still return
an array of shares.

Fixes #22189
 2016-02-08 10:11:22 +01:00
Vincent Petry
78864dc6fa Collapse long comments 
Very crude a naive implementation that relies on length and number of
newlines. Should be good enough for most cases.

Clicking on such comments will expand them.
 2016-02-08 10:05:03 +01:00
Thomas Müller
83b4e2c8d1 Merge pull request #22160 from owncloud/files_external-create 
Add occ files_external:create command to add new mounts
 2016-02-08 09:58:43 +01:00
Jenkins for ownCloud
4130639a7e [tx-robot] updated from transifex 2016-02-08 01:54:46 -05:00
Jenkins for ownCloud
feb0522cd0 [tx-robot] updated from transifex 2016-02-07 01:55:33 -05:00
Thomas Müller
69a4cd2898 Merge pull request #22102 from owncloud/ldap_2nddispname-master 
[LDAP] add second field for additional/optional display name attribute
 2016-02-06 13:27:01 +01:00
Thomas Müller
5832178f59 Merge pull request #22139 from owncloud/comments-files-cleanup 
cleanup jobs for comments and comment read marks
 2016-02-06 13:26:00 +01:00
Thomas Müller
7297408150 Merge pull request #22163 from owncloud/comments-sizelimit 
Limit comment size to 1000 in UI
 2016-02-06 13:25:38 +01:00
Thomas Müller
7141c70cd0 Merge pull request #20618 from owncloud/action-icon-size 
Fix image sizing for action icons in Edge
 2016-02-06 13:25:10 +01:00
Thomas Müller
079ebe2be6 Merge pull request #22165 from owncloud/comments-markowncommentasread 
Mark own comments as read after posting
 2016-02-06 13:22:20 +01:00
Jenkins for ownCloud
9fa09b67e6 [tx-robot] updated from transifex 2016-02-06 01:55:36 -05:00
Joas Schilling
065141f6f4 Move casting to IExpressionBuilder 2016-02-05 21:26:30 +01:00
Thomas Müller
7568c40275 Merge pull request #22159 from owncloud/fix_21678 
Gracefull handle link shares rename hook
 2016-02-05 16:36:04 +01:00
Vincent Petry
d2a495f190 Mark own comments as read after posting 2016-02-05 16:30:37 +01:00
Robin Appelman
96b592b45b output mount id on create 2016-02-05 15:54:19 +01:00
Robin Appelman
16ad612c83 verify that the auth backend is valid for the storage backend 2016-02-05 15:51:38 +01:00
Robin Appelman
239cdd099a list supported auth backends for storage backends 2016-02-05 15:48:10 +01:00
Vincent Petry
142a2dd2eb Limit comment size to 1000 in UI 
Whenever the limit is almost reached (90% of the length), a tooltip will
appear.

Once the limit is exceeded, the "Post" button will be disabled and the
field will become red.
 2016-02-05 15:45:30 +01:00
Arthur Schiwon
9d2c433b24 fix pgsql 2016-02-05 15:36:21 +01:00
Arthur Schiwon
d537cae063 cleanup jobs for comments and comment read marks 2016-02-05 15:36:21 +01:00
Thomas Müller
0196f0e546 Merge pull request #22157 from owncloud/use-https-instead-of-http 
Use HTTPS instead of HTTP
 2016-02-05 14:31:40 +01:00
Robin Appelman
54d2175bf5 Add occ files_external:create command to add new mounts 2016-02-05 14:20:22 +01:00
Roeland Jago Douma
f4edfb6dfb Gracefull handle link shares rename hook 
Fixes #21678

The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
 2016-02-05 13:57:57 +01:00
Thomas Müller
e15a120f83 Merge pull request #22152 from owncloud/activities-for-comments 
Activities for comments
 2016-02-05 13:50:38 +01:00
Lukas Reschke
35e4acbc1f Use HTTPS instead of HTTP 
This is now supported by github.io
 2016-02-05 13:05:04 +01:00
Joas Schilling
733db5c14a Add a filter for comment activities 2016-02-05 11:30:53 +01:00
Joas Schilling
070ff71a2d Add activities for comments 2016-02-05 11:30:53 +01:00
Thomas Müller
342c2aac98 Merge pull request #20920 from owncloud/issue_20888 
Add dialog to enter credentials on errored mount point
 2016-02-05 10:05:23 +01:00
Thomas Müller
96ccbca2e3 Merge pull request #22135 from owncloud/global-auth-warning 
fix warning caused by global auth
 2016-02-05 10:04:22 +01:00
Jenkins for ownCloud
0ed2108b7f [tx-robot] updated from transifex 2016-02-05 01:56:20 -05:00
Vincent Petry
d4da2f0ac7 Improve credentials dialog usability a bit 
Automatically focus on the first field.
Pressing enter submits the form.
 2016-02-04 17:18:21 +01:00
Robin Appelman
b7d27ab141 fix warning caused by global auth 2016-02-04 16:53:13 +01:00
Robin Appelman
d83b1f3b8b fix error code for unconfigured user provided auth 2016-02-04 16:47:41 +01:00
Robin Appelman
b12d449ec7 set read permissions on failed mount root 2016-02-04 16:41:27 +01:00
Robin Appelman
e420ae068c handle exception in availibilty check 2016-02-04 16:33:08 +01:00
Robin Appelman
53fbaf70c0 fix input type 2016-02-04 16:33:08 +01:00
Robin Appelman
2e3a5ccaaa show failed external storages properly 2016-02-04 16:33:08 +01:00
Robin Appelman
4b4bf87f95 Use handlebars template 2016-02-04 16:33:08 +01:00
Jesús Macias
7162d66373 Fix PR from comments 2016-02-04 16:33:08 +01:00
Jesús Macias
8fa96435b0 Add credentials dialog for user provided auth 2016-02-04 16:33:08 +01:00
Thomas Müller
089b60cd25 Merge pull request #22107 from owncloud/external-auth-global 
Add global auth backend for files external
 2016-02-04 16:18:23 +01:00
Robin Appelman
76d9586339 add tests 2016-02-04 16:14:17 +01:00
Robin Appelman
71992f9d29 update import logic for the new export logic 2016-02-04 15:31:05 +01:00
Robin Appelman
e3eda917ef Show the proper auth identifier when listing mounts as json 2016-02-04 15:31:05 +01:00
Thomas Müller
52ce83993d Merge pull request #22124 from owncloud/comments-author-check 
Check for authorship on edit attempt
 2016-02-04 15:16:33 +01:00
Robin Appelman
9dfe9f77f2 Add global auth backend for files external 2016-02-04 14:57:17 +01:00
Thomas Müller
899444103a Merge pull request #22121 from owncloud/comments-deleteduser 
Special label for deleted users in comments list
 2016-02-04 13:03:18 +01:00
Arthur Schiwon
a480b2261b Check for authorship on edit and delete attempts 2016-02-04 12:57:48 +01:00
Thomas Müller
cd16ba5cb3 Merge pull request #22025 from owncloud/21838-jenkins 
[jenkins] + rebased, of #21838
 2016-02-04 11:58:45 +01:00
Vincent Petry
2e46576e83 Special label for deleted users in comments list 2016-02-04 11:26:11 +01:00
Thomas Müller
e64044d43e Merge pull request #21964 from owncloud/calendar-sharing-3 
Add calendar sharing
 2016-02-04 10:48:36 +01:00
Thomas Müller
6a5b0eafa5 Merge pull request #22108 from owncloud/comments-edit 
Comment owner can now edit or delete
 2016-02-04 10:47:49 +01:00
Jenkins for ownCloud
a022584e4a [tx-robot] updated from transifex 2016-02-04 01:55:08 -05:00
Arthur Schiwon
e370b601db fix unit tests 2016-02-03 22:45:33 +01:00
alexweirig
cd19b648c6 change error logging 
replaced variable with print_r call
 2016-02-03 21:50:27 +01:00
alexweirig
f4d4bed10b 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.
 2016-02-03 21:50:27 +01:00
alexweirig
39aac2c66b 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
 2016-02-03 21:50:27 +01:00
Alex Weirig
0d797637f3 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.
 2016-02-03 21:50:27 +01:00
Vincent Petry
805ba20bae Added unit tests for edit/delete comments 2016-02-03 21:06:55 +01:00
Vincent Petry
1caee3ac2e Move comment delete action into edit mode 2016-02-03 21:06:55 +01:00
Vincent Petry
bbefe1ed64 Comment owner can now edit or delete 2016-02-03 21:06:55 +01:00
Thomas Müller
da04620155 Merge pull request #22101 from owncloud/comments-filerow 
Add file row indicator for unread comments
 2016-02-03 20:53:40 +01:00
Thomas Müller
81b9721700 Remove entries in dav_shares on deletion of a calendar 2016-02-03 20:18:56 +01:00
Roeland Jago Douma
453ea6698d [Share 2.0] Fix public link sharing 2016-02-03 19:25:29 +01:00
Roeland Jago Douma
c1841892d0 [Share 2.0] Fix OCS endpoint 2016-02-03 19:25:29 +01:00
Thomas Müller
a3cc448c9d Adding propfind property to retrieve sharee information from a dav resource 2016-02-03 17:18:23 +01:00
Thomas Müller
8c14ce01ba Deleting a shared address book results in unshare 2016-02-03 17:18:22 +01:00
Thomas Müller
ef06d6bdaa Deleting a shared calendar results in unshare 2016-02-03 17:18:22 +01:00
Thomas Müller
6f933fde60 Disallow to share with the owner of the resource 2016-02-03 17:18:22 +01:00
Thomas Müller
4b14ca672f Fix ACLs on shared calendars 2016-02-03 17:18:22 +01:00
Thomas Müller
0753067bcd No duplicate address book if shared with user and group and the user is part of the group 2016-02-03 17:18:22 +01:00
Thomas Müller
18c35bf812 No duplicate calendars if shared with user and group and the user is part of the group 2016-02-03 17:18:22 +01:00
Thomas Müller
9106595608 Add calendar sharing 2016-02-03 17:18:22 +01:00
Vincent Petry
85bec3ffcb Reset comments read marker after loading comments 2016-02-03 16:18:14 +01:00
Thomas Müller
e34ec0a138 Merge pull request #22095 from owncloud/public_link_with_port 
Public link downloads should work on instance on non default port
 2016-02-03 16:06:54 +01:00
Thomas Müller
74abbbc0d6 Merge pull request #22098 from owncloud/cleanup-core-apps 
Cleanup core apps
 2016-02-03 14:17:10 +01:00
Arthur Schiwon
c1871f5787 Port of test_ldap_2nddispname to master 2016-02-03 13:55:39 +01:00
Thomas Müller
aaf7299d28 Merge pull request #22070 from owncloud/share2_exceptions 
Add sharing exceptions to OCP
 2016-02-03 13:36:14 +01:00
Vincent Petry
8bb1437e24 Add file row indicator for unread comments 2016-02-03 13:00:55 +01:00
Joas Schilling
78d5c89e86 Make sure encryption has a valid licence tag 2016-02-03 12:57:03 +01:00
Joas Schilling
d79b0886d0 Remove deprecated and unused standalone tag 2016-02-03 12:56:42 +01:00
Joas Schilling
13c8fd4558 Remove invalid app user doc links 2016-02-03 12:56:17 +01:00
Thomas Müller
621f54da51 Merge pull request #21997 from owncloud/checksums 
Checksums
 2016-02-03 11:36:22 +01:00
Roeland Jago Douma
4bb96a5553 Construct valid URL 2016-02-03 11:29:36 +01:00
Thomas Müller
d66a836251 Merge pull request #21772 from owncloud/occ-external-applicable 
Add occ command to manage applicables
 2016-02-03 09:03:59 +01:00
Roeland Jago Douma
2035a179bc Add store/retrieve checksums 
* Add extra db column to filecache
* Bump version
* Update filecache code to actually handle checksum
* Webdav code to store/retrieve checksums
 2016-02-03 09:03:51 +01:00
Thomas Müller
d4b356e0e9 Merge pull request #21961 from owncloud/comments-gui 
Comments GUI in files sidebar
 2016-02-03 09:03:43 +01:00
Thomas Müller
77942ad38a Merge pull request #22059 from owncloud/comments-readmark-dav 
Comments DAV methods for read mark manipulation (mark comments of a file as read) + return isUnread status
 2016-02-03 09:00:32 +01:00
Thomas Müller
1531e7f440 Merge pull request #22053 from owncloud/files_external-params-flags 
Remove magic flags from files_external backend params
 2016-02-03 09:00:17 +01:00
Jenkins for ownCloud
92a1d1c0e3 [tx-robot] updated from transifex 2016-02-03 01:55:26 -05:00
Vincent Petry
8b98cf5a5b Fixed report name 2016-02-02 18:06:16 +01:00
Vincent Petry
03f4b49ecc Added JS unit tests for comments 2016-02-02 18:01:15 +01:00
Vincent Petry
9028457ea2 Add spinner when submitting comments 2016-02-02 18:01:15 +01:00
Vincent Petry
3a6d065e50 Fix formatting messages with newlines 2016-02-02 18:01:15 +01:00
Vincent Petry
64ad99db70 Better comments pagination logic 2016-02-02 18:01:15 +01:00
Vincent Petry
fdf555e814 Improve comments style, add avatars 2016-02-02 18:01:15 +01:00
Vincent Petry
67a36a2cca Use last comment's time for pagination 2016-02-02 18:01:15 +01:00
Vincent Petry
29386eccf9 Add pagination support for comments GUI 2016-02-02 18:01:15 +01:00
Vincent Petry
d1518045ec Improve comment date format 2016-02-02 18:01:15 +01:00
Vincent Petry
cca33942aa Comments GUI 2016-02-02 18:01:15 +01:00
Joas Schilling
5a3d2ef2a1 Don't enable tag activities by default 2016-02-02 16:29:49 +01:00
Robin Appelman
f4e1a1677b Remove magic flags from files_external backend params 2016-02-02 15:10:59 +01:00
Roeland Jago Douma
dc32f49c6e [Share 2.0] Use GenericShareException 2016-02-02 14:23:45 +01:00
Roeland Jago Douma
4d7130ad31 [Share 2.0] Add exceptions to OCP 2016-02-02 14:07:11 +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
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
Robin Appelman
51b5179839 Add occ command to manage applicables 2016-02-02 12:45:10 +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
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
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
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
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
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
Arthur Schiwon
29f57eb85c set read marker via proppatch against entity 2016-02-01 17:43:13 +01:00
Arthur Schiwon
b1c8b077b0 Return isUnread property per comment 2016-02-01 16:55:24 +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
1232943aaa Merge pull request #22046 from owncloud/improved_error_handling 
Improved error handling
 2016-02-01 14:10:24 +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
0202acb926 Move signal handling to the base class to allow other commands to reuse this feature 2016-02-01 09:47:13 +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
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
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
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
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
Robin Appelman
03c79ac24f remove custom controler for user provided password auth 2016-01-29 14:51:30 +01:00
Robin Appelman
5bdcd534b1 dont show user provided auth as option for personal mounts 2016-01-29 14:51:30 +01:00
Robin Appelman
860d51487b Allow setting user provided credentials from the personal settings page 2016-01-29 14:51:30 +01:00
Robin Appelman
f3e9729a5f expose user provided credentials for admin mounts 2016-01-29 14:50:52 +01:00
Robin Appelman
419507c118 Add user provided credentials mechanism 2016-01-29 14:50:52 +01:00
Robin Appelman
adbc5a0b41 Fix invalid storages not showing in directory listing 2016-01-29 14:50:52 +01:00
Thomas Müller
8ad45dad38 Merge pull request #21660 from owncloud/sharing2_update_reshares 
upgrade to sharing 2.0, remove hierarchical re-shares
 2016-01-29 14:43:16 +01:00
Thomas Müller
e78be6f21e Merge pull request #21928 from owncloud/files-external-js-checkbox-fix 
Fix validation of inputs that aren't text
 2016-01-29 14:18:13 +01:00
Thomas Müller
e8c449612d Merge pull request #21990 from owncloud/systemtags-cleanup-orphans 
Background cleanup job for system and user tag orphaned when file was deleted
 2016-01-29 14:16:50 +01:00
Robin Appelman
b9b74d935f Add delete command for external storages 2016-01-29 14:10:43 +01:00
Arthur Schiwon
6dc793338a url encode id 2016-01-29 13:28:17 +01:00
Robin Appelman
279a54bc87 adjust js unit test 2016-01-29 13:14:26 +01:00
Robin Appelman
3c8aac3867 Add mount option to disable sharing 2016-01-29 13:14:26 +01:00
Arthur Schiwon
24025f32f4 standardize datetime output 2016-01-29 13:08:02 +01:00
Arthur Schiwon
d2882b9021 Comments WebDAV adjustements 2016-01-29 13:08:02 +01:00
Robin Appelman
e3b5639fc1 Block shares that dont have the correct source permissions 2016-01-29 13:05:53 +01:00
Robin McCorkell
241ed17dc0 Add storage validation JS unit tests 2016-01-29 11:47:23 +00:00
Vincent Petry
f0caf41232 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.
 2016-01-29 11:51:47 +01:00
Thomas Müller
b65a23ca4b Merge pull request #21701 from owncloud/scan_files_more_details_II 
occ scan:files Adding more details in the base print out (II)
 2016-01-29 11:41:36 +01:00
Pookay
9bfc31e666 Fix the result at the bottom on IE 
view issue #21898
 2016-01-29 10:07:15 +01:00
Thomas Müller
ede1cbf612 Merge pull request #21932 from owncloud/comments-dav-refinements 
provide info about plugin, and do not run commit ourselves on proppatch
 2016-01-29 10:03:20 +01:00
martin.mattel@diemattels.at
e05592d797 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
 2016-01-29 08:42:03 +01:00
Jenkins for ownCloud
1765e11f75 [tx-robot] updated from transifex 2016-01-29 01:55:53 -05:00
Morris Jobke
e4ad4c7e98 [user_ldap] properly decode cached objects 
* fixes #21896
 2016-01-29 07:51:16 +01:00
Thomas Müller
6fc3269670 Merge pull request #21333 from owncloud/migrate-contacts 
Migrate contacts
 2016-01-28 19:47:48 +01:00
Lukas Reschke
128d9d7aa6 Add copyright header 2016-01-28 19:27:04 +01:00
Roeland Jago Douma
6151a0540b Update the initiator of the share as well in migration 2016-01-28 19:24:23 +01:00
Roeland Jago Douma
b85770d636 Update reshares in batches as not to run out of memory 2016-01-28 19:24:23 +01:00
Björn Schießle
dc8d43575f upgrade to sharing 2.0, remove hierarchical re-shares 2016-01-28 19:24:23 +01:00
Roeland Jago Douma
2831884e74 Fix OCS unit tests after two share merges 
* Use getNode
* Return IShare object so typechecking is happy
 2016-01-28 13:17:16 +01:00
Thomas Müller
295de6aad7 Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings 
Share2 ocs fix passing empty strings
 2016-01-28 11:58:35 +01:00
Robin Appelman
1369f2c684 cleanup shared cache 2016-01-28 11:46:43 +01:00
Roeland Jago Douma
34e912ab6b [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
 2016-01-28 07:54:09 +01:00
Roeland Jago Douma
185b9c6edd [Share 2.0] Move IShare to OCP 2016-01-27 22:04:37 +01:00
Roeland Jago Douma
6957917b20 [Share 2.0] Allow using permissions to update link share 2016-01-27 20:36:36 +01:00
Roeland Jago Douma
f5c45dfe7b [Share 2.0] Still allow isolated updates 
Still allow isolated updates of parameters
 2016-01-27 20:36:31 +01:00
Roeland Jago Douma
b321ceef60 [Share 2.0] Also handle empty parameter in updateShare 
* More sanity checks
* More unit tests
 2016-01-27 20:34:06 +01:00
Roeland Jago Douma
35a3432793 [Share 2.0] When passing empty strings don't fail 
The password and expiration date can be set to empty strings when
created. This is now handled gracefully.
 2016-01-27 20:34:06 +01:00
Thomas Müller
0f51851d7d Merge pull request #21895 from owncloud/calendar-sharing 
Migrate from CardDAV sharing to more general DAV sharing
 2016-01-27 19:32:05 +01:00
Thomas Müller
6973718fb8 Merge pull request #21940 from owncloud/share2_do_not_returned_removed_group_shares 
[Share 2.0] Properly handle user deleted group shares
 2016-01-27 16:16:06 +01:00
Thomas Müller
c7abad65ea Fix sql to get shared addressbooks including unit tests 2016-01-27 12:10:06 +01:00
Thomas Müller
8f4ab55b4b Unit testing database access to old contacts tables 2016-01-27 12:10:06 +01:00
Thomas Müller
b2976eb72c Unit testing migration logic 2016-01-27 12:10:06 +01:00
Thomas Müller
07a5c26583 Add app to migrate contacts and calendars 
Add group sharing migration

Migrate all users
 2016-01-27 12:10:06 +01:00
Thomas Müller
ea93310623 Merge pull request #21947 from owncloud/oc-backbone-webdav-put-bool-tojson 
Fix system tags proppatch with booleans
 2016-01-27 11:43:57 +01:00
Vincent Petry
cfba90a78d Fix system tags proppatch with booleans 
Backbone webdav adapter now converts booleans and ints to strings.

Fixed system tags to use "true" / "false" strings for booleans instead
of 1 / 0.
 2016-01-27 11:09:43 +01:00
Thomas Müller
c264f9362d Merge pull request #21856 from owncloud/sync-federated-cloud-users-in-cron 
Sync federated clouds using a cron job
 2016-01-27 10:11:01 +01:00
Thomas Müller
ba565edc1e Extract sharing functionality into own backend class for reusability 2016-01-27 09:45:32 +01:00
Thomas Müller
92c7d15739 Fix server ctor including unit test - this shall never happen again 2016-01-27 09:43:44 +01:00
Thomas Müller
d1104954aa Migrate from CardDAV sharing to more generalk DAV sharing 2016-01-27 09:43:44 +01:00
Thomas Müller
1594371c8c Merge pull request #21741 from owncloud/l10n-improvements 
Move methods to the factory that are not related to translating, but to guessing/finding the language
 2016-01-27 09:37:00 +01:00
Thomas Müller
5b7a1b13f3 Merge pull request #21887 from owncloud/share2_updateShare 
[Sharing 2.0] update share
 2016-01-27 09:36:41 +01:00
Roeland Jago Douma
a4900d721f [Share 2.0] Properly handle user deleted group shares 
If a user deletes a group share we create a special share entry. To the
API this is just a normal group share for that user with permissions 0.
But we should not return this.
 2016-01-27 09:02:12 +01:00
Arthur Schiwon
a5c528ff7e provide info about plugin, and do not run commit ourselves on proppatch 2016-01-26 21:35:12 +01:00
Robin McCorkell
405e2d9b50 Fix validation of inputs that aren't text 2016-01-26 17:42:35 +00:00
Lukas Reschke
b6ca05f9a0 Add fake locking support for OneNote 2013 
Fixes https://github.com/owncloud/core/issues/21925
 2016-01-26 17:32:52 +01:00
Lukas Reschke
a0cb52c90e Fix PHPDoc and signature 2016-01-26 17:27:58 +01:00
Thomas Müller
aa598fc701 Merge pull request #21664 from owncloud/comments-dav 
Comments DAV implementation
 2016-01-26 17:20:32 +01:00
Lukas Reschke
8bdf2f5c25 Do not use duplicated tag 
Fixes "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.", the tag can only be there once. Also set to 9.0 as this will be the next major release.
 2016-01-26 16:42:31 +01:00
Thomas Müller
6deb553dc2 Merge pull request #21833 from owncloud/use-proper-shared-uri-for-contacts 
Reassemble behavior on shared address books with respect to uri and d…
 2016-01-26 16:13:32 +01:00
Thomas Müller
22010517f5 Merge pull request #21752 from owncloud/files-delete-fix 
Only check selection for delete permissions, not parent folder
 2016-01-26 16:13:10 +01:00
Thomas Müller
022ac12ab4 Merge pull request #21916 from owncloud/sftp-handle-no-user 
Handle no user set in sftp constructor
 2016-01-26 16:12:38 +01:00
Arthur Schiwon
3b7ded863b files_sharing requires int as file id 2016-01-26 15:45:37 +01:00
Thomas Müller
7b678a8c17 Reassemble behavior on shared address books with respect to uri and displayname 2016-01-26 15:07:50 +01:00
Robin Appelman
54e58b520c Handle no user set in sftp constructor 2016-01-26 14:48:45 +01:00
Joas Schilling
d46cd6a245 Fix tests 2016-01-26 14:02:32 +01:00
Roeland Jago Douma
46045ecc52 [Share 2.0] Add update share 2016-01-26 13:59:58 +01:00
Arthur Schiwon
e5ba28f934 adjust unit tests 2016-01-26 13:16:14 +01:00
Arthur Schiwon
8afa39682c Revert "utilize elementMap for parsing DateTime string input argument for REPORT method" 
This reverts commit 2027bf2686.
 2016-01-26 13:04:41 +01:00
Arthur Schiwon
49c8f3d6e4 return 404 instead of 403 when attempting to create a comment on an not existing or unavailable file 2016-01-26 12:47:33 +01:00
Arthur Schiwon
2027bf2686 utilize elementMap for parsing DateTime string input argument for REPORT method 2016-01-26 12:40:05 +01:00
Arthur Schiwon
11ae468c89 smaller changes related to reviews 2016-01-26 12:10:56 +01:00
Arthur Schiwon
ed546bd2a5 Comments DAV implementation 2016-01-26 12:10:14 +01:00
Robin McCorkell
30509a479f Prevent invalid storages being displayed in the storages view 2016-01-26 10:41:59 +00:00
Thomas Müller
6cb95f4e42 Merge pull request #21853 from owncloud/tags-fixpropertyma 
Fix oc:tags tag list serializer
 2016-01-26 11:37:37 +01:00
Jenkins for ownCloud
ecf2d178b1 [tx-robot] updated from transifex 2016-01-26 01:56:06 -05:00
Thomas Müller
4c9e328211 Merge pull request #21892 from owncloud/issue-21890-parameters 
Add parameters types to IQueryBuilder
 2016-01-25 21:13:41 +01:00
Joas Schilling
09ae160463 Replace other usages 2016-01-25 17:17:36 +01:00
Thomas Müller
2d7528bc64 Adding unit tests 2016-01-25 11:39:57 +01:00
Vincent Petry
0a1350d5ac System tags sidebar selector now respects permissions 
For admins: display the namespace behind the tag name.
For users: no namespace, don't display non-assignable tags in the
dropdown, display already assigned non-assignable tags with a different
style
 2016-01-25 10:45:02 +01:00
Thomas Müller
9d36972e0f Merge pull request #21401 from owncloud/dav-cache-getchildren 
Put nodes from Directory->getChildren in the ObjectTree cache
 2016-01-25 10:02:32 +01:00
Thomas Müller
ef4fca22d1 Merge pull request #21844 from owncloud/drop-image-path 
Remove OC_Helper::imagePath and use the proper public interface
 2016-01-25 10:00:21 +01:00
Roeland Jago Douma
d0799af484 Add missing use statements for IGroupManager and IUserSession 2016-01-25 08:05:53 +01:00
Jenkins for ownCloud
a331979a67 [tx-robot] updated from transifex 2016-01-25 01:54:39 -05:00
Morris Jobke
75e6734ef4 Remove OC_Helper::imagePath and use the proper public interface 2016-01-24 18:04:20 +01:00
Jenkins for ownCloud
82d3852815 [tx-robot] updated from transifex 2016-01-24 01:54:40 -05:00
Jenkins for ownCloud
f92119e02f [tx-robot] updated from transifex 2016-01-23 01:55:35 -05:00
Thomas Müller
0a4142d5df Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-download 
Streaming download from Swift in files_external
 2016-01-22 17:27:41 +01:00
Thomas Müller
7731b29136 Merge pull request #21719 from owncloud/move-notification-api-to-ocp 
Move the notification API to public namespace
 2016-01-22 16:20:26 +01:00
Thomas Müller
21131d133a Merge pull request #21814 from owncloud/systemtags-backend-permissions 
Fix DAV backend to respect system tags permissions
 2016-01-22 16:08:22 +01:00
Vincent Petry
2ef62b0115 Fix TagList serializer 2016-01-22 15:55:54 +01:00
Thomas Müller
7909c47b7c Sync federated clouds using a cron job 2016-01-22 14:58:49 +01:00
Vincent Petry
2f3e62a27f Fix oc:tags tag list serializer 
Fixes propfind/proppatch of oc:tags
 2016-01-22 14:07:26 +01:00
Thomas Müller
9b4c9a0357 Merge pull request #18531 from owncloud/ext-user-credentials 
External storage 'Login credentials' auth mechanism
 2016-01-22 13:14:14 +01:00
Thomas Müller
57b17cdd98 Merge pull request #21826 from owncloud/dav-fix-user-deletion 
No card ID when deleting is acceptable
 2016-01-22 11:16:30 +01:00
Thomas Müller
1410120758 Merge pull request #20768 from owncloud/mount-cache 
cache mountpoints in the db
 2016-01-22 11:01:54 +01:00
Joas Schilling
ee02165005 Move the notification API to public namespace 2016-01-22 10:32:42 +01:00
Thomas Müller
766ba1cd5f Merge pull request #21532 from owncloud/share2.0_getShares 
[Share 2.0] get shares
 2016-01-22 07:58:36 +01:00
Thomas Müller
ad39ca72d5 Merge pull request #21829 from owncloud/remove-duplicated-value 
remove duplicated array value
 2016-01-21 16:27:03 +01:00
Roeland Jago Douma
3a582e88e5 Comments from Vincent 2016-01-21 16:06:12 +01:00
Roeland Jago Douma
0a9cd91e1d [Share 2.0] Add subfiles=x 2016-01-21 15:56:44 +01:00
Roeland Jago Douma
3666c34a19 [Sharing 2.0] Start with getShares 2016-01-21 15:56:44 +01:00
Thomas Müller
e2f231d051 Merge pull request #21761 from owncloud/share2_link 
Share2 link
 2016-01-21 15:43:08 +01:00
Thomas Müller
5a4edeea70 Merge pull request #21808 from owncloud/testing-app-details 
Testing app details
 2016-01-21 14:29:11 +01:00
Vincent Petry
94a763a084 Inject user session to check for admin in system tags DAV handlers 2016-01-21 14:22:46 +01:00
Vincent Petry
5639e41cb0 Fix DAV to respect system tags permissions 
When queried as regular user, visible tags are not displayed in result
sets and queries for existence will return false.

Non-assignable or non-visible tags cannot be
renamed/assigned/unassigned.

User is not allowed to change tag permissions, only to change the name
if the tag is also assignable.
 2016-01-21 14:09:27 +01:00
blizzz
7e853e2c69 remove duplicated array value 2016-01-21 13:59:36 +01:00
Thomas Müller
2540ac431c Merge pull request #21778 from owncloud/share-calendars 
More tests for CalDAV
 2016-01-21 12:31:26 +01:00
Joas Schilling
df27a939ce No card ID when deleting is acceptable 2016-01-21 12:19:28 +01:00
Jan-Christoph Borchardt
e6246bea73 testing app: fix app name capitalization 2016-01-21 12:12:43 +01:00
Jan-Christoph Borchardt
8bf7b8f538 testing app: add max version 2016-01-21 12:12:43 +01:00
Jan-Christoph Borchardt
89397d5949 testing app: add logo 2016-01-21 12:12:43 +01:00
Thomas Müller
ec8022d241 Merge pull request #20847 from owncloud/systemtags-ui 
System tags sidebar section
 2016-01-21 12:12:40 +01:00
Jenkins for ownCloud
50b303f3ad [tx-robot] updated from transifex 2016-01-21 01:55:20 -05:00
Roeland Jago Douma
18421e7e68 Directly get from the server container 
* Updated unit tests
 2016-01-20 21:12:26 +01:00
Roeland Jago Douma
67f5216160 Do not use deprected activities API 2016-01-20 21:12:26 +01:00
Roeland Jago Douma
9467859e42 Get correct path for activity downloads 2016-01-20 21:12:26 +01:00
Roeland Jago Douma
894a88ca51 [Share 2.0] Make public link work without view 2016-01-20 21:12:26 +01:00
Roeland Jago Douma
8734ebe505 [Share 2.0] Make link share download use share manager 2016-01-20 21:12:26 +01:00
Roeland Jago Douma
717697313b [Share 2.0] Move tests over the sharemanager 
Nice side effect... pure unit tests!
 2016-01-20 21:12:26 +01:00
Roeland Jago Douma
0ebc92c44a [Share 2.0] Move showing link share to sharing 2.0 2016-01-20 21:12:26 +01:00