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

15618 commits

Author SHA1 Message Date
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
Vinicius Cubas Brand
13e50cbcd7 added method needsPartFile() in Storage 
Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
 2017-03-14 10:06:50 -03:00
Bjoern Schiessle
79d362f4a6
delete files right away in case of a encryption exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-14 12:11:28 +01:00
Bjoern Schiessle
9ce32d9941
always throw a encryption exception 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-14 12:11:28 +01:00
Nextcloud bot
8d91c84ec4
[tx-robot] updated from transifex 2017-03-14 01:07:46 +00:00
Morris Jobke
ef14dc671f
fix unit test 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-13 15:59:04 -06:00
Lukas Reschke
756bc90eac Merge pull request #3648 from nextcloud/sabre-3.2.2 
[3rdparty] Bump sabre/dav to 3.2.2
 2017-03-13 19:27:09 +01:00
Robin Appelman
c1cf872f1d Merge pull request #3822 from nextcloud/webui-upoad-no-mtime 
dont preserve mtime when uploading trough the web interface
 2017-03-13 15:48:59 +01:00
Robin Appelman
6074dc9979
fix searching and ordering on getlastmodified 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-13 14:44:52 +01:00
Robin Appelman
ad4b5c82da
dont preserve mtime when uploading trough the web interface 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-13 13:33:18 +01:00
Jörn Friedrich Dreyer
fbd2dd49b6
use closure to properly defer l10n initialization (#27328) 2017-03-13 08:52:54 +01:00
Morris Jobke
f7cef9f702 Merge pull request #3772 from nextcloud/favorite-search 
Allow searching for favorites
 2017-03-13 00:55:12 -06:00
Nextcloud bot
0dd0242d2f
[tx-robot] updated from transifex 2017-03-13 01:08:19 +00:00
Nextcloud bot
37fcc41004
[tx-robot] updated from transifex 2017-03-12 01:08:05 +00:00
Ko-
0024b67aaf Check that set_time_limit is not disabled before calling it 
Signed-off-by: Ko- <k.stoffelen@cs.ru.nl>
 2017-03-11 17:04:21 +01:00
Nextcloud bot
456cd81a20
[tx-robot] updated from transifex 2017-03-11 01:07:48 +00:00
Vincent Petry
5dbb32fb81
Properly expire ext storage versions (#26601) 
* Properly expire ext storage versions

System-wide external storages have no real owner so the current user is
used as owner. However when running cron.php there is no current user,
so no expiry can be done.

This fix adds an user argument to the expire() function to tell for
which user to expire files. This information is anyway always available
now through the expire command job.

* Move version expire setupFS into the expire function

* Add comment about not tearing down in version Storage::expire()

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-10 15:58:44 -06:00
Roeland Jago Douma
5c2772fb36
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-10 20:40:47 +01:00
Robin Appelman
1c59240894
Add api to change the remote of an incoming federated share 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-10 14:45:40 +01:00
Stefan Schneider
f6ef024159 Correct incorrectly typed X-OC-Mtime header 
Signed-off-by: Stefan Schneider <stefan.schneider@squareweave.com.au>
 2017-03-10 18:16:27 +11:00
Morris Jobke
c38f87e799 Merge pull request #3690 from nextcloud/cleanup-legacy-groups-class 
Remove legacy class OC_Group and OC_User
 2017-03-09 19:09:22 -06:00
Nextcloud bot
8904fb1cf3
[tx-robot] updated from transifex 2017-03-10 01:08:01 +00:00
Morris Jobke
a5ba1f7803
Remove legacy class OC_Group and OC_User 
* basically a straight replacement of the wrapped code at the calling code parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-09 17:35:09 -06:00
Roeland Jago Douma
db5fc4d3cb Merge pull request #3693 from nextcloud/get-user-folder-of-correct-user 
Get the user folder of the correct user for mention notifications
 2017-03-09 21:50:05 +01:00
Roeland Jago Douma
c16cb1978b Merge pull request #3621 from kuimovvg/master 
don't setted status when file is lock
 2017-03-09 21:28:32 +01:00
Joas Schilling
d4200a08cc
Get the user folder of the correct user 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-09 21:07:37 +01:00
Björn Schießle
c23c062c89 Merge pull request #3611 from nextcloud/announce-trsuted-server-endpoints 
Announce trusted server endpoints
 2017-03-09 14:39:18 +01:00
Bjoern Schiessle
e08c3f1b1d
add new routes for trusted servers which are more align with the other end-points 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-09 09:54:52 +01:00
Robin Appelman
e61606a767
Allow searching for favorites 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-08 16:30:55 +01:00
Robin Appelman
2a8e922d67 Merge pull request #3360 from nextcloud/dav-search 
Implement webdav SEARCH
 2017-03-08 13:09:19 +01:00
Roeland Jago Douma
74ac5dffbd Merge pull request #3757 from nextcloud/issue-2887-no-subsystem-for-locking 
Add new user agent of windows 10 dav backend
 2017-03-08 09:27:12 +01:00
Roeland Jago Douma
abecae2388 Merge pull request #3725 from nextcloud/issue-fac-55-mimetype-detection-on-public-uploads 
Fix mimetype detection on public uploads for the workflow engine
 2017-03-08 08:55:33 +01:00
Nextcloud bot
98c56f9adb
[tx-robot] updated from transifex 2017-03-08 01:07:47 +00:00
Joas Schilling
d228acabf6
Set a status code when setting a body 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-07 17:31:32 +01:00
Joas Schilling
a94f9d8d94
Add new user agent of windows 10 dav backend 
Thanks Microsoft

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-07 17:24:26 +01:00
Nextcloud bot
e6dcbb39ac
[tx-robot] updated from transifex 2017-03-07 01:07:40 +00:00
Joas Schilling
76e52eb2f6
Fix admin panel missing some JS files 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-06 12:05:31 +01:00
Joas Schilling
e8be73f485
Fix mimetype detection on public uploads for the workflow engine 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-06 12:04:54 +01:00
Nextcloud bot
15673bc601
[tx-robot] updated from transifex 2017-03-06 01:07:58 +00:00
Nextcloud bot
1d5e94a4f2
[tx-robot] updated from transifex 2017-03-05 01:07:46 +00:00
Nextcloud bot
badb45fce4
[tx-robot] updated from transifex 2017-03-04 01:07:41 +00:00