Nmc/1901 Conflict dialog #62
Open
Conversation
This file contains hidden or 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
surinder-tsys
added
custom
|
Can you explain to me purpose of this? |
Author
@tobiasKaminsky We have customized the UI which is totally different from NC. Attached screenshot: |
|
Jens and Jan will talk about it, how to streamline it, so that this can be upstreamed. |
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
5 times, most recently
from
cf00f77 to
f70e8c5
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
f70e8c5 to
7e1b764
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
3 times, most recently
from
f084a46 to
79214d8
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
79214d8 to
72b6a3f
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
72b6a3f to
f3bda19
Compare
Author
|
Once the conflict dialog NC PR: nextcloud#10560 is merged then rebase this PR and resolve conflicts if any. |
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
f3bda19 to
1580dc5
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
1580dc5 to
60c5e8f
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
2 times, most recently
from
64c579e to
8eabbb6
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
8eabbb6 to
6afdbcb
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
6afdbcb to
52a7c91
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
52a7c91 to
106b91d
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
2 times, most recently
from
51fdeed to
3aebc17
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
3aebc17 to
57a2a17
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
57a2a17 to
12e9d18
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
2 times, most recently
from
b96d019 to
ac2a312
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
ac2a312 to
36ed6f7
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
2 times, most recently
from
f6257f3 to
782031d
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
4 times, most recently
from
9a7a615 to
d4fdf3c
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
d4fdf3c to
2331db3
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
2331db3 to
a66011d
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
a66011d to
b59ef44
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
2 times, most recently
from
82d285f to
b89bf2f
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
b89bf2f to
c729823
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
c729823 to
7b8e7b8
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
7b8e7b8 to
f520fd6
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
f520fd6 to
fcd3937
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
fcd3937 to
94be156
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
94be156 to
9d4d88b
Compare
surinder-tsys
force-pushed
the
nmc/1901-conflict_dialog
branch
from
9d4d88b to
dd79c3a
Compare
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.
This PR contains the NMC customized conflict dialog.