Tobias Kaminsky
|
0cafdefeb4
|
daily dev 20231209
Update Nextcloud Android library
|
2023-12-09 03:41:11 +01:00 |
|
Tobias Kaminsky
|
d28d57ebb9
|
Merge remote-tracking branch 'origin/master' into dev
|
2023-12-09 03:36:00 +01:00 |
|
Tobias Kaminsky
|
fa07aad858
|
Merge pull request #12139 from nextcloud/feature/live-photo
Live Photo
|
2023-12-08 14:17:54 +01:00 |
|
alperozturk
|
633f45863b
|
Fix tests
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-08 12:41:10 +01:00 |
|
alperozturk
|
7719b2eb76
|
Use file id for merging live photos
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-08 12:35:51 +01:00 |
|
alperozturk
|
b48c027fca
|
Use file id for merging live photos
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-08 11:47:43 +01:00 |
|
Andy Scherzinger
|
0df687cb1d
|
Merge pull request #12255 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
|
2023-12-08 11:01:34 +01:00 |
|
nextcloud-android-bot
|
f4322957ed
|
🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
|
2023-12-08 08:54:28 +00:00 |
|
Alper Öztürk
|
73ef692040
|
Merge pull request #12247 from nextcloud/10954-upload-progress-not-shown-in-uploads-screen-with-new-uploader
Implement other interface functions regarding file upload for upload worker
|
2023-12-08 09:18:08 +01:00 |
|
Tobias Kaminsky
|
c6eedd8e2c
|
daily dev 20231208
Update Nextcloud Android library
|
2023-12-08 03:41:58 +01:00 |
|
Tobias Kaminsky
|
b36caee4c7
|
Merge remote-tracking branch 'origin/master' into dev
|
2023-12-08 03:36:42 +01:00 |
|
Nextcloud bot
|
13c6766669
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2023-12-08 02:35:27 +00:00 |
|
Nextcloud bot
|
3beca30432
|
Fix(l10n): Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2023-12-08 02:34:59 +00:00 |
|
Jonas Mayer
|
c698a2191a
|
Fix spotbugs
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
|
2023-12-07 17:14:06 +01:00 |
|
Jonas Mayer
|
ad34893419
|
isUploadingNow for uploads after file conflict resolved
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
|
2023-12-07 16:56:41 +01:00 |
|
github-actions
|
6f1b62fa27
|
Analysis: update lint results to reflect reduced error/warning count
Signed-off-by: github-actions <github-actions@github.com>
|
2023-12-07 14:17:21 +00:00 |
|
Jonas Mayer
|
1d2a7c9d53
|
fix kotlin spotlessCheck
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
|
2023-12-07 15:04:42 +01:00 |
|
Jonas Mayer
|
8e141506ec
|
implement isUploading for Upload Worker
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
|
2023-12-07 15:04:42 +01:00 |
|
Jonas Mayer
|
f65601f69f
|
update other binder functions for use with file upload worker -> working progress bar
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
|
2023-12-07 15:04:42 +01:00 |
|
Jonas Mayer
|
4f08a4737b
|
add onTransferProgress for FilesUploadWorker
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
|
2023-12-07 15:04:42 +01:00 |
|
alperozturk
|
7f70b1c0ea
|
Solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 15:04:10 +01:00 |
|
Alper Öztürk
|
3b3bf800f7
|
Merge pull request #12238 from nextcloud/refactor/use-service-compat
Use ServiceCompat For Foreground Service
|
2023-12-07 14:41:43 +01:00 |
|
alperozturk
|
5cc6d2e729
|
Merge remote-tracking branch 'origin/refactor/use-service-compat' into refactor/use-service-compat
|
2023-12-07 10:28:25 +01:00 |
|
alperozturk
|
8ebdecf399
|
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:28:20 +01:00 |
|
alperozturk
|
9202f62f4c
|
Reset license header
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:28:11 +01:00 |
|
github-actions
|
9f8f5edfeb
|
Analysis: update lint results to reflect reduced error/warning count
Signed-off-by: github-actions <github-actions@github.com>
|
2023-12-07 10:28:11 +01:00 |
|
alperozturk
|
262be95387
|
Rename function
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:28:10 +01:00 |
|
alperozturk
|
235d7418cd
|
Simplify code complexity
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:28:10 +01:00 |
|
alperozturk
|
81cb6933be
|
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:28:06 +01:00 |
|
Alper Öztürk
|
67e9ee41cd
|
Merge pull request #12218 from nextcloud/bugfix/app-crash-when-file-is-renamed-via-details-view
Fix Crash / Rename File From File Details
|
2023-12-07 09:50:16 +01:00 |
|
alperozturk
|
0028d8ecbd
|
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 09:10:50 +01:00 |
|
Nextcloud bot
|
c5eaf11dff
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2023-12-07 02:35:44 +00:00 |
|
Nextcloud bot
|
e9ea441b5f
|
Fix(l10n): Update Transifex configuration
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2023-12-07 02:35:16 +00:00 |
|
Tobias Kaminsky
|
4b41f483be
|
daily dev 20231207
|
2023-12-07 02:40:45 +01:00 |
|
Tobias Kaminsky
|
4ee92c635d
|
Merge remote-tracking branch 'origin/master' into dev
|
2023-12-07 02:30:58 +01:00 |
|
Andy Scherzinger
|
2b166a81eb
|
Merge pull request #12226 from nextcloud/fix-options-menu
Fix: ImageActivity crash after options menu selected
|
2023-12-06 19:37:16 +01:00 |
|
alperozturk
|
2077bf96bc
|
Fix text color for live photo indicator
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 16:06:22 +01:00 |
|
alperozturk
|
d6657c90b3
|
Merge remote-tracking branch 'origin/feature/live-photo' into feature/live-photo
|
2023-12-06 15:53:51 +01:00 |
|
alperozturk
|
b493c6793e
|
Fix crashes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 15:53:45 +01:00 |
|
Andy Scherzinger
|
6acd893ee1
|
Merge pull request #12212 from nextcloud/fix/quota_exceeded_message_uploadlist
Use custom quota exceeded error message in UploadList
|
2023-12-06 15:46:23 +01:00 |
|
alperozturk
|
5adc69421c
|
Reduce spotbugs
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 15:38:08 +01:00 |
|
alperozturk
|
0b351d2e0e
|
Fix crash
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 15:38:08 +01:00 |
|
parneet-guraya
|
25d045f9a9
|
fix activity crash on options menu selected
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
|
2023-12-06 15:37:17 +01:00 |
|
Andy Scherzinger
|
79aceb8990
|
Merge pull request #11948 from nextcloud/hideSecureShare
if e2e server app is disabled, do not show secure file drop
|
2023-12-06 15:35:57 +01:00 |
|
github-actions
|
2eb8245b3a
|
Analysis: update lint results to reflect reduced error/warning count
Signed-off-by: github-actions <github-actions@github.com>
|
2023-12-06 14:35:50 +00:00 |
|
alperozturk
|
2f1e3ea2b4
|
Fix merge conflict
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 15:27:48 +01:00 |
|
alperozturk
|
28d4220e67
|
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 14:37:33 +01:00 |
|
alperozturk
|
6854c93815
|
Reset license header
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 14:37:00 +01:00 |
|
Andy Scherzinger
|
72dae180c1
|
Merge pull request #12241 from nextcloud/chore/revertMerge
Revert "Merge pull request #12228
|
2023-12-06 14:27:22 +01:00 |
|
Andy Scherzinger
|
ad820fcc08
|
Revert "Merge pull request #12228 from nextcloud/feature/better-feedback-for-failed-uploads"
This reverts commit f71d5a4aee, reversing
changes made to d3906c0f45.
|
2023-12-06 14:09:01 +01:00 |
|