|
rstencel <44087721+rstencel@users.noreply.github.com>
|
303ab4620aca75ee25b40c04dcf25ee0497e420b
303ab4620aca75ee25b40c04dcf25ee0497e420b |
SYNCT-244: Added frontend support for conflict resolution (#115)
* SYNCT-244: Initial commit for manual conflict resolution UI
* SYNCT-244: Conflict resolution page created, button redirecting from audit log to conflict resolution page added
* Object fields shown in table
* Two compared objects displayed, differences checked, radio buttons added
* Changed layout and CSS; changes are applied to object's JSON representation
* Merging objects working
* Integration with Audit Log
* Code cleaning
* Code cleaning
* Fixed usage of inexistent getter
* Removed unused link
* Improved code readibility |
|