upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 02:00:51 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 33
39889 commits 1035 branches 1221 tags 8.3 GiB
Commit graph

39889 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
aa586331ea Merge pull request #6525 from nextcloud/12-6499 
[stable12] Allow to close sidebar for text files
 2017-09-20 16:05:59 +02:00
Morris Jobke
2062c2ada6 Merge pull request #6528 from nextcloud/fix_4654_3375-12 
[stable12] Pass new value to triggerChange
 2017-09-20 16:05:49 +02:00
Morris Jobke
6a52cda551 Merge pull request #6547 from nextcloud/backport-6545-stable12 
[stable12] throw 101 when an empty group string is provided
 2017-09-20 16:05:41 +02:00
Joas Schilling
3c449c88be Merge pull request #6527 from nextcloud/fix_quota_new_endpoint_12 
[stable12] Fix quota new endpoint 12
 2017-09-20 09:19:06 +02:00
Nextcloud bot
2bac01daad
[tx-robot] updated from transifex 2017-09-20 00:08:36 +00:00
Roeland Jago Douma
343a69569d Merge pull request #6572 from nextcloud/bump-version-another-time 
[stable12] Bump version to 12.0.3.3
 2017-09-19 20:18:36 +02:00
Lukas Reschke
f438ad5d1e
Bump version to 12.0.3.3 
For a build with https://github.com/nextcloud/server/pull/6570

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-19 16:48:11 +02:00
Lukas Reschke
5e47b07b21 Merge pull request #6570 from nextcloud/fix-comments-activity-error-12 
[stable12] Use the wrapper to get the parameters which was added in #6369
 2017-09-19 16:07:44 +02:00
Joas Schilling
4ca0223f37
Use the wrapper to get the parameters which was added in #6369 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-19 15:06:22 +02:00
Nextcloud bot
db56ea3e70
[tx-robot] updated from transifex 2017-09-19 00:08:39 +00:00
Roeland Jago Douma
3488a2099f Merge pull request #6556 from nextcloud/stable12-bump-version-to-final 
[stable12] Bump version to 12.0.3
 2017-09-18 20:01:51 +02:00
Lukas Reschke
7dc2ffaf00
Bump version to 12.0.3 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-18 18:22:09 +02:00
Arthur Schiwon
713ce42fdf
throw 101 when an empty group string is provided 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-18 13:10:23 +02:00
Nextcloud bot
c854665b0c
[tx-robot] updated from transifex 2017-09-18 00:08:41 +00:00
Nextcloud bot
bc88484e7f
[tx-robot] updated from transifex 2017-09-17 00:08:34 +00:00
Nextcloud bot
18a258c531
[tx-robot] updated from transifex 2017-09-16 00:08:34 +00:00
Roeland Jago Douma
71fdc43125
Pass new value to triggerChange 
it is not used. but pass in the empty string (on delete) and the new
file (on create)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-15 20:23:45 +02:00
Roeland Jago Douma
76cd70aed7
Fix quota calculation on new dav upload endpoint 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-15 20:21:37 +02:00
Morris Jobke
efec52ebeb
Allow to close sidebar for text files 
* the close button was overlapped by the text preview and you could not close the sidebar then

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-15 17:00:14 +02:00
Nextcloud bot
99916a9bda
[tx-robot] updated from transifex 2017-09-15 00:08:17 +00:00
Nextcloud bot
a7f3fadd37
[tx-robot] updated from transifex 2017-09-14 00:08:21 +00:00
Nextcloud bot
51c110dd66
[tx-robot] updated from transifex 2017-09-13 00:08:21 +00:00
Roeland Jago Douma
c3924068aa Merge pull request #6472 from nextcloud/rc2 
v12.0.3RC2
 2017-09-12 23:24:47 +02:00
Roeland Jago Douma
2e30eab8c7 Merge pull request #6474 from nextcloud/2fa_apppasword_auth_12 
[stable12] Fix AppPassword 2FA auth
 2017-09-12 23:23:46 +02:00
Roeland Jago Douma
ab50f0b1de
Fix AppPassword 2FA auth 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-12 22:35:16 +02:00
Lukas Reschke
48372f9108
v12.0.3RC2 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-12 22:11:17 +02:00
Morris Jobke
499699f37b Merge pull request #6466 from nextcloud/12-0-3-rc1 
12.0.3 RC1
 2017-09-12 16:12:06 +02:00
