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

51292 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
2b2626566c Merge pull request #18031 from nextcloud/accept-incoming-shares-in-integration-tests 
Accept incoming shares in integration tests
 2019-11-20 19:29:43 +01:00
Daniel Calviño Sánchez
54f8f75f6f Accept incoming shares in integration tests 
Now all incoming shares need to be explicitly accepted before being able
to use the shared file or get information about a reshare (although
getting the information of the incoming share is possible before
accepting it).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-11-20 15:47:11 +01:00
Roeland Jago Douma
4ddea4bdfb
Merge pull request #17999 from nextcloud/Improves-doc-of-mail_smtpsecure 
Improves doc of mail_smtpsecure
 2019-11-20 13:23:32 +01:00
Daniel Calviño Sánchez
9004e90f5d Replace direct calls to share API with specific share steps 
This makes possible to use steps that reference the last share, which
will be needed to accept pending shares.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-11-20 13:11:49 +01:00
Daniel Calviño Sánchez
847bd0f05b Remove extra spaces at the end of lines 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-11-20 13:10:35 +01:00
Roeland Jago Douma
d625d8bd1e
Merge pull request #17824 from nextcloud/fix/dav/catch_forbidden 
Catch forbidden http status code
 2019-11-20 12:32:00 +01:00
Joas Schilling
6ad54f3f27
Merge pull request #17850 from nextcloud/bugfix/noid/mark-spreed-as-active-on-call-urls 
Mark "Talk" active on /call/token URLs
 2019-11-20 10:33:45 +01:00
Roeland Jago Douma
c4ef32f4f0
Merge pull request #18011 from nextcloud/fix/share_tests 
Fix/share tests
 2019-11-20 08:39:51 +01:00
Roeland Jago Douma
e9c972f708
Fix share tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 08:08:02 +01:00
Roeland Jago Douma
b367027798
Do pagination on the dummy group backend 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-20 08:08:01 +01:00
Nextcloud bot
afa0f2c0d8
[tx-robot] updated from transifex 2019-11-20 02:16:19 +00:00
Daniel Kesselberg
9055f46351
Make phan happy ;) 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-19 16:16:26 +01:00
Pierre Ozoux
3c0a284baf Improves doc of mail_smtpsecure 
To reflect what is in the UI.

Signed-off-by: pierreozoux <pierre@ozoux.net>
 2019-11-19 11:27:31 +01:00
Nextcloud bot
9707fcf4fe
[tx-robot] updated from transifex 2019-11-19 02:17:47 +00:00
Roeland Jago Douma
5195be108f
Merge pull request #17985 from nextcloud/enh/use_displayname_federated_share 
Use the displayname for federated notifications
 2019-11-18 20:22:31 +01:00
Roeland Jago Douma
ccc0a5e0d5
Merge pull request #16828 from nextcloud/feature/noid/accept-incoming-shares 
🔗☑️ Accept all incoming shares
 2019-11-18 20:11:20 +01:00
Roeland Jago Douma
e16321368f
Fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-18 16:11:03 +01:00
Roeland Jago Douma
5320f08cd2
Merge pull request #17765 from nextcloud/filecache-extension 
Upload time and Creation time
 2019-11-18 15:29:49 +01:00
Roeland Jago Douma
497737f28f
Merge pull request #17958 from nextcloud/docs/remove-security-mail 
security@nextcloud.com is not being monitored and mails are being dro…
 2019-11-18 15:29:16 +01:00
Roeland Jago Douma
25c6e7a840
Merge pull request #17972 from nextcloud/dependabot/npm_and_yarn/p-queue-6.2.1 
Bump p-queue from 6.2.0 to 6.2.1
 2019-11-18 15:09:52 +01:00
