Commit Graph

15660 Commits

Author SHA1 Message Date
Bjoern Schiessle aa26a3ae74
use right format for avatars
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
Bjoern Schiessle e637113452
don't add empty values to the vcard
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
Bjoern Schiessle 4531b4a81d
only execute code if exception was thrown by the corresponding controller
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:44 +01:00
Bjoern Schiessle faf836b0c0
fix the way we create a new vcard to avoid to have multiple UIDs
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-03-24 11:06:41 +01:00
Roeland Jago Douma 48158c8bec
Combine additional files_sharing scripts
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-24 10:58:11 +01:00
Joas Schilling 35d3a082f2 Merge pull request #4010 from nextcloud/fac-58-mimetype-on-creating-directories
Fix workflow engine mimetype detection when creating a directory
2017-03-24 10:55:10 +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
Nextcloud bot e18d928d9b
[tx-robot] updated from transifex 2017-03-24 01:08:00 +00:00
Morris Jobke 49d0507f5d Merge pull request #3879 from nextcloud/downstream-26915
Added integration tests for sharees using v2.php
2017-03-23 16:12:24 -06:00
Morris Jobke 71c80433c2 Merge pull request #4007 from nextcloud/backport-27155
Change showTemporary notifications for closable ones
2017-03-23 15:56:18 -06:00
Morris Jobke a5a29ee27a Merge pull request #3953 from nextcloud/downstream-27027
Ignore NoUserException for shares from ghosts
2017-03-23 15:26:43 -06: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 6e6cbae37c Merge pull request #3998 from nextcloud/backport-27032
Use the expected method depending on the target being a file or folder
2017-03-23 21:59:39 +01:00
noveens 40228c0c2b
added quit option in commentstabview.js
added quit option in notif in app.js

added quit option in notif in file-upload.js

added quit option in notif in fileinfomodel.js

added quit option in notif in filelist.js

added quit option in notif in filelist.js

added quit option in notif in tagsplugin.js

added quit option in notif in statusmanager.js

added quit option in notif in external.js

added quit option in notif in versionstabview.js

added quit option in notif in notification.js

changes according to the latest review.

timeout removed since there is a button to close it

translation capability added

typo fixed

test files updated

small errors fixed

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:12:29 -06:00
Morris Jobke 869ba16273
do not remove the method and only keep the tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 13:10:43 -06:00
Lukas Reschke 9039b71a23 Merge pull request #4000 from nextcloud/backport-27216
allow configuring authType for DAV backend
2017-03-23 19:28:49 +01:00
Joas Schilling 3c1e7e5ada
Make deleting a group compatible with ocs v2
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 19:24:02 +01:00
Robin Appelman a12ec5ec77
set cache to failedcache when shared storage init fails
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-23 15:01:23 +01: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
Joas Schilling 394a61f1e6
Fix workflow engine mimetype detection when creating a directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-23 12:45:36 +01:00
Lukas Reschke f38d36a161 Merge pull request #3995 from nextcloud/files_scan_appdata
Add files:scanAppData command
2017-03-23 12:28:55 +01:00
Lukas Reschke 1f210bf273 Merge pull request #3948 from nextcloud/downstream-27271
Tooltip in trashbin with previous location
2017-03-23 11:57:34 +01:00
Lukas Reschke 1a80960a27 Merge pull request #3989 from nextcloud/files-external-save-button
replace autosave with a save button for external storage configuration
2017-03-23 11:55:36 +01:00
Morris Jobke 9e2588f2cb Merge pull request #3999 from nextcloud/backport-27262
Updated UI messages relating to the encryption functionality
2017-03-23 00:25:59 -06:00
Vincent Petry 89c42a76c3
Remove SharedCache::getNumericStorageId to let CacheWrapper do it
The CacheWrapper will properly forward the call to the wrapped cache.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-23 00:02:48 -06:00
Nextcloud bot 39ac804899
[tx-robot] updated from transifex 2017-03-23 01:07:52 +00:00
Jörn Friedrich Dreyer 9eca1da1dd
allow configuring authType for DAV backend
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:13:42 -06:00
Matthew Setter d7c9e2b841
Updated UI messages relating to the encryption functionality
The reason for updating these messages, is that grammatically they're
not quite correct. They showed a combination of:

- Related phrases, which could be either separated or joined better
- Related sentences, but which should be expressed as separate ones

