Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
B
Breeze
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
3
Issues
3
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DeStream-public
Breeze
Commits
618c100a
Commit
618c100a
authored
Jun 06, 2017
by
Jeremy Bokobza
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'bokobza/master' into start-tumbling-work
parents
fe3f4aff
c0c57956
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
0 deletions
+7
-0
.gitignore
.gitignore
+1
-0
create.component.html
Breeze.UI/src/app/setup/create/create.component.html
+1
-0
Breeze.sln
Breeze/Breeze.sln
+1
-0
launchSettings.json
Breeze/src/Breeze.Daemon/Properties/launchSettings.json
+4
-0
No files found.
.gitignore
View file @
618c100a
...
...
@@ -298,3 +298,4 @@ project.lock.json
/Breeze/src/Breeze.Daemon/Wallets
/Breeze/src/Breeze.Daemon/Logs
/Breeze.UI/.vscode/.BROWSE.VC.DB-wal
/Breeze.UI/.vscode/.BROWSE.VC.DB-shm
Breeze.UI/src/app/setup/create/create.component.html
View file @
618c100a
...
...
@@ -22,6 +22,7 @@
<select
name=
"network"
formControlName=
"selectNetwork"
>
<!--<option value="main">Main</option>-->
<option
value=
"test"
>
Testnet
</option>
<option
value=
"stratistest"
>
StratisTest
</option>
</select>
</div>
<div
class=
"form-group"
>
...
...
Breeze/Breeze.sln
View file @
618c100a
...
...
@@ -77,5 +77,6 @@ Global
{D16CD478-9D1E-4C69-91AD-43539E94A215} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{2490DD1A-6C14-47F2-A9C6-56761A52E2D9} = {807563C4-7259-434D-B604-A14C3DCF8E30}
{29E411B1-5687-43EE-A71B-6CCEC2289129} = {1B724678-2B73-483E-B981-3A6733C2194E}
{AAF6163B-1BE2-48CE-9F9F-577C6D7AAB8D} = {807563C4-7259-434D-B604-A14C3DCF8E30}
EndGlobalSection
EndGlobal
Breeze/src/Breeze.Daemon/Properties/launchSettings.json
View file @
618c100a
...
...
@@ -7,6 +7,10 @@
"Breeze.Daemon TestNet"
:
{
"commandName"
:
"Project"
,
"commandLineArgs"
:
"-testnet -tumbler-uri=http://localhost:5050 light -debug"
},
"StratisTest"
:
{
"commandName"
:
"Project"
,
"commandLineArgs"
:
"stratis -testnet"
}
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment