Commit graph

25242 commits

Author SHA1 Message Date
Andy Scherzinger
61a79f1d24
Merge pull request #13268 from nextcloud/automated/update-workflows/default
chore: update workflows from templates
2024-07-13 14:24:59 +02:00
Andy Scherzinger
9ba99ed8e1
Merge pull request #13267 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2024-07-13 14:21:39 +02:00
skjnldsv
13a32997bf chore: update workflows from templates
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>
2024-07-13 10:12:11 +02:00
Nextcloud bot
22ecfcf1a2
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-13 02:43:31 +00:00
nextcloud-android-bot
61af727d4f 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2024-07-13 02:30:13 +00:00
Tobias Kaminsky
4c1c6f1bf4 daily dev 20240713 2024-07-13 02:37:27 +02:00
Tobias Kaminsky
0f97906ec7 Merge remote-tracking branch 'origin/master' into dev 2024-07-13 02:31:02 +02:00
Andy Scherzinger
666a4188a5
Merge pull request #13254 from nextcloud/bugfix/e2e-file-conflict-duplicated-files
Bug-Fix E2E File Conflict Duplicated Files
2024-07-12 13:22:15 +02:00
Alper Öztürk
94f962f09d
Merge pull request #13246 from nextcloud/bugfix-choose-template-dialog
Bug-Fix & Convert to Kotlin Choose Template Dialog
2024-07-12 10:21:24 +02:00
alperozturk
f245e36ce4 Update license
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 09:03:04 +02:00
github-actions
c67442e529 Analysis: update lint results to reflect reduced error/warning count
Signed-off-by: github-actions <github-actions@github.com>
2024-07-12 09:03:04 +02:00
alperozturk
8e746617f2 Fix and convert to kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 09:03:04 +02:00
alperozturk
7a9a92b845 Rename .java to .kt
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 09:03:04 +02:00
alperozturk
d9a24d6257
Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:59:51 +02:00
alperozturk
8a54508dc2 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
7fcb689634 Do the remove operation inside the upload file operations only for encrypted folder
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
fd6cdbdf44 Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
45ca46557a Check parent folder
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
11cc3cdc63 Add documentation
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
4ffa1891e1 Better naming
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
47cd4b2fd5 Adopt to async execution
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
alperozturk
bc563681b4 removeAnyOtherFileHaveSameName
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-12 08:55:50 +02:00
Alper Öztürk
dad6486a06
Merge pull request #13255 from nextcloud/13035-only-pictures-are-enabled-but-videos-also-auto-synced
Check for right media type in auto upload
2024-07-12 08:55:32 +02:00
Nextcloud bot
b2da0cdfb7
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-12 02:41:27 +00:00
Jonas Mayer
86ddaa3b5b Merge remote-tracking branch 'origin/13035-only-pictures-are-enabled-but-videos-also-auto-synced' into 13035-only-pictures-are-enabled-but-videos-also-auto-synced
# Conflicts:
#	app/src/main/java/com/owncloud/android/datamodel/SyncedFolder.java
2024-07-11 18:24:31 +02:00
Jonas Mayer
55526cb5cc renamed containsFile function
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-11 18:15:19 +02:00
Jonas Mayer
700dd54014 Check for right media type
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-09 17:10:31 +02:00
Nextcloud bot
ea5046ac71
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-09 02:40:04 +00:00
Tobias Kaminsky
d46c7b8154 daily dev 20240709 2024-07-09 02:37:19 +02:00
Tobias Kaminsky
3b57d5085a Merge remote-tracking branch 'origin/master' into dev 2024-07-09 02:31:08 +02:00
Alper Öztürk
c6c96ca25a
Merge pull request #13248 from nextcloud/bugfix/set-default-account
Bug-Fix Set Default Account Instead Using Lateinit Variable
2024-07-08 18:28:25 +02:00
Alper Öztürk
b98c6aa9c6
Merge pull request #13250 from nextcloud/bugfix/extended-list-fragment
Bug-Fix Extended List Fragment NPE
2024-07-08 18:28:00 +02:00
alperozturk
a2f8264396
Remove deprecated function and replace with onViewCreated
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:25:57 +02:00
alperozturk
96fee3e8ed
Fix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:23:23 +02:00
alperozturk
4a5eb4c66e
Fix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:11:08 +02:00
alperozturk
f27fb2186e
Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:06:29 +02:00
alperozturk
d982ae2e7a
Fix test
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 15:05:55 +02:00
alperozturk
e839759bd4 Fix
Signed-off-by: alperozturk <alper_ozturk@proton.me>
2024-07-08 14:23:55 +02:00
Tobias Kaminsky
401c3a4ac4
Merge pull request #13247 from nextcloud/reloadDirectEditing
Reload rich document edition on reload event from webview (triggered …
2024-07-08 14:06:07 +02:00
nicofrand
34f168280e
Reload rich document edition on reload event from webview (triggered on session expiration)
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-07-08 13:01:00 +02:00
Jonas Mayer
3db4443e9f Check for right media type
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-07-08 12:00:31 +02:00
Nextcloud bot
28d3891f65
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-07-08 02:41:11 +00:00
Andy Scherzinger
afc2740418
Merge pull request #13243 from nextcloud/chore/noid/reuse-toml
Migrate REUSE to TOML format
2024-07-07 18:49:50 +02:00
Andy Scherzinger
424c5fd9bd
chore: Migrate REUSE to TOML format
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-07-07 18:47:06 +02:00
Andy Scherzinger
69b4a3b395
Merge pull request #13242 from nextcloud/update-library-2024-07-07
Update library to 2024-07-07
2024-07-07 10:26:22 +02:00
Tobias Kaminsky
2e1cce00c0 Update library to 2024-07-07
Signed-off-by: Tobias Kaminsky <tobias@kaminsky.me>
2024-07-07 00:03:21 +02:00
Tobias Kaminsky
a4952752f6 daily dev 20240706 2024-07-06 02:36:56 +02:00
Tobias Kaminsky
63cdd63874 Merge remote-tracking branch 'origin/master' into dev 2024-07-06 02:30:54 +02:00
Andy Scherzinger
4e724ada4c
Merge pull request #13236 from nextcloud/renovate/androidx.lifecycle-lifecycle-viewmodel-ktx-2.x
fix(deps): update dependency androidx.lifecycle:lifecycle-viewmodel-ktx to v2.8.3
2024-07-05 20:25:07 +02:00
renovate[bot]
dfe06650c2
fix(deps): update dependency androidx.lifecycle:lifecycle-viewmodel-ktx to v2.8.3
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-05 16:24:55 +00:00