Tobias Kaminsky
|
0764c8bab3
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-11-05 02:31:37 +01:00 |
|
Nextcloud bot
|
662eb9144b
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2024-11-04 06:57:09 +00:00 |
|
Tobias Kaminsky
|
35024f0678
|
Merge pull request #13935 from nextcloud/hoursMinutesPlural
hours/minutes: correct plural for english, rest will be added by Tran…
|
2024-11-04 07:55:27 +01:00 |
|
tobiasKaminsky
|
8fa1ae2499
|
hours/minutes: correct plural for english, rest will be added by Transifex
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2024-11-04 07:34:26 +01:00 |
|
Tobias Kaminsky
|
468edd1c87
|
daily dev 20241101
|
2024-11-01 02:43:23 +01:00 |
|
Tobias Kaminsky
|
12754c048e
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-11-01 02:32:38 +01:00 |
|
Tobias Kaminsky
|
ff060eff6a
|
Merge pull request #13907 from nextcloud/fix/xml-spdx-header
Fix XML SPDX header
|
2024-10-31 08:16:44 +01:00 |
|
Tobias Kaminsky
|
54592b2813
|
Merge pull request #13884 from nextcloud/improve-two-way-sync-behaviour
Improve Two Way Sync Behaviour
|
2024-10-31 07:09:33 +01:00 |
|
Nextcloud bot
|
d36fa320e0
|
Fix(l10n): Update translations from Transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
|
2024-10-31 02:47:53 +00:00 |
|
Tobias Kaminsky
|
cb24b0545b
|
daily dev 20241031
|
2024-10-31 02:40:33 +01:00 |
|
Tobias Kaminsky
|
ba4970fab8
|
Merge remote-tracking branch 'origin/master' into dev
|
2024-10-31 02:31:58 +01:00 |
|
alperozturk
|
81e5de6194
|
better thread management
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 16:37:11 +01:00 |
|
alperozturk
|
2cc4e1065f
|
call on main thread- checkDisableForAllFoldersMenuButtonVisibility
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 15:33:40 +01:00 |
|
alperozturk
|
5bb43f3c77
|
dynamically hide menu item
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 15:28:20 +01:00 |
|
alperozturk
|
be70aef0fe
|
solve git conflicts
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 14:06:06 +01:00 |
|
Tobias Kaminsky
|
861787348c
|
Merge pull request #13905 from nextcloud/feature/two_way_sync_stop_all
Add disable all button to InternalTwoWaySyncActivity menu
|
2024-10-30 14:02:11 +01:00 |
|
alperozturk
|
c97082b172
|
solving conflicts from connected PRs
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 13:57:55 +01:00 |
|
alperozturk
|
7ec78948a7
|
use quantity strings
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:33:43 +01:00 |
|
alperozturk
|
5137bc6574
|
every user can cancel the worker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:14:14 +01:00 |
|
alperozturk
|
043c8b390e
|
every user can cancel the worker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:14:14 +01:00 |
|
alperozturk
|
0454a2c570
|
better and more clear translation keys
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:14:14 +01:00 |
|
alperozturk
|
7b6caf0685
|
use lifeCycleScope instead Coroutine scope
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:14:14 +01:00 |
|
ZetaTom
|
84c7cdbf56
|
Stop download worker when cancelling two-way sync
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 12:14:14 +01:00 |
|
ZetaTom
|
b3845560a0
|
Stop background job when cancelling two-way sync
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 12:14:14 +01:00 |
|
ZetaTom
|
1fc4f51fd1
|
Add disable all button to InternalTwoWaySyncActivity menu
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 12:14:14 +01:00 |
|
alperozturk
|
00509efa02
|
every user can cancel the worker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:07:37 +01:00 |
|
alperozturk
|
8431266caa
|
every user can cancel the worker
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:07:26 +01:00 |
|
alperozturk
|
4cec0fc6e0
|
better and more clear translation keys
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:02:28 +01:00 |
|
alperozturk
|
e48a3365b1
|
use lifeCycleScope instead Coroutine scope
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 12:02:18 +01:00 |
|
Tobias Kaminsky
|
d21321e1d6
|
Merge pull request #13895 from nextcloud/bugfix/auto-rename-capability-order
BugFix / AutoRename Capability Order
|
2024-10-30 12:02:16 +01:00 |
|
Tobias Kaminsky
|
733f9cdfd9
|
Merge pull request #13494 from nextcloud/emptyList
2way sync: Better view handling
|
2024-10-30 11:29:48 +01:00 |
|
ZetaTom
|
c32881ed60
|
Fix XML SPDX header.
- remove Talk
Signed-off-by: ZetaTom <70907959+ZetaTom@users.noreply.github.com>
|
2024-10-30 11:24:33 +01:00 |
|
alperozturk
|
488589d2a7
|
schedule two-way-sync via isTwoWaySyncEnabled
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
832a63b5a6
|
revert preferences changes
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
76d4df6d15
|
use m3 only
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
ecd0194160
|
remove unused variables
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
3fda8d3567
|
use string arguments
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
Alper Öztürk
|
8b499fbe5d
|
Update app/src/main/res/xml/preferences.xml
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
|
2024-10-30 10:48:55 +01:00 |
|
Alper Öztürk
|
b1c720b28f
|
Update app/src/main/res/values/strings.xml
Co-authored-by: Tom <70907959+ZetaTom@users.noreply.github.com>
Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
c84f926329
|
make switch smaller
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
c98a720950
|
remove reset column function due to "remove all" button will be added in three dot menu
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
1b6073d0de
|
use kotlin.Duration
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
f0a8400cec
|
rename filedao function
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
67b78283f2
|
set default two way sync value to true
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
a413005cb9
|
run resetTwoWaySyncTimestamps in background thread
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
095e5da242
|
update periodic work policy for new interval
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
e39e0ba623
|
fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
010e03e7d1
|
show selectedDuration in drop down menu
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
0bb1960b32
|
fix code analytics
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|
alperozturk
|
6f6962ef04
|
reschedule interval two way to dynamically change the interval time
Signed-off-by: alperozturk <alper_ozturk@proton.me>
|
2024-10-30 10:48:55 +01:00 |
|