Skip to content

[stable-35.0.x] Internal two way sync upload new files - #17813

Merged
alperozturk96 merged 17 commits into
stable-35.0.xfrom
backport/17598/stable-35.0.x
Oct 14, 2026
Merged

alperozturk96 merged 17 commits into
stable-35.0.xfrom
backport/17598/stable-35.0.x

Conversation

@backportbot

@backportbot backportbot Bot commented Oct 13, 2026 •

Copy link
Copy Markdown

Backport of #17598

tobiasKaminsky and others added 16 commits October 14, 2026 14:05
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

# Conflicts:
#	app/src/main/java/com/owncloud/android/operations/SynchronizeFolderOperation.java
#	app/src/main/res/values/strings.xml
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

[skip ci]
@alperozturk96
alperozturk96 force-pushed the backport/17598/stable-35.0.x branch from 1645da1 to 8d78448 Compare October 14, 2026 12:05
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
@alperozturk96
alperozturk96 marked this pull request as ready for review October 14, 2026 12:16
@alperozturk96
alperozturk96 merged commit d6aae46 into stable-35.0.x Oct 14, 2026
6 of 18 checks passed
@alperozturk96
alperozturk96 deleted the backport/17598/stable-35.0.x branch October 14, 2026 12:16
@github-actions

Copy link
Copy Markdown

test-Unit test failed, but no output was generated. Maybe a preliminary stage failed.

@github-actions

Copy link
Copy Markdown

blue-Light-Screenshot test failed, but no output was generated. Maybe a preliminary stage failed.

@github-actions

Copy link
Copy Markdown

master-IT test failed, but no output was generated. Maybe a preliminary stage failed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants