diff options
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | bootstrap | 4 | ||||
| -rw-r--r-- | contrib/Makefile.am | 14 | ||||
| m--------- | contrib/wallet-core | 0 |
4 files changed, 16 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 91e0186e..857edd23 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = doc/prebuilt url = git://git.taler.net/docs.git branch = prebuilt +[submodule "contrib/wallet-core"] + path = contrib/wallet-core + url = git://git.taler.net/wallet-core @@ -33,9 +33,7 @@ echo "$0: Running autoreconf" autoreconf -if echo "Importing single-page app (from external Git repository)" -cd contrib/merchant-backoffice +cd contrib/wallet-core git checkout -f origin/prebuilt -cp spa.html .. -cd ../.. exit 0 diff --git a/contrib/Makefile.am b/contrib/Makefile.am index e2f9659d..e8e12e28 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -23,7 +23,17 @@ MAINTAINERCLEANFILES = \ # foo.css -# spa.html is the single-page-app imported from the merchant-backoffice.git +# spa.html is the single-page-app imported from the wallet-core.git # prebuilt branch. dist_spapkgdata_DATA = \ - spa.html + backoffice/index.css + backoffice/index.css.map + backoffice/index.html + backoffice/index.js + backoffice/index.js.map + backoffice/languageicon-LWKRUH5D.svg + backoffice/materialdesignicons-webfont-4.9.95-7W2GKO6O.woff2 + backoffice/materialdesignicons-webfont-4.9.95-GELXKCZG.ttf + backoffice/materialdesignicons-webfont-4.9.95-HENMUVWG.eot + backoffice/materialdesignicons-webfont-4.9.95-WP2MXZKI.woff + backoffice/XRXV3I6Li01BKofINeaE-34D53UZZ.ttf diff --git a/contrib/wallet-core b/contrib/wallet-core new file mode 160000 +Subproject 509011f9bca5c0693102b780fa782e910217f1a |