Commit graph

53475 commits

Author SHA1 Message Date
Andy Scherzinger
feed47e0ff
Merge pull request #39453 from nextcloud/backport/39024/stable18
[stable18] Increase from 100000 to 600000 iterations for hash_pbkdf2
2023-07-31 13:57:15 +02:00
Côme Chilliet
10f3de70a2
Merge pull request #38584 from nextcloud/backport/38206/stable24
[stable24] Increase from 100000 to 600000 iterations for hash_pbkdf2

(cherry picked from commit a7dc41fb5e)
(cherry picked from commit 18de4a2d98)
2023-07-18 11:57:39 +02:00
Vincent Petry
8266ccdca1
Merge pull request #31257 from nextcloud/backport/30114/stable18
[stable18] Prevent writing invalid mtime
2022-02-22 17:19:59 +01:00
John Molakvoæ
8b71f45e4e
Prevent writing invalid mtime
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2022-02-21 14:54:15 +01:00
John Molakvoæ
de83b4b111
Merge pull request #30881 from nextcloud/backport/30844/stable18 2022-01-27 13:54:48 +01:00
John Molakvoæ
6faec2c81a Prevent merging on EOL branches
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2022-01-27 11:58:37 +00:00
Nextcloud bot
77083da332
[tx-robot] updated from transifex 2021-02-01 02:20:05 +00:00
Nextcloud bot
b5ad66705d
[tx-robot] updated from transifex 2021-01-31 02:19:30 +00:00
Nextcloud bot
50071f27e2
[tx-robot] updated from transifex 2021-01-30 02:21:01 +00:00
Nextcloud bot
951dcc15eb
[tx-robot] updated from transifex 2021-01-29 02:21:43 +00:00
Nextcloud bot
0f0e00dca8
[tx-robot] updated from transifex 2021-01-28 02:24:39 +00:00
Nextcloud bot
1870e87464
[tx-robot] updated from transifex 2021-01-27 02:21:15 +00:00
Nextcloud bot
3445a08a56
[tx-robot] updated from transifex 2021-01-26 02:21:59 +00:00
Roeland Jago Douma
84479fe99a
Update version.php 2021-01-25 15:54:12 +01:00
Nextcloud bot
87ecebd037
[tx-robot] updated from transifex 2021-01-25 02:20:58 +00:00
Nextcloud bot
099117ebdc
[tx-robot] updated from transifex 2021-01-24 02:20:12 +00:00
Nextcloud bot
102c221845
[tx-robot] updated from transifex 2021-01-23 02:20:32 +00:00
Nextcloud bot
df5dd2baf8
[tx-robot] updated from transifex 2021-01-22 02:20:23 +00:00
Nextcloud bot
55b395f23b
[tx-robot] updated from transifex 2021-01-21 02:21:04 +00:00
Roeland Jago Douma
3d207f81dc
Merge pull request #25221 from nextcloud/backport/25216/stable18
[stable18] Bump CA bundle
2021-01-20 09:08:08 +01:00
Nextcloud bot
7e8c0082f3
[tx-robot] updated from transifex 2021-01-20 02:21:22 +00:00
Roeland Jago Douma
6ae6587062
Bump CA bundle
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-19 23:06:47 +01:00
Roeland Jago Douma
4fb37abe72
Merge pull request #25206 from nextcloud/version/18.0.14/rc1
18.0.14 RC 1
2021-01-19 15:55:21 +01:00
Morris Jobke
d9cc568cd8
18.0.14 RC 1
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2021-01-19 13:58:30 +01:00
Morris Jobke
3aaff469ee
Merge pull request #25201 from nextcloud/3rdparty/stable18/archive_tar
[stable18] Update 3rdparty after Archive_Tar
2021-01-19 13:57:32 +01:00
Joas Schilling
92e62d086b
Update 3rdparty after Archive_Tar
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-19 11:37:45 +01:00
Nextcloud bot
702ba16f7e
[tx-robot] updated from transifex 2021-01-19 02:21:14 +00:00
Nextcloud bot
cff55f0858
[tx-robot] updated from transifex 2021-01-18 02:19:56 +00:00
Nextcloud bot
c201cf5f11
[tx-robot] updated from transifex 2021-01-17 02:20:23 +00:00
Nextcloud bot
b6f906c536
[tx-robot] updated from transifex 2021-01-15 02:20:53 +00:00
Roeland Jago Douma
37fcc14954
Merge pull request #25104 from nextcloud/version/18.0.13/final
18.0.13
2021-01-14 09:22:05 +01:00
Nextcloud bot
d122807fab
[tx-robot] updated from transifex 2021-01-14 02:19:30 +00:00
Nextcloud bot
442ce2c919
[tx-robot] updated from transifex 2021-01-13 02:20:48 +00:00
Roeland Jago Douma
e2b76cd44d
18.0.13
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2021-01-12 23:06:13 +01:00
Nextcloud bot
8e391f86e3
[tx-robot] updated from transifex 2021-01-12 02:20:18 +00:00
Nextcloud bot
d0a63ad7cd
[tx-robot] updated from transifex 2021-01-11 02:20:22 +00:00
Nextcloud bot
df25f66ce6
[tx-robot] updated from transifex 2021-01-10 02:23:07 +00:00
Nextcloud bot
fe9a0ce36a
[tx-robot] updated from transifex 2021-01-09 02:22:03 +00:00
Nextcloud bot
fe8f095824
[tx-robot] updated from transifex 2021-01-08 02:22:58 +00:00
Roeland Jago Douma
b8635dab14
Merge pull request #24958 from nextcloud/version/18.0.13/rc1
18.0.13 RC1
2021-01-07 14:02:29 +01:00
Morris Jobke
cb73d60110
Merge pull request #24881 from nextcloud/backport/stable18/23017
[stable18] Make share results distinguishable if there are more than one with the exact same display name
2021-01-07 13:40:36 +01:00
Roeland Jago Douma
27b94af521
Merge pull request #24974 from nextcloud/backport/24964/stable18
[stable18] Don't throw a 500 when importing a broken ics reminder file
2021-01-07 09:08:19 +01:00
Nextcloud bot
90c064fb9f
[tx-robot] updated from transifex 2021-01-07 02:21:39 +00:00
Morris Jobke
52ca709d3b
Merge pull request #24992 from nextcloud/backport/24986/stable18
[stable18] Update root.crl due to revocation of transmission.crt
2021-01-06 21:05:58 +01:00
Morris Jobke
a336e2402a Update root.crl due to revocation of transmission.crt
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2021-01-06 19:49:33 +00:00
Nextcloud bot
b66170cc5d
[tx-robot] updated from transifex 2021-01-06 02:20:29 +00:00
blizzz
3549a10260
Merge pull request #24761 from nextcloud/backport/24703/stable18
[stable18] enables the file name check also to match name of mountpoints
2021-01-05 23:36:22 +01:00
Joas Schilling
dc036c6064 Don't throw a 500 when importing a broken ics reminder file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-01-05 12:04:22 +00:00
Julius Härtl
d9dd967b4f
Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 10:09:23 +01:00
Julius Härtl
9fc765ee29
Show unique displayname context in the user share list entries
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-01-05 10:09:23 +01:00