Commit Graph

18130 Commits

Author SHA1 Message Date
Matthieu Gallien 5dfc0caab6
prepare relase 3.6.1
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-18 12:16:17 +02:00
Matthieu Gallien df05b9b5e8
Merge pull request #5063 from nextcloud/backport/4960/stable-3.6
[stable-3.6] Ensure placeholder message in emoji picker wraps correctly
2022-10-18 12:13:02 +02:00
Claudio Cambra 7f2bdf4dfa Ensure placeholder message in emoji picker wraps correctly
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
2022-10-18 12:12:55 +02:00
Matthieu Gallien 4199b4c7a5
Merge pull request #5061 from nextcloud/backport/4970/stable-3.6
[stable-3.6] Improve handling of file name clashes
2022-10-18 12:09:33 +02:00
Claudio Cambra de51c59a81 Clicking on file name clash activities now opens file in web UI were the clash can be resolved
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
2022-10-18 12:02:01 +02:00
Claudio Cambra 1153e991a2 Categorise file name clash sync file issues as separate FileNameClash enum treated as warning
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
2022-10-18 12:02:01 +02:00
Matthieu Gallien 957dfa8cc3
Merge pull request #5059 from nextcloud/backport/4986/stable-3.6
[stable-3.6] Fix sync progress bar colours in dark mode
2022-10-18 12:00:10 +02:00
Claudio Cambra 5daac49a9d Fix sync progress bar colours in dark mode
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
2022-10-18 12:00:01 +02:00
Matthieu Gallien 6a4b83e390
Merge pull request #5058 from nextcloud/backport/4987/stable-3.6
[stable-3.6] Fix predefined status text formatting
2022-10-18 11:59:24 +02:00
Claudio Cambra 426e6cd5e1 Fix predefined status text formatting
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
2022-10-18 11:59:15 +02:00
Matthieu Gallien e13b7fa747
Merge pull request #5053 from nextcloud/backport/4979/stable-3.6
[stable-3.6] use correct version copmparison on NSIS updater: fix update from rc
2022-10-18 11:58:49 +02:00
Matthieu Gallien b66733049f fix review comments
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-18 11:51:06 +02:00
Matthieu Gallien 578b4dcf13 use correct version copmparison on NSIS updater: fix update from rc
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-18 11:51:06 +02:00
Matthieu Gallien a9f749f297 remove support for skipping an update: hard to understand for users
skiping an update is probably there for historical reasons to work
around broken updates in the past

this can lead to users not getting an update they should be getting

this can elad to user confusion and the current user interaction is
broken if you do not go read the settings file with a text editor

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-18 11:51:06 +02:00
Matthieu Gallien 0843676b12
Merge pull request #5052 from nextcloud/backport/4989/stable-3.6
Backport/4989/stable 3.6
2022-10-18 11:50:51 +02:00
Camila 87509de0b4 Update tests.
Signed-off-by: Camila <hello@camila.codes>
2022-10-18 11:42:06 +02:00
Camila 8aff1ab76d The dismiss button is now a CustomButton component.
Signed-off-by: Camila <hello@camila.codes>
2022-10-18 11:42:06 +02:00
Camila 234e9adeb4 Fix the dismiss button: display it whenever possible.
Signed-off-by: Camila <hello@camila.codes>
2022-10-18 11:42:06 +02:00
Matthieu Gallien cdac0f7755
Merge pull request #5057 from nextcloud/backport/4961/stable-3.6
Fix two factor auth notification: activity item was disabled.
2022-10-18 11:41:51 +02:00
Camila 97d24c8238 Fix two factor auth notification: activity item was disabled.
User couldn't click on the links.