They were also missing full-stops to end the them.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:06:55 -06:00
Juan Pablo Villafáñez 713faa0fc0
Use the expected method depending on the target being a file or folder
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 18:02:09 -06: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 fb87aa61e7
fix path for files from root folder
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-22 17:17:37 -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
Nextcloud bot d551b8e6fd
[tx-robot] updated from transifex 2017-03-22 21:14:04 +00: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
Robin Appelman 11ee0b14bb
replace autosave with a save button for external storage configuration
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-22 14:32:26 +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
Roeland Jago Douma 16a0bccefa Merge pull request #3972 from nextcloud/merge-some-more-css
Merge some CSS files using our SCSS compiler
2017-03-22 08:46:10 +01:00
Nextcloud bot cae8702ab2
[tx-robot] updated from transifex 2017-03-22 01:07:53 +00:00
Joas Schilling 20a0a18fbd
Fix reshare with user activity message
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-21 16:54:28 -06:00
Morris Jobke 1084cdb613
fix path
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-21 15:33:28 -06:00
Morris Jobke d2b1b02244 Merge pull request #3937 from nextcloud/downstream-27234
fix typo in sftp public key
2017-03-21 13:18:19 -06: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
Lukas Reschke d8e8d7b60e
[master] Fix branding
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-21 12:20:22 +01:00
Roeland Jago Douma 7e95837097 Merge pull request #3955 from nextcloud/downstream-27113
Can we get some faster phpunit execution?
2017-03-21 11:27:00 +01:00
Nextcloud bot fd0e42e093
[tx-robot] updated from transifex 2017-03-21 01:08:16 +00: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
Thomas Müller 5bfce597a9
[CI] Can we get some faster phpunit execution? (#27113)
* Don't backup globals and static attributes

* Unset global variable to remove impact on followup tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 12:34:05 -06:00
Lukas Reschke abaf909ba2
Log access to preview images
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 18:36:36 +01:00
Robin Appelman 0c1b7fdcb5
return failed cache if the shared storage failed to setup
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:31:34 +01:00
Robin Appelman f2e981e269
also set nonmaskedstorage in error cases
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-20 18:17:53 +01:00
Christoph Wurst 03a92eaf74 Merge pull request #3957 from nextcloud/downstream-27307
Follow up to #3949 (app exists on enable)
2017-03-20 18:10:05 +01:00
Joas Schilling 35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956
Skip null groups in group manager
2017-03-20 12:27:38 +01:00
Joas Schilling 25f772d592 Merge pull request #3868 from nextcloud/issue-3834-escape-theming-footer
Correctly escape the footer description from theming
2017-03-20 11:56:29 +01:00
Lukas Reschke ac1aff7d92 Merge pull request #3950 from nextcloud/downstream-27149
Forbid to upload part files via web UI
2017-03-20 11:44:57 +01:00
Joas Schilling b3556456b6
Don't use private api
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 11:32:29 +01:00
Lukas Reschke 1e61c17932
Fix grammar
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-03-20 11:08:39 +01:00
Joas Schilling 3abe86dade
Fix provisioning API call
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-20 10:45:27 +01:00
Roeland Jago Douma c4b6ff0bab Merge pull request #3946 from nextcloud/downstream-27263
Fix public link download button (unit test only)
2017-03-20 10:23:29 +01:00
Vincent Petry 78ee125c34
Fix public link download button
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 02:39:46 -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
Vincent Petry a4ce440392
Ignore NoUserException for shares from ghosts
Add unit tests for FailedStorage init from SharedStorage

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:43:24 -06:00
Felix Heidecke 11f838f9e4
Add ignore_files to config,
test files against ignore_files list on upload

fix typo and indentation

Move blacklist declaration to lib/public/Files/FileInfo.php,

Rename *ignored to *blacklisted

Mocked blacklist_files for testing

Mocked blacklist_files for testing

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 01:17:12 -06:00
Victor Dubiniuk 17bed297db
In the real world id is an initial filename
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-20 00:06:32 -06:00
Martin 718d1f3f15
fix typo in sftp public key
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-19 22:44:09 -06:00
Nextcloud bot 528a903a7b
[tx-robot] updated from transifex 2017-03-20 01:07:43 +00:00
Roeland Jago Douma ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2
Support Circles
2017-03-19 20:45:55 +01:00
Roeland Jago Douma 6677963902 Merge pull request #3913 from cwickert/master
DummyGetResponsePlugin: ownCloud -> Nexcloud
2017-03-19 14:08:34 +01:00
Nextcloud bot 1983606f80
[tx-robot] updated from transifex 2017-03-19 01:08:20 +00:00
Christoph Wickert 07b35b7bae DummyGetResponsePlugin: ownCloud -> Nexcloud
Signed-off-by: Christoph Wickert <cwickert@suse.de>
2017-03-18 12:59:25 +01:00
Nextcloud bot 9e1e7dac47
[tx-robot] updated from transifex 2017-03-18 01:07:50 +00:00
Maxence Lange 69694012ab shares-circles
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-17 18:48:33 -01:00
Morris Jobke 96ea85d01d Merge pull request #3887 from nextcloud/downstream-26379
Add CleanupRemoteStorages command
2017-03-17 09:16:19 -06:00
Joas Schilling bd97b7d130
Use DI
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 10:23:04 +01:00
Joas Schilling 5a8129f8ef Merge pull request #3886 from nextcloud/downstream-26995
Chunking NG: Assemble in natural sort order of files
2017-03-17 10:05:25 +01:00
Joas Schilling 199405ddc0
Safer queries
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:56 +01:00
Joas Schilling 0a1135a7cc
Better output
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:59:25 +01:00
Joas Schilling e8750f618b
Correctly escape the footer description from theming
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-17 09:11:41 +01:00
Jörn Friedrich Dreyer 5155a5288c
Add CleanupRemoteStorages command
cleanup files, address review

Fix CleanupRemoteStoragesTest tests

Fix test expectation.
Added files count to check filecache deletion.

Sort by numeric id for deterministic test results

Removed precise order test and added storage check

Remove inaccurate removal message check which has a different order on
Oracle.

Added more checks to confirm that existing storages still exist.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:09:52 -06:00
Vincent Petry 377fdf3860
Skip null groups in group manager (#26871) (#26956)
* Skip null groups in group manager (#26871)

* Skip null groups in group manager

* Also skip null groups in group manager's search function

* Add more group null checks in sharing code

* Add unit tests for null group safety in group manager

* Add unit tests for sharing code null group checks

* Added tests for null groups handling in sharing code

* Ignore moveShare optional repair in mount provider

In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.

* Adjust null group handing + tests

* Fix new group manager tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:07:03 -06:00
Markus Goetz 075a606514
Chunking NG: Assemble in natural sort order of files
For https://github.com/owncloud/client/pull/5476

Before this, the assembly could be bogusly in the order 0,1,10,11,2,3 etc.

As per the spec "The name of every chunk should be its chunk number."
https://github.com/cernbox/smashbox/blob/master/protocol/chunking.md

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-17 00:06:31 -06:00
Morris Jobke cc077e67d7 Merge pull request #2824 from nextcloud/ext-storage-expireversions
Properly expire ext storage versions (#26601)
2017-03-16 23:00:55 -06:00
Nextcloud bot 5683365a2c
[tx-robot] updated from transifex 2017-03-17 01:07:41 +00:00
Lukas Reschke 39afcbd49f Merge pull request #3679 from nextcloud/socialsharing
Add social sharing
2017-03-16 23:08:47 +01:00
Joas Schilling 3a53784f80
Don't set the HTTP status twice
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-16 13:35:41 +01:00
Roeland Jago Douma 57c1be8633 Merge pull request #3802 from Ko-/master
Check that set_time_limit is not disabled before calling it
2017-03-16 12:27:26 +01:00
Joas Schilling 652ee8a605
Fix scheduling plugin on legacy caldav endpoint
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-16 09:55:15 +01:00
Nextcloud bot 2fafdb39ac
[tx-robot] updated from transifex 2017-03-16 01:07:36 +00:00
Roeland Jago Douma 93c9a06761 Merge pull request #3788 from nextcloud/fed-share-modify
Add api to change the remote of an incoming federated share
2017-03-15 17:32:35 +01:00
Roeland Jago Douma 5ed45fc8e6 Merge pull request #3848 from nextcloud/remove-single-quotes-around-search-query
Remove single quotes around search query like in user search
2017-03-15 15:05:15 +01:00
Joas Schilling 0fe45966a0
Remove single quotes around search query like in user search
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-03-15 12:53:44 +01:00
Björn Schießle 5a998da206 Merge pull request #3841 from nextcloud/encyryption-trash-bin
Delete files on encryption error
2017-03-15 09:07:07 +01:00
Morris Jobke 13aae43d89
Fix layout of sharing buttons
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-03-14 22:52:28 -06:00
Nextcloud bot 4da6b7e796
[tx-robot] updated from transifex 2017-03-15 01:07:49 +00:00
Maxence Lange 16e1c21fcc
fix mock
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-03-14 19:27:20 +01:00
Maxence Lange 1b9ed81cb6
switch reshares to true
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
2017-03-14 19:27:07 +01:00
Roeland Jago Douma 6565533d3b Merge pull request #3600 from coletivoEITA/master
added method needsPartFile() in Storage
2017-03-14 15:14:59 +01:00
Robin Appelman 8217b16cfe Merge pull request #3824 from nextcloud/dav-search-getlastmodified
fix searching and ordering on getlastmodified
2017-03-14 14:42:57 +01:00
Robin Appelman e392d02d80
safer casting of datetime
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-03-14 14:12:40 +01:00