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

43531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
bd2aede6a3
[tx-robot] updated from transifex 2018-05-04 00:11:52 +00:00
Morris Jobke
3f2a5c9335
Merge pull request #9290 from nextcloud/streams-0.6.1 
Use better way to determine stream type in stream wrapper
 2018-05-03 17:15:02 +02:00
Morris Jobke
2d66f04aa0
Merge pull request #9340 from gboudreau/dev/chrome-devconsole-sourcemap-warnings 
Resolves warnings in Chrome Dev Console
 2018-05-03 16:58:41 +02:00
Morris Jobke
dc5c4b2e1f
Merge pull request #9353 from nextcloud/feature/4724/versions_dav 
Add versions DAV endpoint
 2018-05-03 16:52:32 +02:00
Morris Jobke
fb9cb6d4c6
Merge pull request #9373 from nextcloud/bugfix/8929/actual_fetch_version 
Get correct version of an app
 2018-05-03 16:45:18 +02:00
Morris Jobke
7cb467b476
Merge pull request #9355 from nextcloud/dav-upload-lock 
only allow a single concurrent dav write to a file
 2018-05-03 16:28:39 +02:00
Morris Jobke
ceb674632c
Merge pull request #9332 from nextcloud/personal-settings-fixes 
Small improvements for personal settings
 2018-05-03 13:55:52 +02:00
Morris Jobke
b6457e4135
Only show used amount for unlimited quota users 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-03 10:50:08 +02:00
Julius Härtl
94528ad2be
Move quota icon to core 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 10:32:16 +02:00
Julius Härtl
d0efe1bf6c
Translate details text 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 10:32:15 +02:00
Julius Härtl
4b550eb699
Move quota bar to info section and make it a bit simpler 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 10:32:14 +02:00
Julius Härtl
e6a463d1f3
Personal settings: Fix visibility alignment and avatar description text 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-05-03 10:32:13 +02:00
Morris Jobke
0f8210792c
Merge pull request #9352 from nextcloud/9318_SCSSCacher_resetCache_catch_exception 
Issue #9318: catch exceptions in SCSSCacher::resetCache()
 2018-05-03 09:56:26 +02:00
Roeland Jago Douma
f7b518fdbf
Get correct version of an app 
Related to #8929

We should get the version of the app. Not of the appfolder. Else there
is no way to properly compare the versions.

Now note that installing in 1 go will still fail. But at least on the
next page load the new version will be properly detected.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-03 08:22:03 +02:00
Nextcloud bot
346e46af49
[tx-robot] updated from transifex 2018-05-03 00:11:58 +00:00
Roland Tapken
6270a01cab
Issue #9318: catch exceptions in SCSSCacher::resetCache() 
Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
 2018-05-02 21:23:13 +02:00
Morris Jobke
2aa108000c
Merge pull request #9293 from nextcloud/feature/9166/custom-auditlogfile 
option for a seperate audit log file
 2018-05-02 16:16:28 +02:00
Morris Jobke
a56ec1062a
Merge pull request #9346 from nextcloud/techdep/noid/needsPartFile_to_storage 
Use an actual function of the storage to determine needsPartFile
 2018-05-02 16:03:31 +02:00
Roeland Jago Douma
dfe6d65410
Merge pull request #9310 from nextcloud/bugfix/noid/allow-to-inject-collaboration-search-result 
Allow to inject ISearchResult
 2018-05-02 09:45:25 +02:00
Morris Jobke
e9c6ec4b22
Merge pull request #8564 from nextcloud/files_external_read_only 
Make it possible to make external storages read only
 2018-05-01 23:39:30 +02:00
Roeland Jago Douma
ea5393e9f8
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:20:20 +02:00
Roeland Jago Douma
953691abb2
External mount does not get DELETE and UPDATE if readonly 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:18:56 +02:00
Roeland Jago Douma
db96b0bb0b
Make it possible to make external storages read only 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:18:56 +02:00
Robin Appelman
57ba18f47f
Use better way to determine stream type in encryption stream wrapper 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-01 15:06:21 +02:00
Robin Appelman
c27016b1d1
update icewind/streams to 0.6.1 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-01 15:06:21 +02:00
Roeland Jago Douma
055a003661
Use an actual function of the storage to determine needsPartFile 
We have a function for it so better to override that. Also because other
codes that might check this should get the right value.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 15:02:36 +02:00
Morris Jobke
f212c692ac
Merge pull request #9178 from nextcloud/feature/9142/directdownload 
Add directdownload endpoint
 2018-05-01 14:54:44 +02:00
