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

12358 commits

Author SHA1 Message Date
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 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
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
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