feat: Merge send transfer states #280
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
FabianDevel
requested changes
Dec 20, 2024
...ain/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
Show resolved
Hide resolved
...ain/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
Show resolved
Hide resolved
LunarX
force-pushed
the
resend-last-transfer
branch
from
0de9e51 to
bc45e56
Compare
LunarX
force-pushed
the
merge-send-transfer-states
branch
from
edf14bd to
64a0058
Compare
LunarX
force-pushed
the
resend-last-transfer
branch
from
bc45e56 to
ac9d312
Compare
LunarX
force-pushed
the
merge-send-transfer-states
branch
2 times, most recently
from
38a8dd4 to
8aa2f45
Compare
LunarX
force-pushed
the
resend-last-transfer
branch
from
ac9d312 to
7272cd2
Compare
LunarX
force-pushed
the
merge-send-transfer-states
branch
from
8aa2f45 to
c00793e
Compare
LunarX
force-pushed
the
resend-last-transfer
branch
from
a76b067 to
e76cd69
Compare
LunarX
force-pushed
the
merge-send-transfer-states
branch
from
c00793e to
3edab6b
Compare
LunarX
force-pushed
the
resend-last-transfer
branch
from
e76cd69 to
1f6b74f
Compare
LunarX
force-pushed
the
merge-send-transfer-states
branch
from
c28a650 to
64ee768
Compare
|
This PR/issue depends on:
|
LunarX
force-pushed
the
merge-send-transfer-states
branch
from
64ee768 to
8c4265a
Compare
FabianDevel
approved these changes
Dec 20, 2024
…tates # Conflicts: # app/src/main/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/importfiles/ImportFilesScreen.kt
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Was required to use the code in multiple screens
Depends on #278