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
|
6b3eb3e897
|
Simplify code
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 14:30:06 +01:00 |
|
alperozturk
|
534f9c143a
|
Add action for file conflict
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 14:14:11 +01:00 |
|
alperozturk
|
bbf06364a2
|
Merge master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 14:04:01 +01:00 |
|
alperozturk
|
8f9056562e
|
Simplify code
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 13:53:35 +01:00 |
|
alperozturk
|
96cb61b661
|
Add re-upload functionality
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 12:16:22 +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 |
|
alperozturk
|
17657f3f50
|
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:24:22 +01:00 |
|
alperozturk
|
d0de68b470
|
Merge remote-tracking branch 'origin/feature/files-action-in-search-mode' into feature/files-action-in-search-mode
# Conflicts:
# app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.java
|
2023-12-07 10:24:03 +01:00 |
|
alperozturk
|
e018a65d0f
|
Rebase master
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:23:00 +01:00 |
|
alperozturk
|
16a6a9bbbf
|
Fix needlessly boxes a boolean constant
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
60401b1596
|
Add move task back option
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
180b27c120
|
Optimize imports
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
5b4db1ba5f
|
Clear search view
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
af7d8985e2
|
Reuse content description for more button
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
7c0363496f
|
Reuse same functions, cleanup code
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:29 +01:00 |
|
alperozturk
|
eeb91ab6da
|
Add files action to search
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 10:20:28 +01:00 |
|
alperozturk
|
3ee19ac189
|
Merge master (cant rebase due to multiple git conflicts)
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-07 09:55:12 +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 |
|
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
|
d14cc99885
|
Fix merge conflict
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 14:50:55 +01:00 |
|
alperozturk
|
21466b5217
|
Add fixme
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 14:47:33 +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 |
|
alperozturk
|
1b403ab1c0
|
Add remove action
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 14:34:21 +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 |
|
alperozturk
|
f4ffe4fdae
|
Add actions
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 14:26:43 +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 |
|
alperozturk
|
5f99e4379d
|
Add Two Action Dialog button
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2023-12-06 14:02:09 +01:00 |
|
Alper Öztürk
|
8023b0fb49
|
Merge pull request #12234 from nextcloud/bugfix/fix-crash-DashboardWidgetService-IndexOutOfBoundsException
Fix Crash DashboardWidgetService
|
2023-12-06 13:09:06 +01:00 |
|
tobiasKaminsky
|
c02c3e530f
|
if e2e server app is disabled, do not show secure file drop
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2023-12-06 12:48:27 +01:00 |
|