Commit graph

64838 commits

Author SHA1 Message Date
Pytal
e4f6bfe42f
Merge pull request #35639 from nextcloud/backport/35222/stable25
[stable25] Fix contrast of global search headings
2022-12-08 18:08:44 -08:00
Christopher Ng
928db64213 Fix contrast of global search headings
Signed-off-by: Christopher Ng <chrng8@gmail.com>
(cherry picked from commit 29b1748e2c)
2022-12-08 17:57:16 +00:00
Simon L
978d669b0e
Merge pull request #35517 from nextcloud/backport/35484/stable25
[stable25] fix the popovermenu
2022-12-08 18:39:02 +01:00
Simon L
d4b4135c16 try to fix the popovermenu
Signed-off-by: Simon L <szaimen@e.mail.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
2022-12-08 14:38:57 +00:00
blizzz
9c791972de
Merge pull request #35669 from nextcloud/release/25.0.2
25.0.2
2022-12-08 12:25:27 +01:00
Arthur Schiwon
6696249a0b
25.0.2
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2022-12-08 10:32:55 +01:00
Nextcloud bot
4c4095a848
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-08 02:19:37 +00:00
Nextcloud bot
5d9f78ab08
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-07 02:19:55 +00:00
blizzz
e4e9c87eec
Merge pull request #35623 from nextcloud/release/25.0.2_rc3
25.0.2 RC3
2022-12-06 15:27:56 +01:00
Arthur Schiwon
7b601a3759
25.0.2 RC3
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2022-12-06 15:08:11 +01:00
Vincent Petry
5bc2154bf0
Merge pull request #35616 from nextcloud/backport/fix/empty-secret-migration-files-external
[stable25] Fix migration to non-empty secret
2022-12-06 15:04:25 +01:00
Carl Schwan
1c558d2f15 Add comments
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
(cherry picked from commit 5e31ed4f52)
2022-12-06 09:00:45 +01:00
Carl Schwan
40f01de456 Fix migration to non-empty secret
Add a fallback for empty keys

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
(cherry picked from commit 754cb58b12)
2022-12-06 09:00:45 +01:00
Nextcloud bot
987b59b006
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-06 02:26:14 +00:00
Vincent Petry
9eb99ecbab
Merge pull request #35605 from nextcloud/backport/stable25/31499
[stable25]  Add fallback routines for empty secret cases
2022-12-05 20:02:00 +01:00
Carl Schwan
7416f44dbc Mark method as deprecated
Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
(cherry picked from commit ef31396727)
2022-12-05 16:10:55 +00:00
Carl Schwan
1d33d37bf2 Fix unit tests
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
(cherry picked from commit 01e2a26749)
2022-12-05 16:10:55 +00:00
Julius Härtl
0f7260de03 Fix decryption fallback after adding a secret
Signed-off-by: Julius Härtl <jus@bitgrid.net>
(cherry picked from commit a6796b4247)
2022-12-05 16:10:55 +00:00
Julius Härtl
3ebf7b818b Rotate token after fallback
Signed-off-by: Julius Härtl <jus@bitgrid.net>
(cherry picked from commit 553cb499b2)
2022-12-05 16:10:55 +00:00
Julius Härtl
e4735ea580 Add fallback routines for empty secret cases
Signed-off-by: Julius Härtl <jus@bitgrid.net>
(cherry picked from commit 81f8719cc0)
2022-12-05 16:10:55 +00:00
Simon L
c779928143
Merge pull request #35606 from nextcloud/backport/35580/stable25
[stable25] downgrade ubuntu in order to fix CI
2022-12-05 16:52:34 +01:00
Simon L
d9226608b4 downgrade ubuntu in order to fix CI
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-12-05 15:23:07 +01:00
Nextcloud bot
ad7ddbdec5
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-05 02:15:33 +00:00
Nextcloud bot
9205e01f69
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-04 02:14:58 +00:00
Nextcloud bot
9d68520524
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-03 02:15:15 +00:00
Nextcloud bot
06cc4a0778
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-02 02:15:31 +00:00
blizzz
0f57aba5f6
Merge pull request #35487 from nextcloud/release/25.0.2_rc2
25.0.2 RC2
2022-12-01 10:07:34 +01:00
Nextcloud bot
7bb579d650
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-12-01 02:15:30 +00:00
Nextcloud bot
5936991827
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-30 02:15:41 +00:00
Arthur Schiwon
d76b7fb7fe
25.0.2 RC2
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2022-11-29 13:54:11 +01:00
Vincent Petry
d3e0d989af
Merge pull request #35478 from nextcloud/backport/35471/stable25
[stable25] Allow upgrading from ownCloud 10.11
2022-11-29 11:34:11 +01:00
Vincent Petry
96814dec10 Remove ownCloud 10.5 upgrade path
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2022-11-29 08:57:31 +00:00
Vincent Petry
aeefd41b87 Allow upgrading from ownCloud 10.11
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2022-11-29 08:57:31 +00:00
Nextcloud bot
720c7e4881
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-29 02:14:35 +00:00
Pytal
3c207d9932
Merge pull request #35453 from nextcloud/backport/35434/stable25
[stable25] fix update for 32-bit
2022-11-28 10:42:40 -08:00
Pytal
233ae5a58b
Merge pull request #35454 from nextcloud/revert-35346-backport/35315/stable25
[stable25] Revert "[stable25] Fix border color contrast"
2022-11-28 09:54:52 -08:00
Simon L
5137af7293 Revert "[stable25] Fix theming tests"
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-11-28 11:26:18 +01:00
Simon L
5cfeec8f5d Revert "[stable25] Fix border color contrast"
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-11-28 11:24:05 +01:00
Simon L
f13ffc2a64 fix update for 32-bit
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-11-28 08:47:43 +00:00
Nextcloud bot
723278da5c
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-28 02:19:35 +00:00
Nextcloud bot
2b7ad44c99
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-27 02:18:34 +00:00
Nextcloud bot
e7810fd8cf
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-26 02:18:25 +00:00
blizzz
19833e8b0e
Merge pull request #35305 from nextcloud/release/25.0.2_rc1
25.0.2 RC1
2022-11-25 09:50:21 +01:00
blizzz
e07b8e01af
Merge pull request #35412 from nextcloud/fix/fix-33741-h1_should_instead_be_in_the_app_content-stable25
[stable25] Place ```<h1>``` into main content
2022-11-25 09:47:51 +01:00
Vincent Petry
e58cf22ed6
Merge pull request #35415 from nextcloud/fix/35346/stable25
[stable25] Fix theming tests
2022-11-25 08:58:23 +01:00
Simon L
8480f5ac7a
Merge pull request #35414 from nextcloud/backport/35399/stable25
[stable25] Fix share admin page
2022-11-25 08:49:44 +01:00
Nextcloud bot
3f255ab9ae
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-11-25 02:19:39 +00:00
Christopher Ng
143e603d4e [stable25] Fix theming tests
Signed-off-by: Christopher Ng <chrng8@gmail.com>
2022-11-25 00:52:49 +00:00
Simon L
c2b482693d
Merge pull request #35390 from nextcloud/backport/35370/stable25
[stable25] Fix UX of renaming token
2022-11-25 00:03:08 +01:00
Carl Schwan
0cab937222 Fix share admin page
arrow function don't work that well with jquery

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Simon L <szaimen@e.mail.de>
2022-11-24 22:11:48 +01:00