Lukas Reschke
9dbb77b5e6
12.0.3 RC1 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-09-12 14:46:18 +02:00
Morris Jobke
cb6178b828 Merge pull request #6443 from nextcloud/backport-6064-absolute-path-must-be-relative-to-files-on-theming-update 
[stable12] Still throw a locked exception when the path is not relative to $user/files/
 2017-09-12 10:03:29 +02:00
Morris Jobke
c1690da20b Merge pull request #6444 from nextcloud/backport-6351-sql-syntax-on-caldav 
[stable12] not to backquote LIMIT on CalDavBackend.php
 2017-09-12 09:43:24 +02:00
Morris Jobke
5981027f82 Merge pull request #6359 from nextcloud/12-6082 
[stable12] Use separate element color in theming
 2017-09-12 09:41:10 +02:00
Morris Jobke
3aae3a54e5 Merge pull request #6446 from nextcloud/backport-6414-share-notification-wrong-language 
[stable12] Use the language of the recipient for the share notification
 2017-09-12 09:40:19 +02:00
Nextcloud bot
c58fdad3de
[tx-robot] updated from transifex 2017-09-12 00:08:34 +00:00
Morris Jobke
0c43183ac9 Merge pull request #6442 from nextcloud/backport-6416-make-sure-sqlite-works-without-content 
[stable12] Ask the schema whether the table and column exist
 2017-09-11 23:20:58 +02:00
Morris Jobke
c81829fd74 Merge pull request #6427 from nextcloud/backport-to-fix-popover-hovering 
[stable12] Fix hovering on all popover types
 2017-09-11 23:11:40 +02:00
Morris Jobke
0c3c145b90 Merge pull request #6441 from nextcloud/backport-6369-missing-translations-of-comment-activity-in-email 
[stable12] Allow translations of the comments activity in the emails too
 2017-09-11 23:09:56 +02:00
Morris Jobke
9d7b21efb8 Merge pull request #6440 from nextcloud/stable12-session-timeout-refresh-csrf-token 
[stable12] Fix failing csp/nonce check due to timed out session
 2017-09-11 22:34:37 +02:00
Joas Schilling
2a6855a76d
Use the language of the recipient for the share notification 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-11 11:28:20 +02:00
nhirokinet
2eaee586c7
not to backquote LIMIT on CalDavBackend.php 2017-09-11 11:21:43 +02:00
Joas Schilling
d25ea6ae1c
Don't lock in the appdata_ directory 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-11 11:18:56 +02:00
Joas Schilling
9cae892974
Still throw a locked exception when the path is not relative to $user/files/ 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-11 11:18:47 +02:00
Joas Schilling
e88a4a0b3d
Fix Nextcloud 12 compatibility 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-11 11:14:33 +02:00
Joas Schilling
6fd01c3993
Ask the schema whether the table and column exist 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-11 11:08:58 +02:00
Joas Schilling
206c4da149
Allow translations of the comments activity in the emails too 
Message and object data is not available on emails atm,
so we can not use them either...

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-11 11:05:06 +02:00
Christoph Wurst
55c7aa674c
Fix failing csp/nonce check due to timed out session 
The CSP nonce is based on the CSRF token. This token does not change,
unless you log in (or out). In case of the session data being lost,
e.g. because php gets rid of old sessions, a new CSRF token is gen-
erated. While this is fine in theory, it actually caused some annoying
problems where the browser restored a tab and Nextcloud js was blocked
due to an outdated nonce.
The main problem here is that, while processing the request, we write
out security headers relatively early. At that point the CSRF token
is known/generated and transformed into a CSP nonce. During this request,
however, we also log the user in because the session information was
lost. At that point we also refresh the CSRF token, which eventually
causes the browser to block any scripts as the nonce in the header
does not match the one which is used to include scripts.
This patch adds a flag to indicate whether the CSRF token should be
refreshed or not. It is assumed that refreshing is only necessary
if we want to re-generate the session id too. To my knowledge, this
case only happens on fresh logins, not when we recover from a deleted
session file.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-09-11 10:08:06 +02:00
Nextcloud bot
b7768ac11d
[tx-robot] updated from transifex 2017-09-11 00:08:28 +00:00
Nextcloud bot
985cbc6b33
[tx-robot] updated from transifex 2017-09-10 00:08:33 +00:00
John Molakvoæ (skjnldsv)
4baae80d98
Fix hovering on all popover types 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-09 14:05:51 +02:00
Nextcloud bot
79c0d69844
[tx-robot] updated from transifex 2017-09-09 00:08:30 +00:00
Morris Jobke
85633784d3 Merge pull request #6421 from nextcloud/12-6419 
[stable12] Use tmpfs for mysql CI containers
 2017-09-08 16:58:49 +02:00