Merge remote-tracking branch 'origin/develop' into stdevYuniers_t27_d…

…ocker_vscode_image_.net
fibercrypto · Jan 19, 2019 · 3c74a09 · 3c74a09
2 parents 42f5253 + f4e9b20
commit 3c74a09
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 1 deletion.
diff --git a/.github/issue_template.md b/.github/issue_template.md
@@ -0,0 +1,27 @@
+
+Issue tracker is **ONLY** used for reporting bugs, features and enhancements. NO SUPPORT TICKETS ACCEPTED! Use [stackoverflow](https://stackoverflow.com) for supporting issues.
+
+## Expected Behavior
+
+
+## Actual Behavior
+
+
+## Steps to Reproduce the Problem
+<!--- Provide a link to a live example, or an unambiguous set of steps to -->
+<!--- reproduce this bug. Include code to reproduce, if relevant -->
+
+  1.
+  1.
+  1.
+
+## Specifications
+
+  - Version:
+  - Platform:
+  - Subsystem:
+
+## Possible Solution
+<!--- Not obligatory, but suggest a fix/reason for the bug, -->
+<!--- Not obligatory, but suggest an idea for implementing addition or change -->
+
diff --git a/.gitignore b/.gitignore
@@ -261,4 +261,6 @@ testrunner/
 #Temporary files
 *.swp
 *.swo
+*.orig
 
+.directory
diff --git a/.travis.yml b/.travis.yml
@@ -12,3 +12,11 @@ script:
 notifications:
   email: false
   webhooks: https://fathomless-fjord-24024.herokuapp.com/notify
+
+deploy:
+  skip_cleanup: true
+  provider: script
+  script: chmod +x ./travis/deploy.sh && ./travis/deploy.sh
+  on:
+    tags: true
+    repo: simelo/libskycoin_dotnet
diff --git a/.travis/deploy.sh b/.travis/deploy.sh
@@ -0,0 +1 @@
+nuget push ./LibskycoinNet/bin/Release/*.nupkg -Verbosity detailed -ApiKey $NUGET_API_KEY -Source $NUGET_SOURCE
diff --git a/gopath/src/github.com/skycoin/skycoin b/gopath/src/github.com/skycoin/skycoin
-Original file line number
+Diff line change
@@ Expand Up / @@ -261,4 +261,6 @@ testrunner/ @@
     #Temporary files
     *.swp
     *.swo
+    *.orig
+    .directory
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		nuget push ./LibskycoinNet/bin/Release/*.nupkg -Verbosity detailed -ApiKey $NUGET_API_KEY -Source $NUGET_SOURCE
+1 −1		.Doxyfile
+1 −0		.travis.yml
+12 −2		CHANGELOG.md
+4 −1		Makefile
+39 −9		README.md
+1 −1		ci-scripts/integration-test-live.sh
+5 −5		cmd/cli/README.md
+5 −1		cmd/skycoin/skycoin.go
+1 −3		docker/images/dev-docker/hooks/build
+1 −1		electron/package-lock.json
+1 −1		electron/package.json
+1 −1		electron/skycoin/current-skycoin.json
+4 −0		fiber.toml
+146 −0		lib/swig/README.md
+4 −0		peers.txt
+2 −2		src/api/README.md
+59 −3		src/api/integration/integration_test.go
+4 −0		src/api/integration/testdata/network-default-peers.golden
+4 −0		src/api/integration/testdata/network-trusted-peers.golden
+2 −2		src/cli/cli.go
+2 −2		src/cli/integration/integration_test.go
+1 −1		src/cli/integration/testdata/status-csrf-enabled-no-unconfirmed.golden
+1 −1		src/cli/integration/testdata/status-csrf-enabled.golden
+1 −1		src/cli/integration/testdata/status-no-unconfirmed.golden
+1 −1		src/cli/integration/testdata/status.golden
+8 −7		src/cli/richlist.go
+125 −14		src/daemon/daemon.go
+237 −0		src/daemon/daemon_test.go
+6 −5		src/daemon/gateway.go
+11 −9		src/daemon/gnet/pool.go
+1 −1		src/daemon/gnet/pool_test.go
+4 −4		src/daemon/messages.go
+1 −1		src/daemon/messages_test.go
+8 −6		src/daemon/mock_daemoner_test.go
+1 −1		src/gui/static/src/current-skycoin.json
+3 −1		src/skycoin/config.go
+6 −6		src/util/useragent/useragent_test.go
+9 −5		src/visor/blockchain.go
+2 −1		src/visor/blockchain_verify_test.go
+23 −5		src/visor/mock_blockchainer_test.go
+2 −2		src/visor/unconfirmed.go
+7 −5		src/visor/verify.go
+14 −11		src/visor/visor.go
+2 −2		src/visor/visor_test.go
+2 −2		src/visor/visor_wallet.go
+10 −4		src/wallet/service.go
+2 −5		src/wallet/wallets.go
+1 −1		template/coin.template