Roeland Jago Douma
17fae47bdb
Use the displayname for federated notifications 
Since we have the showing this is a lot nicer.
Especially on alrge isntances where the uid can be totally random.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-18 15:00:33 +01:00
dependabot-preview[bot]
cb245deeb1 Bump p-queue from 6.2.0 to 6.2.1 
Bumps [p-queue](https://github.com/sindresorhus/p-queue) from 6.2.0 to 6.2.1.
- [Release notes](https://github.com/sindresorhus/p-queue/releases)
- [Commits](https://github.com/sindresorhus/p-queue/compare/v6.2.0...v6.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-11-18 12:18:47 +00:00
Roeland Jago Douma
8800a7e890
Fix cache moves 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-18 12:48:00 +01:00
blizzz
bb77c1447b
Merge pull request #17965 from nextcloud/fix/noid/strict-controller-userid 
Fixes a 500 without userid
 2019-11-18 12:10:17 +01:00
Roeland Jago Douma
6db146f1d8
Merge pull request #17973 from nextcloud/dependabot/npm_and_yarn/vuex-3.1.2 
Bump vuex from 3.1.1 to 3.1.2
 2019-11-18 12:02:45 +01:00
Roeland Jago Douma
1bd688a9d1
Use dummy backend in test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-18 11:54:26 +01:00
Roeland Jago Douma
a184e350d7
Merge remote-tracking branch 'origin/master' into filecache-extension 2019-11-18 11:06:17 +01:00
dependabot-preview[bot]
b20e9c2e35 Bump vuex from 3.1.1 to 3.1.2 
Bumps [vuex](https://github.com/vuejs/vuex) from 3.1.1 to 3.1.2.
- [Release notes](https://github.com/vuejs/vuex/releases)
- [Commits](https://github.com/vuejs/vuex/compare/v3.1.1...v3.1.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-11-18 08:37:26 +00:00
Roeland Jago Douma
911763aad5
Merge pull request #17974 from nextcloud/dependabot/npm_and_yarn/handlebars-4.5.2 
Bump handlebars from 4.5.1 to 4.5.2
 2019-11-18 09:06:52 +01:00
Nextcloud bot
7bb3c0201c
[tx-robot] updated from transifex 2019-11-18 02:15:57 +00:00
Roeland Jago Douma
637d89727c
Merge pull request #17971 from nextcloud/dependabot/npm_and_yarn/build/handlebars-4.5.2 
Bump handlebars from 4.5.1 to 4.5.2 in /build
 2019-11-17 09:13:12 +01:00
Roeland Jago Douma
d11ad491b9
Merge pull request #17564 from nextcloud/kesselb-patch-1-1 
Update Feature_request.md
 2019-11-17 09:12:40 +01:00
Roeland Jago Douma
29c008c962
Merge pull request #17654 from burgha/feature/3866/uploaddetails 
fix uploadprogressbar tooltip
 2019-11-17 09:12:19 +01:00
Roeland Jago Douma
c08e803db3
Catch forbidden http status code 
If you try to do something on a DAV mount (external or federated share)
that is not allowed. We should not mark the storage as not available but
just fail somewhat gracefully.

Now by catching this and just properly returning the operation will just
fail (and notify the user) which is already a lot better then marking
the storage as unavailable and doing boom.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-11-17 09:11:15 +01:00
dependabot-preview[bot]
e09ad9105d Bump handlebars from 4.5.1 to 4.5.2 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.1 to 4.5.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.1...v4.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-11-17 08:10:10 +00:00
Nextcloud bot
30bdb0f35b
[tx-robot] updated from transifex 2019-11-17 02:17:15 +00:00
dependabot-preview[bot]
43b58ca30f
Bump handlebars from 4.5.1 to 4.5.2 in /build 
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.5.1 to 4.5.2.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.1...v4.5.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-11-17 02:13:10 +00:00
Nextcloud bot
c1cd0a25c7
[tx-robot] updated from transifex 2019-11-16 02:15:58 +00:00
Arthur Schiwon
0a1937208f
Fixes a 500 without userid 
plus cleanup of unused use statements

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-16 01:10:19 +01:00
John Molakvoæ
9392579924
HTTPS link to https://en.wikipedia.org/wiki/Server-sent_events (#17955) 
HTTPS link to https://en.wikipedia.org/wiki/Server-sent_events
 2019-11-15 14:40:10 +01:00
Daniel Kesselberg
63062625dd
security@nextcloud.com is not being monitored and mails are being dropped. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-11-15 12:05:00 +01:00
Christian Oliff
417fd12d3a
HTTPS link to https://en.wikipedia.org/wiki/Server-sent_events 
prevents a redirect
 2019-11-15 16:19:28 +09:00
Nextcloud bot
18efe3bad3
[tx-robot] updated from transifex 2019-11-15 02:16:03 +00:00
Roeland Jago Douma
3caa3c1fa4
Merge pull request #17942 from nextcloud/fix/noid/server-offline-app-init 
pass through ServerNotAvailableException on app init
 2019-11-14 20:51:10 +01:00
Arthur Schiwon
af6c788efc
pass through ServerNotAvailableException on app init 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-14 17:20:14 +01:00
Roeland Jago Douma
224073ea7b
Merge pull request #17926 from nextcloud/dav-upload-shared-lock-expired 
re-acquired expired shared locks on large file uploads
 2019-11-14 10:00:01 +01:00
John Molakvoæ
a3036aae82
Revert "Remove unneeded more-white icon" (#17931) 
Revert "Remove unneeded more-white icon"
 2019-11-14 09:20:55 +01:00
Nextcloud bot
c952bec11d
[tx-robot] updated from transifex 2019-11-14 02:16:16 +00:00
Roeland Jago Douma
e1b31d2f4e
Merge pull request #17893 from RussellAult/patch-1 
Fix $redirectUri sometimes has two '?'
 2019-11-13 20:29:05 +01:00
Christoph Wurst
31b336ecbe
Revert "Remove unneeded more-white icon" 2019-11-13 18:37:23 +01:00