gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[taler-merchant] branch master updated (a572c763 -> 968fa460)


From: gnunet
Subject: [taler-merchant] branch master updated (a572c763 -> 968fa460)
Date: Fri, 28 May 2021 22:50:36 +0200

This is an automated email from the git hooks/post-receive script.

ms pushed a change to branch master
in repository merchant.

    from a572c763 fixing spelling
     new bb9d348c merchant-backoffice prebuilt branch
     new 5ae85729 merchant-backoffice prebuilt branch
     new 968fa460 importing the backoffice SPA

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmodules                 |  1 +
 bootstrap                   | 11 ++++-------
 contrib/Makefile.am         |  9 ++++-----
 contrib/merchant-backoffice |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 396c1367..c898b036 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,4 @@
 [submodule "contrib/merchant-backoffice"]
        path = contrib/merchant-backoffice
        url = git://git.taler.net/merchant-backoffice
+    branch = prebuilt
diff --git a/bootstrap b/bootstrap
index 6766d092..06262259 100755
--- a/bootstrap
+++ b/bootstrap
@@ -32,12 +32,9 @@ fi
 echo "$0: Running autoreconf"
 autoreconf -if
 
-#echo "Building single-page app (from external Git repository)"
-#cd contrib/merchant-backoffice
-#./bootstrap
-#./configure
-#make build-single
-#cp packages/frontend/single/index.html ../spa.html
-#cd ../..
+echo "Importing single-page app (from external Git repository)"
+cd contrib/merchant-backoffice
+cp spa.html ..
+cd ../..
 
 exit 0
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index ffdcfd12..4344aac7 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -14,8 +14,7 @@ dist_staticpkgdata_DATA = \
   pure-min.css
 
 
-# spa.html is the single-page-app generated from the merchant-backoffice.git,
-# 'make build-single', during 'bootstrap!'
-# FIXME: temporarily disabled.
-# dist_spapkgdata_DATA = \
-#  spa.html
+# spa.html is the single-page-app imported from the merchant-backoffice.git
+# prebuilt branch.
+dist_spapkgdata_DATA = \
+  spa.html
diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 4320467d..fc9a68c9 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 4320467db1392e5f48a4acd079f7e2a253cf9984
+Subproject commit fc9a68c973386afe4c83cf196555b6d01f10a4f6

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]