Roeland Jago Douma
7f194be3ab
Merge pull request #9202 from nextcloud/feature/1332/trashbin_dav 
Trashbin endpoint in DAV
 2018-05-01 14:24:38 +02:00
Roeland Jago Douma
5401732cd2
Allow to read get old versions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 08:38:59 +02:00
Roeland Jago Douma
dd47ebb062
Add rollback 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 08:38:59 +02:00
Roeland Jago Douma
d40afac1b9
Add version collection to DAV 
listed as
versions/<username>/versions/<file id>/<timastamp>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-01 08:38:59 +02:00
Nextcloud bot
c8cb42fd26
[tx-robot] updated from transifex 2018-05-01 00:11:52 +00:00
John Molakvoæ
49f26d1221
Merge pull request #9348 from nextcloud/fix-js-tests 
Replace deprecated sinon reset() call with resetHistory()
 2018-04-30 14:54:34 +02:00
Julius Härtl
16865e59dd
Replace deprecated sinon reset() call with resetHistory() 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-04-30 13:52:58 +02:00
Nextcloud bot
b87b0689c5
[tx-robot] updated from transifex 2018-04-30 00:11:48 +00:00
Guillaume Boudreau
eb97035312
Resolves warnings in Chrome Dev Console: 
"DevTools failed to parse SourceMap: .../core/vendor/..."
 2018-04-29 09:29:56 -04:00
Nextcloud bot
a546dcfcb3
[tx-robot] updated from transifex 2018-04-29 00:11:47 +00:00
Nextcloud bot
6ee00a8be5
[tx-robot] updated from transifex 2018-04-28 00:11:58 +00:00
Morris Jobke
d8350c69ef
Merge pull request #9309 from nextcloud/feature/noid/no_js_sharepermission_logic 
Do not add sharePermission logic in JS
 2018-04-27 14:01:40 +02:00
Morris Jobke
7102ddad50
Merge pull request #9325 from GitHubUser4234/ldap_cloned_connection_nc13fix 
Fix for unbound cloned LDAP connections
 2018-04-27 14:01:15 +02:00
Morris Jobke
7306d30708
Merge pull request #9321 from nextcloud/bugfix/noid/return_root_folder_when_at_root 
Actually return the root folder when traversing up the tree
 2018-04-27 13:59:29 +02:00
Morris Jobke
21da3594f6
Merge pull request #9322 from nextcloud/bugfix/noid/swift_token_cache 
Better swift V3 token handling
 2018-04-27 13:51:44 +02:00
Roger Szabo
8637b90e15 unbound cloned connection fix 
Signed-off-by: Roger Szabo <roger.szabo@web.de>
 2018-04-27 17:29:15 +08:00
Morris Jobke
7da1e968f9
Merge pull request #9319 from nextcloud/rakekniven-patch-1 
Fixed typo
 2018-04-27 09:15:21 +02:00
Nextcloud bot
9e3522af54
[tx-robot] updated from transifex 2018-04-27 00:11:53 +00:00
Arthur Schiwon
aff5fe68b3
use SystemConfig, less dependencies, and not publicly needed 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-04-26 23:54:11 +02:00
Roeland Jago Douma
a0e038f912
generateTokenFromCache is only valid for V3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:51:05 +02:00
Roeland Jago Douma
7318882357
json_decode an associative array for the swift cached token 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:47:47 +02:00
Roeland Jago Douma
235e3480e6
Actually return the root folder when traversing up the tree 
If you now keep calling $node->getParent() you will at some point get
the RootFolder back. This is a nice termination check and will prevent
endless loops if an exit condition is slightly off.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-04-26 20:04:19 +02:00
rakekniven
ace2063f21
Fixed typo 2018-04-26 18:12:21 +02:00