Conflict window option to export

2018-09-07 10:57:22 -05:00
parent 97ef57ea27
commit cc782d2031
5 changed files with 1990 additions and 1443 deletions
--- a/app/assets/templates/directives/conflict-resolution-modal.html.haml
+++ b/app/assets/templates/directives/conflict-resolution-modal.html.haml
@@ -8,6 +8,7 @@
            %a.close-button.info{"ng-click" => "keepItem1()"} Keep left
            %a.close-button.info{"ng-click" => "keepItem2()"} Keep right
            %a.close-button.info{"ng-click" => "keepBoth()"} Keep both
+            %a.close-button.info{"ng-click" => "export()"} Export
            %a.close-button.info{"ng-click" => "dismiss(); $event.stopPropagation()"} Close
        .content.selectable
          .panel-section