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

15553 commits

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