Skip to content

Nmc/1901 Conflict dialog#62

Open
surinder-tsys wants to merge 1 commit intomasterfrom
nmc/1901-conflict_dialog
Open

Nmc/1901 Conflict dialog#62
surinder-tsys wants to merge 1 commit intomasterfrom
nmc/1901-conflict_dialog

Conversation

@surinder-tsys
Copy link

@surinder-tsys surinder-tsys commented Apr 6, 2023 •
edited
Loading

This PR contains the NMC customized conflict dialog.

  • Tests written, or not not needed

@surinder-tsys surinder-tsys added custom MagentaCLOUD customisation approved and removed approved labels Apr 6, 2023
@tobiasKaminsky
Copy link

tobiasKaminsky commented Apr 17, 2023

Can you explain to me purpose of this?
We already have ConflictsResolveDialog, and it seems that ConflictsResolveConsentDialog is rather similar?

@surinder-tsys
Copy link
Author

surinder-tsys commented Apr 18, 2023

Can you explain to me purpose of this? We already have ConflictsResolveDialog, and it seems that ConflictsResolveConsentDialog is rather similar?

@tobiasKaminsky We have customized the UI which is totally different from NC. Attached screenshot:
NMC-201_Port

@tobiasKaminsky
Copy link

tobiasKaminsky commented Apr 20, 2023

Jens and Jan will talk about it, how to streamline it, so that this can be upstreamed.

@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch 5 times, most recently from cf00f77 to f70e8c5 Compare May 17, 2023 19:27
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from f70e8c5 to 7e1b764 Compare June 12, 2023 15:00
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch 3 times, most recently from f084a46 to 79214d8 Compare June 28, 2023 14:30
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 79214d8 to 72b6a3f Compare July 6, 2023 08:39
@surinder-tsys surinder-tsys added the build-ready Customization to include into build label Jul 13, 2023
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 72b6a3f to f3bda19 Compare August 28, 2023 19:19
@surinder-tsys
Copy link
Author

surinder-tsys commented Sep 6, 2023

Once the conflict dialog NC PR: nextcloud#10560 is merged then rebase this PR and resolve conflicts if any.

@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from f3bda19 to 1580dc5 Compare September 6, 2023 12:36
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 1580dc5 to 60c5e8f Compare October 19, 2023 17:46
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch 2 times, most recently from 64c579e to 8eabbb6 Compare November 2, 2023 07:24
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 8eabbb6 to 6afdbcb Compare November 21, 2023 11:25
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 6afdbcb to 52a7c91 Compare December 6, 2023 09:22
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 52a7c91 to 106b91d Compare December 27, 2023 13:24
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch 2 times, most recently from 51fdeed to 3aebc17 Compare January 11, 2024 11:15
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 3aebc17 to 57a2a17 Compare February 2, 2024 13:10
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from b96d019 to ac2a312 Compare April 8, 2024 18:49
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from ac2a312 to 36ed6f7 Compare April 19, 2024 07:47
@github-actions github-actions bot mentioned this pull request Apr 23, 2024
Closed
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch 2 times, most recently from f6257f3 to 782031d Compare May 8, 2024 06:32
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch 4 times, most recently from 9a7a615 to d4fdf3c Compare July 2, 2024 08:26
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from d4fdf3c to 2331db3 Compare July 16, 2024 06:51
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 2331db3 to a66011d Compare August 5, 2024 06:51
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from a66011d to b59ef44 Compare August 23, 2024 06:08
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch 2 times, most recently from 82d285f to b89bf2f Compare September 4, 2024 14:17
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from b89bf2f to c729823 Compare September 12, 2024 04:13
@surinder-tsys surinder-tsys mentioned this pull request Sep 17, 2024
Closed
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from c729823 to 7b8e7b8 Compare December 16, 2024 13:53
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from 7b8e7b8 to f520fd6 Compare January 28, 2025 11:43
@github-actions github-actions bot mentioned this pull request Jan 28, 2025
Closed
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from f520fd6 to fcd3937 Compare February 7, 2025 09:00
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from fcd3937 to 94be156 Compare April 3, 2025 13:32
@github-actions github-actions bot mentioned this pull request Jun 17, 2025
Closed
@github-actions github-actions bot mentioned this pull request Aug 26, 2025
Closed
@github-actions github-actions bot mentioned this pull request Sep 23, 2025
Closed
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch 2 times, most recently from 9d4d88b to dd79c3a Compare December 8, 2025 07:12
@github-actions github-actions bot mentioned this pull request Dec 8, 2025
Open
@surinder-tsys surinder-tsys force-pushed the nmc/1901-conflict_dialog branch from dd79c3a to c1b8eaa Compare February 4, 2026 09:13
@github-actions github-actions bot mentioned this pull request Feb 4, 2026
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

approved build-ready Customization to include into build custom MagentaCLOUD customisation

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@surinder-tsys @tobiasKaminsky