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

29930 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
d8114d6ce6 Add intergration test 2016-01-29 15:36:37 +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
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
45609d95d4 Merge pull request #21992 from owncloud/share-dialog-error-handling 
Properly forward error messages in share dialog
 2016-01-29 14:42:57 +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
62b9e81919 Merge pull request #21995 from owncloud/share2_delete_user_defined_group_shares 
[Share 2.0] When deleting a group share delete children
 2016-01-29 11:34:38 +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
Thomas Müller
24908a439a Merge pull request #21987 from owncloud/issue-21980-too-many-job-send-mysql-away 
Do not create a loop that generates thousands of jobs
 2016-01-29 10:02:52 +01:00
Thomas Müller
4070657875 Merge pull request #21981 from owncloud/systemtags-trim-name 
Trim tag names to avoid problems
 2016-01-29 10:02:23 +01:00
Thomas Müller
2b185b73e2 Merge pull request #21993 from owncloud/updater-htacces 
Do not rewrite requests to updater
 2016-01-29 10:02:04 +01:00
Joas Schilling
c83b3d6a26 Remove other broken usages in deprecated methods 2016-01-29 08:50:29 +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
Joas Schilling
c925bfdcd6 Trim tag names to avoid problems 2016-01-28 20:41:47 +01:00
Roeland Jago Douma
1ff4ec1cd3 [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.
 2016-01-28 20:35:46 +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
Victor Dubiniuk
4ced903427 Do not rewrite updater requests 2016-01-28 20:04:56 +03:00
Vincent Petry
df3f6fee10 Properly forward error messages in share dialog 2016-01-28 17:18:33 +01:00
Vincent Petry
8b3d7d09d5 Merge pull request #21860 from owncloud/sharedialog-ocs-adapter 
Share dialog use OCS API
 2016-01-28 16:56:29 +01:00
Joas Schilling
ef73aedd7e Deprecate the method and warn against using it 2016-01-28 15:40:23 +01:00
Joas Schilling
5238fc3f54 Do not create a loop that generates thousands of jobs 2016-01-28 15:40:23 +01:00
Vincent Petry
7e1de0e3c2 Fix share default expiration date calculation 
Now using UTC dates with moment js to accurately add the number of days
 2016-01-28 15:25:34 +01:00
Vincent Petry
b063ddb05b Share dialog use OCS API 2016-01-28 15:25:34 +01:00
Thomas Müller
476720ada9 Merge pull request #21975 from owncloud/fix_ocs_unit_tests 
Fix OCS unit tests after two share merges
 2016-01-28 15:09:31 +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
de8852a760 Merge pull request #21958 from owncloud/systemtags-style 
Use boxes for system tags, shorten permission text
 2016-01-28 12:54:52 +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
Thomas Müller
d425b4ffc2 Merge pull request #21952 from owncloud/systemtags-fix-conflicts 
Fix system tags conflict situations
 2016-01-28 11:57:37 +01:00
Thomas Müller
c11337eb22 Merge pull request #21851 from owncloud/shared-unreadable 
Base shared cache on CacheJail
 2016-01-28 11:57:18 +01:00
Robin Appelman
d7a777af3a fix cachejail->update 2016-01-28 11:46:44 +01:00
Robin Appelman
1369f2c684 cleanup shared cache 2016-01-28 11:46:43 +01:00
Vincent Petry
1473e156f4 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.
 2016-01-28 11:24:13 +01:00
Thomas Müller
b7710ab6d7 Merge pull request #21858 from owncloud/getMountsForFileId 
add IUserMountCache->getMountsForFileId
 2016-01-28 11:20:42 +01:00
Thomas Müller
dda9f31455 Merge pull request #21970 from zander/mentionbot 
Stop spamming me.
 2016-01-28 11:20:25 +01:00
Thomas Müller
928a1e1d40 Merge pull request #21971 from owncloud/notify-me 
Notify me on activity and notifications for sure
 2016-01-28 11:19:25 +01:00
Joas Schilling
d9365f1051 More more more, kidding, just to be sure 2016-01-28 11:15:18 +01:00
Morris Jobke
0e95aeab75 Merge pull request #21957 from owncloud/share2_to_ocp 
[Share 2.0] Move interfaces to OCP
 2016-01-28 10:41:39 +01:00
Tom
27e1cf8770 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.
 2016-01-28 09:26:21 +00:00
Roeland Jago Douma
8d44e537ac [Share 2.0] Remove setId and setProviderId from the interface 
Those should only ever be set by the providers
 2016-01-28 07:54:16 +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
f2e70441e4 [Share 2.0] Add getShareManager to OCP\IServerContainer 2016-01-27 22:04:37 +01:00
Roeland Jago Douma
357b271cb4 [Share 2.0] Create IManger interface for share manager 2016-01-27 22:04:37 +01:00