Signed-off-by: Camila <hello@camila.codes>
2022-10-18 11:31:54 +02:00
Matthieu Gallien 089c5528cd
Merge pull request #5056 from nextcloud/backport/5040/stable-3.6
Fix account not found when doing local file editing.
2022-10-18 11:31:39 +02:00
alex-z 66df2a20a5
Fix account not found when doing local file editing.
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-10-18 11:09:25 +02:00
Matthieu Gallien cae4b450ac
Merge pull request #5055 from nextcloud/backport/5039/bugfix/checkTokenForEditLocallyRequests
Backport/5039/bugfix/check token for edit locally requests
2022-10-18 11:06:03 +02:00
Matthieu Gallien 2f6b56748a
edit locally requires a valid token
check on server that the token received during a request to open a local
file is indeed a valid one

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-18 10:54:56 +02:00
Matthieu Gallien 704c96de70
makes JsonApiJob share common code with SimpleApiJob
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-18 10:49:20 +02:00
Matthieu Gallien fa128168d4
introduce a very simple network job to do API requests
Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
2022-10-18 10:49:20 +02:00
Matthieu Gallien 5e74005cd2
Merge pull request #5054 from nextcloud/backport/4990/stable-3.6
Improve 'Handle local file editing' feature. Add loading popup. Add f…
2022-10-18 10:48:33 +02:00
alex-z 1e50bd07b0 Improve 'Handle local file editing' feature. Add loading popup. Add force sync before opening a file.'
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-10-18 10:48:16 +02:00
Claudio Cambra 616c85f30f
Merge pull request #5048 from nextcloud/backport/4982/stable-3.6 2022-10-18 10:46:58 +02:00
Claudio Cambra a834ac6d16 Fix link shares default expire date being enforced as maximum expire date even when maximum date enforcement is disabled on the server
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
2022-10-18 08:19:18 +00:00
Nextcloud bot 96c7bfea83
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-18 03:20:35 +00:00
allexzander af70e81312 Revert "Change CPP version to ++17"
This reverts commit 3af665a4d3.
2022-10-17 19:31:46 +03:00
alex-z 3af665a4d3 Change CPP version to ++17
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-10-17 16:36:18 +03:00
Nextcloud bot 09ce961382
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-17 03:19:18 +00:00
Nextcloud bot cf8b465264
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-16 03:19:05 +00:00
Nextcloud bot f80b7ca3f8
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-15 03:19:12 +00:00
Nextcloud bot 010c03ae5c
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-14 03:23:42 +00:00
Nextcloud bot 2a6727cbf7
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-13 03:18:48 +00:00
Claudio Cambra da2d9e9f08
Merge pull request #5037 from nextcloud/backport/5012/stable-3.6
[stable-3.6] Fix invisible user status selector button not being checked when user is in Offline mode
2022-10-12 12:02:04 +02:00
Claudio Cambra 00f354951c Fix invisible user status selector button not being checked when user is in Offline mode
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
2022-10-12 10:01:11 +00:00
Nextcloud bot f83fc2d756
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-12 03:18:51 +00:00
allexzander bfab3580de
Merge pull request #5030 from nextcloud/backport/5022/stable-3.6
[stable-3.6] Command-line client. Do not trust SSL certificates by default, unless '--trust' option is set.
2022-10-11 14:19:21 +03:00
alex-z 1f5498c439 Fix error in logic.
Signed-off-by: alex-z <blackslayer4@gmail.com>
2022-10-11 11:17:36 +00:00
allexzander 6047bb0751 Command-line client. Do not trust SSL certificates by default, unlss '--trust' option is set.
Signed-off-by: allexzander <blackslayer4@gmail.com>
2022-10-11 11:17:35 +00:00
Nextcloud bot d9ed21f472
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-11 03:16:56 +00:00
Nextcloud bot 60858b1223
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-10 03:23:46 +00:00
Nextcloud bot a0d571dc0b
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-09 03:34:38 +00:00
Nextcloud bot ef7a79d6e0
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-08 03:19:15 +00:00
Nextcloud bot ae466ba029
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2022-10-07 13:36:40 +00:00
Tobias Kaminsky 081e7494c0
Merge pull request #5020 from nextcloud/backport/5019/stable-3.6
[stable-3.6] Update after tx migrate
2022-10-07 15:34:22 +02:00