Commit graph

22976 commits

Author SHA1 Message Date
Andy Scherzinger
e6b5fd7a0e
Merge pull request #12535 from nextcloud/bug/12475/improveTranslation
Replace ampersand with "and"
2024-02-12 11:10:25 +01:00
Andy Scherzinger
b01b3a4ded replace ampersand with "and"
Resolves #12475

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-12 10:23:32 +01:00
Andy Scherzinger
2812b3b5e1
Merge pull request #12492 from nextcloud/renovate/workruntime
Update workRuntime to v2.9.0
2024-02-12 10:22:25 +01:00
Andy Scherzinger
28b2176dc9
replace ampersand with "and"
Resolves #12475

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-12 09:54:01 +01:00
Nextcloud bot
3e53131e5c
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-02-12 02:37:27 +00:00
Andy Scherzinger
01818b97be
name parameters for worker tests due to new kotlin-based interface
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-11 16:44:56 +01:00
Andy Scherzinger
fc4c3aa5fb
Update dependency meta data
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-11 16:44:56 +01:00
renovate[bot]
df4eea331b
Update workRuntime to v2.9.0 2024-02-11 16:44:55 +01:00
Andy Scherzinger
c11ad4c8a3
Merge pull request #12533 from nextcloud/chore/noid/metadataLib
Update library meta data
2024-02-11 14:38:56 +01:00
Andy Scherzinger
10b87b9d9c
Update library meta data
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-11 14:20:26 +01:00
Nextcloud bot
afd3643db6
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-02-11 02:40:19 +00:00
Andy Scherzinger
308d2f3b66
Merge pull request #12531 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2024-02-10 20:05:21 +01:00
nextcloud-android-bot
463c5ae4db 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2024-02-10 19:03:49 +00:00
Andy Scherzinger
23f94b07aa
Merge pull request #12530 from nextcloud/chore/noid/dependabot
remove dependabot due to switch to renovatebot
2024-02-10 19:30:44 +01:00
Andy Scherzinger
9e119e0c30
remove dependabot due to switch to renovatebot
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-10 19:30:18 +01:00
Andy Scherzinger
7c471ef219
Merge pull request #12529 from nextcloud/chore/noid/metadata
Update to latest lib snapshot metadata
2024-02-10 19:09:25 +01:00
Andy Scherzinger
ffc52fd544
Update to latest lib snapshot metadata
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-10 19:08:39 +01:00
Nextcloud bot
604809591b
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-02-10 02:49:53 +00:00
Tobias Kaminsky
ae40dbe011
Merge pull request #12473 from nextcloud/personalView
Personal view
2024-02-09 10:00:28 +01:00
tobiasKaminsky
998d46da67
Personal view
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-02-09 07:32:45 +01:00
Nextcloud bot
89268ad5e5
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-02-09 02:38:18 +00:00
Andy Scherzinger
f7b34552af
Merge pull request #12515 from nextcloud/renovate/org.json-json-20240205.x
Update dependency org.json:json to v20240205
2024-02-09 00:05:49 +01:00
renovate[bot]
4f45ec7c11
Update dependency org.json:json to v20240205 2024-02-08 23:58:11 +01:00
Andy Scherzinger
744aa7572e
Merge pull request #12525 from nextcloud/chore/niod/metadata
Add httpclient dependency keys
2024-02-08 23:56:42 +01:00
Andy Scherzinger
8b360f42bc
Further lib version meta data
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-08 23:01:17 +01:00
Andy Scherzinger
64b8163303
Added key for dependency
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-08 22:37:35 +01:00
Andy Scherzinger
7f8dbdbfc2
Merge pull request #12521 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2024-02-08 08:14:24 +01:00
Tobias Kaminsky
d499675303
Merge pull request #12413 from nextcloud/11974-excessive-file-upload-conflicts-after-update-to-3260-not-before
Remove user notification for autoupload edge cases
2024-02-08 07:10:07 +01:00
nextcloud-android-bot
ae7246b2cf 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2024-02-08 02:17:07 +00:00
Andy Scherzinger
83c71e00ce
Merge pull request #12517 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
2024-02-08 00:31:05 +01:00
Jonas Mayer
1329a88cee Update app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Jonas Mayer <43114340+JonasMayerDev@users.noreply.github.com>
2024-02-07 15:05:29 +01:00
Jonas Mayer
1048fb34df Redo changes, manuel rebase
Signed-off-by: Jonas Mayer <jonas.a.mayer@gmx.net>
2024-02-07 15:05:29 +01:00
Nextcloud bot
838197fcc3
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-02-07 02:37:50 +00:00
nextcloud-android-bot
cfe012d508 🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
2024-02-07 02:16:45 +00:00
Andy Scherzinger
7f6815d56b
Merge pull request #12514 from nextcloud/renovate/actions-upload-artifact-4.x
Update actions/upload-artifact action to v4.3.1
2024-02-06 18:04:02 +01:00
Andy Scherzinger
67ac9e11a0
Merge pull request #12512 from nextcloud/qaFails
Fix QA failure
2024-02-06 14:28:28 +01:00
renovate[bot]
11414daa23
Update actions/upload-artifact action to v4.3.1 2024-02-06 11:39:09 +00:00
tobiasKaminsky
d3c8e8cc1f
remove NDK
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-02-06 12:01:02 +01:00
tobiasKaminsky
cb9843be4f
Fail QA failure
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2024-02-06 10:57:53 +01:00
Andy Scherzinger
d0d99953e4
Merge pull request #12470 from nextcloud/renovate/org.json-json-20231013.x
Update dependency org.json:json to v20231013
2024-02-05 23:53:06 +01:00
Nextcloud bot
633ff69d55
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2024-02-05 02:37:48 +00:00
Andy Scherzinger
32f0e169e5
Update dependency meta data
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-05 00:05:45 +01:00
renovate[bot]
413c4c49ba Update dependency org.json:json to v20231013 2024-02-04 21:30:00 +01:00
Andy Scherzinger
5137c16762
Merge pull request #12493 from nextcloud/renovate/org.objenesis-objenesis-3.x
Update dependency org.objenesis:objenesis to v3
2024-02-04 21:23:59 +01:00
Andy Scherzinger
89a76c432c
Merge pull request #12471 from nextcloud/renovate/com.vanniktech-emoji-google-0.x
Update dependency com.vanniktech:emoji-google to v0.18.0
2024-02-04 21:21:06 +01:00
Andy Scherzinger
bed6f9ae39 Update dependency meta data
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-04 20:12:58 +01:00
renovate[bot]
b9b2ae8791 Update dependency com.vanniktech:emoji-google to v0.18.0 2024-02-04 20:12:58 +01:00
Andy Scherzinger
9edc045458
Merge pull request #12472 from nextcloud/renovate/io.coil-kt-coil-2.x
Update dependency io.coil-kt:coil to v2.5.0
2024-02-04 20:11:46 +01:00
Andy Scherzinger
72c5bfd873
Update dependency meta data
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
2024-02-04 19:37:04 +01:00
renovate[bot]
02ee1d74d7
Update dependency io.coil-kt:coil to v2.5.0 2024-02-04 19:23:06 +01:00