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

50748 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
4bdd0db8d3
backport of #17450 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-21 13:33:36 +02:00
Arthur Schiwon
67d68deba1 treat LDAP error 50 as auth issue, prevents lost server connection errors 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-10-21 09:56:39 +00:00
Roeland Jago Douma
a9775e36d2
Merge pull request #17597 from nextcloud/backport/17575/stable17 
[stable17] Include the share in the Files_Sharing::loadAdditionalScripts event
 2019-10-21 09:46:07 +02:00
Nextcloud bot
bad70805e4
[tx-robot] updated from transifex 2019-10-21 02:15:57 +00:00
Nextcloud bot
aa58d6c980
[tx-robot] updated from transifex 2019-10-20 02:16:50 +00:00
Daniel Calviño Sánchez
c765dc46e7 Include the share in the Files_Sharing::loadAdditionalScripts event 
This provides a better context for apps using the event, for example to
load one script or another depending on whether the share is a file or a
folder.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2019-10-19 09:13:59 +00:00
Roeland Jago Douma
6c0e6b531d
Merge pull request #17579 from nextcloud/backport/17543/stable17 
[stable17] Let SCSS cleanup only run once
 2019-10-19 11:11:52 +02:00
Roeland Jago Douma
6b505fe3b5
Merge pull request #17589 from nextcloud/backport/17585/stable17 
[stable17] added documentation links on settings pages
 2019-10-19 11:10:40 +02:00
Nextcloud bot
9396075e6d
[tx-robot] updated from transifex 2019-10-19 02:15:50 +00:00
Sascha Wiswedel
2836f80c5e added documentation links on settings pages 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-10-18 10:09:58 +00:00
Nextcloud bot
9f3b3d23c7
[tx-robot] updated from transifex 2019-10-18 02:15:31 +00:00
Roeland Jago Douma
3a45dfa09a
Merge pull request #17538 from nextcloud/backport/17332/stable17 
[stable17] Only cache the mimetype if the file exists
 2019-10-17 13:44:02 +02:00
Julius Härtl
53f8f21cc9 Make sure the cache is only reset once at a time 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-17 09:28:11 +00:00
Julius Härtl
fbe6a57866 Use a distributed cache for the isCachedCache 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-17 09:28:10 +00:00
Julius Härtl
7d6e7ac592
Load additional scripts on help page 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-10-17 10:56:09 +02:00
Nextcloud bot
c466572d98
[tx-robot] updated from transifex 2019-10-17 02:16:01 +00:00
Nextcloud bot
8ebda6d60c
[tx-robot] updated from transifex 2019-10-16 02:15:49 +00:00
Roeland Jago Douma
a5e3f696cb
Merge pull request #17455 from nextcloud/fix/stable17-axios-package 
[stable17] Use @nextcloud/axios to keep the CSRF token in sync
 2019-10-15 14:29:58 +02:00
Christoph Wurst
37cca6ffe7 Use @nextcloud/axios to keep the CSRF token in sync 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-15 07:19:16 +00:00
Roeland Jago Douma
f0151a24c8
Merge pull request #17541 from nextcloud/backport/17503/stable17 
[stable17] Set the proper filename for version downloads
 2019-10-15 09:17:51 +02:00
Nextcloud bot
cf140738dc
[tx-robot] updated from transifex 2019-10-15 02:15:14 +00:00
Roeland Jago Douma
4e89382532
Merge pull request #17453 from nextcloud/fix/axios-csrf-token-update-event-stable17 
[stable17] Fix axios csrf token update event
 2019-10-14 23:16:10 +02:00
Roeland Jago Douma
52de002fec Set the proper filename for version downloads 
Before it just used the internalid (timestamp often) which is not really
user friendly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-14 20:28:54 +00:00
Joas Schilling
899e5cae26 Only cache the mimetype if the file exists 
Otherwise files access control will cache "application/octet-stream"
for all the target node on:
rename, move, copy and all other methods which create a new item

