Commit Graph

198 Commits

Author SHA1 Message Date
Morris Jobke fbedea0807
Add PHPDoc and handle exception in ScanAppData as well
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-19 17:04:16 -05:00
Robin Appelman ce2dba0796
show error when trying to scan non existing path
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-04-19 14:36:38 +02:00
Michael Jobst 81b1dc4930
share api expanded by tags (#26583)
* share api expanded by tags

* Modified files_sharing JS Unit tests

* modified tests. renamed request parameter. refactoring

* Update Share20OCS.php

Added missing function description

* Update Helper.php

Added missing function description

* Update Helper.php

implicit boolean conversion to !empty()

* Update Share20OCSTest.php

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-04-11 11:54:13 -05:00
Joas Schilling e0b040d623
Allow multiple navigation links from info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 21:15:25 +02:00
Joas Schilling 054e161eb5
Manage the right side menu via the navigation manager as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-26 19:40:41 +02:00
Lukas Reschke b70b138bdb
Merge file view JS files
Removes 26 requests on the file list loading

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-24 19:42:22 +01:00
Lukas Reschke f94bc6f8bb Merge pull request #4013 from nextcloud/bundle_vendor_js
Bundle vendor js
2017-03-24 10:49:57 +01:00
Morris Jobke d2654c8aea Merge pull request #3965 from nextcloud/downstream-27343
Providing --path option to transfer-ownership
2017-03-23 15:20:53 -06:00
Roeland Jago Douma 03d688d6ac
Handlebars is already loaded by core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-23 13:40:30 +01:00
Morris Jobke fbf3bfa3ea
improve file transfer code
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 17:40:36 -06:00
Morris Jobke b26c8f8bd3
Use proper name and code style
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 15:59:55 -06:00
Roeland Jago Douma e3f8e416e6
Add files:scanAppData command
Fixes https://github.com/nextcloud/server/issues/3041

Add a dedicated command to scan the special appdata dir

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 21:30:44 +01:00
Roeland Jago Douma 4518a28924 Revert "Bundle vendor js" 2017-03-22 17:01:54 +01:00
Roeland Jago Douma ec3f5aa6e2 Merge pull request #3795 from nextcloud/bundle_vendor_js
Bundle vendor js
2017-03-22 13:34:21 +01:00
Roeland Jago Douma d2a2cef4cc
Handlebars is already loaded by core.js
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-22 09:01:47 +01:00
Lukas Reschke 5c7ad6d3ec
Merge some CSS files using our SCSS compiler
This saves around 4 requests on the average page load.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 16:35:31 +01:00
Sujith H f654f29532
Providing --path option to transfer-ownership
This will help user to selectively move the folders
specified using --path option, instead of moving
entire folder under files directory.

Signed-off-by: Sujith H <sharidasan@owncloud.com>

Update the integration test for transfer-ownership

Update the integration test for transfer-ownership
as the new option --path is introduced in the command.

Signed-off-by: Sujith H <sharidasan@owncloud.com>
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 18:29:21 -06:00
Vincent Petry b8a8f43fce
Log files:scan exception, add InterruptedException
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:24:28 -06:00
Morris Jobke 503a9160ae
Use a proper date format for transfer ownership
* on Windows : is not allowed as filename and doesn't get synced then
* uses 2017-03-02 22-00-00 instead of 2017-03-02T22:00:00+00:00 as format

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-02 22:36:18 -06:00
Morris Jobke b954c2f186
Fix app name of files app
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-14 17:36:23 -06:00
Björn Schießle a88fc0c283 Merge pull request #3181 from nextcloud/fix-favorite-activity-mail
Make sure the file information is available when sending the email
2017-02-10 11:35:45 +01:00
Joas Schilling 54e39d4b93
Fix files sharing legacy as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-08 11:55:50 +01:00
Joas Schilling 881c7275a2
Add tests for getFile()
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:49:32 +01:00
Joas Schilling c031c77e3c
Make sure ownCloud 8.2 activities also can get displayed
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 11:30:23 +01:00
Joas Schilling fef4462904
Make sure the file information is available when sending the email
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-20 12:52:56 +01:00
Joas Schilling 6de0eb0b74
Remove leading slash from sharing activity
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-15 15:53:48 +01:00
Joas Schilling 7c1b288b57
Add some generic tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:41:14 +01:00
Joas Schilling 8baf986d3b
Add an activity when managing favorites
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-04 12:16:49 +01:00
Joas Schilling b2f46bfa04
Adjust all implementations in the server repo
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-01 11:35:23 +01:00
Joas Schilling da9468522b
Add an event merger and use it for the files activities
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 15:36:11 +01:00
Joas Schilling 5ba2b1c193
Working towards groups
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-25 15:19:55 +01:00
Morris Jobke f6e7269628
document new variable
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-22 16:55:28 +01:00
Joas Schilling e1feb72583
Use the display name for files activities again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 16:39:29 +01:00
Morris Jobke a02d0975dd Merge pull request #2154 from nextcloud/comments-activities-update
Move comments activities to the new API
2016-11-22 09:56:22 +01:00
Morris Jobke e8511660f0 Merge pull request #2109 from nextcloud/oc_26533
Transfer ownership only analyze home storage
2016-11-18 15:32:28 +01:00
Joas Schilling a845f7bc01
Fix wrong copyright headers
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 12:20:04 +01:00
Joas Schilling 6b88d56e3a
Update the since version to 11.0.0
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:29:27 +01:00
Joas Schilling 1dc23f2fd6
Remove the old activity extension
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:46 +01:00
Joas Schilling cf8b91be52
Add back the support for the short translations
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling 27c08167df
Don't even try to combine when the subject is different
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling 6ddf43e27a
Provider for the files app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:45 +01:00
Joas Schilling ca2124a2a1
Register the settings of the files app via info.xml
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00
Joas Schilling 0d940e581a
Move the favorites filter to IFilter
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00
Joas Schilling 5d71896c8e
Move files filter to IFilter
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-16 09:25:44 +01:00
Roeland Jago Douma 7e6830729e
Test on storage
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-15 09:53:43 +01:00
Morris Jobke e5b61527da Merge pull request #2125 from nextcloud/downstream-26546
Transfer ownership now returns exit code on error
2016-11-15 00:08:09 +01:00
Roeland Jago Douma 561a4fd989 Merge pull request #2115 from nextcloud/oc_26527
Skip broken shares when transferring ownership (#26527)
2016-11-14 17:07:59 +01:00
Vincent Petry 1355f2039e
Transfer ownership now returns exit code on error (#26546) 2016-11-14 16:57:18 +01:00
Vincent Petry 2b61b89391
Skip broken shares when transferring ownership (#26527) 2016-11-14 15:18:34 +01:00
Vincent Petry 3fe7186e31
First process group shares and then user shares
This prevents a validation failure where the code checks whether a file
is already shared with another user, but the check disables itself when
the owner is the same. Processing the groups first prevents the check
to kick in too early when the group share still has the old owner while
we try transferring the user share.
2016-11-14 14:39:17 +01:00