merge staging into pending allow-list work

2020-02-21 13:52:10 -05:00
parent 7ee8778210 668ea95de2
commit cac114bb52
11 changed files with 211 additions and 71 deletions
--- a/www/common/sframe-app-framework.js
+++ b/www/common/sframe-app-framework.js
@@ -674,6 +674,9 @@ define([
            $hist.addClass('cp-hidden-if-readonly');
            toolbar.$drawer.append($hist);

+            var $copy = common.createButton('copy', true);
+            toolbar.$drawer.append($copy);
+
            if (!cpNfInner.metadataMgr.getPrivateData().isTemplate) {
                var templateObj = {
                    rt: cpNfInner.chainpad,