Tobias Kaminsky
|
7148238c7c
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-05-11 03:38:43 +02:00 |
|
Tobias Kaminsky
|
176a09615c
|
Merge pull request #12884 from nextcloud/feature/app-config
App Config With Restriction Manager
|
2024-05-10 15:11:45 +02:00 |
|
tobiasKaminsky
|
1565b32b3c
|
reset proxy
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2024-05-10 09:01:26 +02:00 |
|
Andy Scherzinger
|
e13d243ab0
|
Merge pull request #12996 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
|
2024-05-10 07:19:28 +02:00 |
|
Nextcloud bot
|
9328a9b4ef
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2024-05-10 02:52:13 +00:00 |
|
nextcloud-android-bot
|
546ab5aee6
|
🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
|
2024-05-10 02:28:36 +00:00 |
|
Tobias Kaminsky
|
938dbe56de
|
daily dev 20240510
|
2024-05-10 02:37:28 +02:00 |
|
Tobias Kaminsky
|
6dfc4a361c
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-05-10 02:31:13 +02:00 |
|
Andy Scherzinger
|
f52523c260
|
Merge pull request #12993 from nextcloud/renovate/actions-checkout-4.x
Update actions/checkout action to v4.1.5
|
2024-05-09 13:54:09 +02:00 |
|
renovate[bot]
|
75c18ce8f4
|
Update actions/checkout action to v4.1.5
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
|
2024-05-09 10:18:18 +00:00 |
|
Andy Scherzinger
|
b0eb74bf27
|
Merge pull request #12992 from nextcloud/repo-sync/android-config/master
🔄 synced file(s) with nextcloud/android-config
|
2024-05-09 09:04:11 +02:00 |
|
Nextcloud bot
|
9db2b5c58e
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2024-05-09 02:44:12 +00:00 |
|
nextcloud-android-bot
|
2fe6a6e7f6
|
🔄 synced local '.github/workflows/' with remote 'config/workflows/'
Signed-off-by: nextcloud-android-bot <android@nextcloud.com>
|
2024-05-09 02:26:59 +00:00 |
|
Tobias Kaminsky
|
95be28fb7d
|
daily dev 20240509
Update Nextcloud Android library
|
2024-05-09 03:45:07 +02:00 |
|
Tobias Kaminsky
|
83042c2ffa
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-05-09 03:38:44 +02:00 |
|
Alper Öztürk
|
7492277f59
|
Merge pull request #12950 from nextcloud/feature/media-deletion-on-preview-screen-feedback
Give better feedback to the user for UNHANDLED_HTTP_CODE in PreviewMediaActivity
|
2024-05-08 15:52:34 +02:00 |
|
alperozturk
|
07d30bc70e
|
solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-08 15:08:55 +02:00 |
|
alperozturk
|
64726ba251
|
Use new httpCode instead httpPhrase
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-08 15:08:47 +02:00 |
|
alperozturk
|
6fc5a47b97
|
Use ErrorMessageAdapter
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-08 15:08:46 +02:00 |
|
alperozturk
|
399fdcc159
|
Use httpPhrase
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-08 15:08:46 +02:00 |
|
alperozturk
|
26597284dc
|
Give better feedback to the user for UNHANDLED_HTTP_CODE
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-08 15:08:46 +02:00 |
|
alperozturk
|
a53bd41757
|
Give better feedback to the user for UNHANDLED_HTTP_CODE
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-08 15:08:46 +02:00 |
|
Nextcloud bot
|
033867d149
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2024-05-08 02:48:54 +00:00 |
|
Nextcloud bot
|
a27e94948c
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2024-05-07 02:45:34 +00:00 |
|
Tobias Kaminsky
|
ecc10febf1
|
daily dev 20240507
|
2024-05-07 02:39:53 +02:00 |
|
Tobias Kaminsky
|
fdcd2b8d87
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-05-07 02:31:08 +02:00 |
|
alperozturk
|
51709a040f
|
Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 18:29:41 +02:00 |
|
alperozturk
|
ce0bb853bd
|
Dont set default proxy settings
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
8ed89d750f
|
Fix tests
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
c9b277e731
|
Listen app config changes only for branded plus clients
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
b55962e302
|
init RestrictionsManager only for branded plus clients
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
tobiasKaminsky
|
ba4a61c007
|
abort setting proxy when either host or port is not valid
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
d54c86e625
|
Revert drawer activity header
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
9a0f69ee71
|
Add base url to app_config.xml
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
cf61ce27c2
|
Fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
ad3ec219ac
|
Revert filterAssistantMenuItem usage
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
b7defed16f
|
Revert isBrandedClient checks
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
05ec75be80
|
Add is_branded_plus condition for is_branded if statements
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
2d8840b49c
|
Add is client branded functions
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
325dc8620a
|
Only branded plus client can use app config
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
d429a76590
|
Add AppConfigManagerTests
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
b727fc364c
|
Add base url config, is_branded_plus, remove enterprise reporter
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
cab840545a
|
Revert lenient option
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
ac1c41b6df
|
Simplify AppConfigManager
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
22e9a40fd4
|
Simplify AppConfigManager
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
7b46e6da0b
|
Use androidx.enterprise:enterprise-feedback for give feedback to customer
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
alperozturk
|
8a48da3a32
|
Use restriction manager for app config
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-05-06 15:31:37 +02:00 |
|
Andy Scherzinger
|
9a79ecac08
|
Merge pull request #12976 from nextcloud/renovate/codecov-codecov-action-4.x
Update codecov/codecov-action action to v4.3.1
|
2024-05-06 14:50:39 +02:00 |
|
Andy Scherzinger
|
a3cc66e23c
|
Merge pull request #12975 from nextcloud/renovate/ubuntu-noble
Update ubuntu:noble Docker digest to 3f85b7c
|
2024-05-06 14:22:54 +02:00 |
|
Andy Scherzinger
|
d5edd8ff90
|
Merge pull request #12981 from nextcloud/renovate/composeoptions-1.x
Update dependency composeOptions to v1.5.13
|
2024-05-06 14:21:18 +02:00 |
|