Skip to content

Commit b13941a

Browse files
authored
Merge pull request #44 from syscoin/dev-3.0
Dev 3.0 merging to master.
2 parents ef2dbda + d278e58 commit b13941a

36 files changed

+12090
-7840
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@ node_modules
55
syscoin-api.iml
66
server/nodejs/mongotest.js
77
.env
8+
*.log
89

10+
*.orig

client/client-gen-config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{ "modelPropertyNaming": "original" }
1+
{ "modelPropertyNaming": "original", "ngVersion": "2.0"}

client/client/.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
wwwroot/*.js
2+
node_modules
3+
typings
4+
dist

client/client/.swagger-codegen-ignore

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Swagger Codegen Ignore
2+
# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
3+
4+
# Use this file to prevent files from being overwritten by the generator.
5+
# The patterns follow closely to .gitignore or .dockerignore.
6+
7+
# As an example, the C# client generator defines ApiClient.cs.
8+
# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
9+
#ApiClient.cs
10+
11+
# You can match any string of characters against a directory, file or extension with a single asterisk (*):
12+
#foo/*/qux
13+
# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
14+
15+
# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
16+
#foo/**/qux
17+
# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
18+
19+
# You can also negate patterns with an exclamation (!).
20+
# For example, you can ignore all files in a docs folder with the file extension .md:
21+
#docs/*.md
22+
# Then explicitly reverse the ignore rule for a single file:
23+
#!docs/README.md
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.4.0-SNAPSHOT

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
2-
"name": "@syscoinorg/syscoin-api",
2+
"name": "@syscoin/syscoin-api",
33
"description": "A full featured api for interacting with Syscoin commands both at an RPC level, as a REST API, and more.",
4-
"version": "1.1.2",
4+
"version": "3.0.0-beta",
55
"main": "server.js",
66
"keywords": [
77
"syscoin",
88
"rpc",
9-
"api"
9+
"api",
10+
"rest",
11+
"json"
1012
],
1113
"author": {
1214
"name": "Dan Wasyluk",

0 commit comments

Comments
 (0)