To check this:
1. Add an automated tagging rule which tags on mimetype NOT "httpd/unix-directory"
2. Add an access control rule which checks for any mimetype
3. Create a folder and rename it, the folder should not be tagged, but it is

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-10-14 19:39:29 +00:00
Christoph Wurst
f49f1afdb0 Emit an event when the CSRF token changes 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-14 19:32:27 +00:00
Nextcloud bot
eb789e4390
[tx-robot] updated from transifex 2019-10-14 02:15:16 +00:00
Nextcloud bot
46de79cfe8
[tx-robot] updated from transifex 2019-10-13 02:15:58 +00:00
Nextcloud bot
844e7a74cd
[tx-robot] updated from transifex 2019-10-12 02:15:17 +00:00
Nextcloud bot
22e14e39cf
[tx-robot] updated from transifex 2019-10-11 02:14:50 +00:00
Roeland Jago Douma
ebbfd7da4e
Merge pull request #17493 from nextcloud/fix/tooltips/hide-on-sidebar-close 
Force hide tooltips on sidebar close
 2019-10-09 21:28:49 +02:00
John Molakvoæ (skjnldsv)
79473bdfdf Force hide tooltips on sidebar close 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-10-09 15:31:47 +00:00
Nextcloud bot
32d12bc533
[tx-robot] updated from transifex 2019-10-09 02:15:14 +00:00
Roeland Jago Douma
ef837cfde1
Merge pull request #17457 from nextcloud/backport/17454/stable17 
[stable17] Kill ui-regression ci job
 2019-10-08 10:06:38 +02:00
Roeland Jago Douma
f9431137de Kill ui-regression ci job 
Since we do not use it at the moment anyway it seems like a waste of
resources to actually run it.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 07:36:17 +00:00
John Molakvoæ
6a84b1a73c
Build stable17 JS (#17452) 
Build stable17 JS
 2019-10-08 08:20:53 +02:00
Roeland Jago Douma
0e2a403a21
Merge pull request #17444 from nextcloud/backport/17359/stable17 
[stable17] Don't call basename on null
 2019-10-08 08:07:06 +02:00
Roeland Jago Douma
2195d79122
Merge pull request #17438 from nextcloud/backport/17411/stable17 
[stable17] Fix oauth client redirect
 2019-10-08 08:06:52 +02:00
Roeland Jago Douma
d3c4c76654
Build stable17 JS 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-08 07:41:56 +02:00
Nextcloud bot
0e85ca8ee3
[tx-robot] updated from transifex 2019-10-08 02:15:08 +00:00
Joas Schilling
2efd0207a6 Don't call basename on null 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-10-07 12:34:14 +00:00
Sergej Nikolaev
907660e05c fix oauth client redirect 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-07 10:05:03 +00:00
Roeland Jago Douma
ca490dff2b
Merge pull request #17418 from nextcloud/backport/17387/stable17 
[stable17] Allow removing federated shares of locally reshared files
 2019-10-07 09:43:19 +02:00
Nextcloud bot
2f4145e757
[tx-robot] updated from transifex 2019-10-07 02:14:49 +00:00
Nextcloud bot
107639b12f
[tx-robot] updated from transifex 2019-10-06 02:15:20 +00:00
Roeland Jago Douma
bbf36b4879 Allow removing federated shares of locally reshared files 
* UserA shares a folder to UserB
* UserB does a federated share to userC@serverC
* UserB now tries to revoke the federated share

Before we always tried to notify the remote cloud. The case that the
file was reshared locally was not considered. This patch makes sure not
to try to notify a federated server if both users are local users.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-10-05 13:19:44 +00:00
Roeland Jago Douma
cf0376f81d
Merge pull request #17415 from nextcloud/backport/17397/stable17 
[stable17] Fix updating and deleting authtokens
 2019-10-05 14:14:48 +02:00
Sergej Nikolaev
5c5d658b0e fix updating and deleting authtokens 
Signed-off-by: Sergej Nikolaev <kinolaev@gmail.com>
 2019-10-05 10:35:46 +00:00
Nextcloud bot
b5ad2f9cb5
[tx-robot] updated from transifex 2019-10-05 02:15:13 +00:00
John Molakvoæ
2809ffa5fe
[stable17] Append / to data(path) for folder content request (#17311) 
[stable17] Append / to data(path) for folder content request
 2019-10-04 18:09:44 +02:00
Roeland Jago Douma
16ba526982
Merge pull request #17351 from nextcloud/backport/17001/stable17 
[stable17] reduce adressbook change events and handling
 2019-10-04 11:34:16 +02:00