Commits · master · Merge / Project Merge

18 Apr, 2019 1 commit
- fix to gitignore, Makefile should not be ignored · db79ad7d
  coin-server authored Apr 18, 2019
  
  db79ad7d
14 Apr, 2019 5 commits
- Merge branch 'spork-masternode-maintenance' into 'master' · f04a1511
  coin-server authored Apr 14, 2019
```
Spork masternode maintenance

See merge request ProjectMerge/merge!40
```
  f04a1511
- Version bump to 1.0.4 · fe7b4f32
  coin-server authored Apr 14, 2019
  
  fe7b4f32
- cherrypicked ipv6 fixes from pivx (https://github.com/PIVX-Project/PIVX/pull/542 ) · 92349bc0
  barrystyle authored Apr 14, 2019
  
  92349bc0
- swiftTX sporks and checks removal · df06a794
  barrystyle authored Apr 14, 2019
  
  df06a794
- spork 14 and 16 removal · 7554cffc
  barrystyle authored Apr 14, 2019
  
  7554cffc
10 Apr, 2019 2 commits
- Merge branch 'release-1-0-3' into 'master' · 809073c4
  coin-server authored Apr 10, 2019
```
release 1.0.3

See merge request ProjectMerge/merge!37
```
  809073c4
- release 1.0.3 · 41d82b90
  coin-server authored Apr 10, 2019
  
  41d82b90
28 Mar, 2019 4 commits
- Merge branch 'protocol-bump' into 'master' · 19e4a40f
  coin-server authored Mar 28, 2019
```
Protocol Bump

See merge request ProjectMerge/merge!36
```
  19e4a40f
- Protocol Bump · 3e28fd06
  coin-server authored Mar 28, 2019
  
  3e28fd06
- Merge branch 'fix-spork-keys' into 'master' · c7baeb0f
  coin-server authored Mar 28, 2019
```
Change of mainnet spork keys

See merge request ProjectMerge/merge!35
```
  c7baeb0f
- Change of mainnet spork keys · 58711463
  coin-server authored Mar 28, 2019
  
  58711463
27 Mar, 2019 2 commits
- Merge branch 'zerocoin-nextpass' into 'master' · f3361659
  coin-server authored Mar 27, 2019
```
remove related qt resources for zerocoin/privacy

See merge request ProjectMerge/merge!34
```
  f3361659
- remove related qt resources for zerocoin/privacy · 188e1d97
  barrystyle authored Mar 27, 2019
  
  188e1d97
26 Mar, 2019 3 commits
- Merge branch 'zerocoin-rebase' into 'master' · 246232bd
  coin-server authored Mar 26, 2019
```
zerocoin removal squashed

See merge request ProjectMerge/merge!33
```
  246232bd
- zerocoin removal squashed · 73cf414a
  barrystyle authored Mar 26, 2019
  
  73cf414a
- Merge branch 'locale-fixes' into 'master' · f856a036
  coin-server authored Mar 26, 2019
```
set case correctly on locale

See merge request ProjectMerge/merge!32
```
  f856a036
25 Mar, 2019 1 commit
- set case correctly on locale · 5351cfc6
  barrystyle authored Mar 25, 2019
  
  5351cfc6
15 Mar, 2019 1 commit
- Merge branch 'Aviator/QT-Uri' into 'master' · b563a2b2
  coin-server authored Mar 15, 2019
```
Aviator/qt uri

See merge request ProjectMerge/merge!31
```
  b563a2b2
12 Mar, 2019 8 commits
- Version bump to 1.0.3 · b92fa1e3
  coin-server authored Mar 12, 2019
  
  b92fa1e3
- Merge branch '15-forcing-testnet-for-pre-release-versions-of-the-wallet' into 'master' · eff79c86
  coin-server authored Mar 12, 2019
```
Enforce Testnet if PreRelease is True

Closes #15

See merge request ProjectMerge/merge!29
```
  eff79c86
- Enforce Testnet if PreRelease is True · d70e161f
  Aviator authored Mar 12, 2019
```
toggle bit in configure.ac
```
  d70e161f
- Merge branch '9-wallet-explorer' into 'master' · 9192ef61
  coin-server authored Mar 12, 2019
```
Resolve "Wallet Explorer"

Closes #9

See merge request ProjectMerge/merge!28
```
  9192ef61
- Merge branch '10-splash-loading-screen-for-gui-wallet-1-0-2' into 'master' · 1cddeda5
  coin-server authored Mar 12, 2019
```
Resolve "Splash/ Loading Screen for gui wallet 1.0.2"

Closes #10

See merge request ProjectMerge/merge!26
```
  1cddeda5
- [QT] Explorer - Add Algorithm Field to show POW / POS · 079068ee
  Aviator authored Mar 12, 2019
  
  079068ee
- [QT] Fixes Explorers Reward Calculation · 73829693
  Aviator authored Mar 12, 2019
```
Math is Wrong
They calculate In - Out which is wrong in order to get the fees is Out -  In - Reward
```
  73829693
- [QT] Fix Splashscreen · f0809ec8
  Aviator authored Mar 12, 2019
  
  f0809ec8
11 Mar, 2019 1 commit
- Merge branch 'DockerContainer' into 'master' · ed5eeee2
  coin-server authored Mar 11, 2019
```
[Docker] Added Docker File

See merge request ProjectMerge/merge!20
```
  ed5eeee2
09 Mar, 2019 2 commits
- Merge branch 'testnet-relaunch' into 'master' · 412fd660
  coin-server authored Mar 09, 2019
```
testnet seeds mergetest-seed.mergeseeders.com and mergetest-seed.mergeseeders.org added

See merge request ProjectMerge/merge!22
```
  412fd660
- testnet seeds mergetest-seed.mergeseeders.com and mergetest-seed.mergeseeders.org added · 902ca129
  coin-server authored Mar 09, 2019
  
  902ca129
08 Mar, 2019 2 commits
- Merge branch 'testnet-relaunch' into 'master' · a6091edd
  coin-server authored Mar 08, 2019
```
Testnet Relaunch

See merge request ProjectMerge/merge!21
```
  a6091edd
- Testnet Relaunch · 0474d44f
  coin-server authored Mar 08, 2019
  
  0474d44f
04 Mar, 2019 3 commits
- [QT] Fixes Open Url Issue · 9597d1fc
  Aviator authored Mar 04, 2019
  
  9597d1fc
- Fix Label pivx: to MERGE: · efc08645
  Aviator authored Mar 04, 2019
  
  efc08645
- [Docker] Added Docker File · 5cd66ca4
  Aviator authored Mar 04, 2019
  
  5cd66ca4
03 Mar, 2019 3 commits
- Merge branch 'v1.0.1.1' into 'master' · 10395e7a
  coin-server authored Mar 03, 2019
```
V1.0.2

See merge request ProjectMerge/merge!19
```
  10395e7a
- Version Bump to V1.0.2.0 · c56da189
  Aviator authored Mar 03, 2019
  
  c56da189
- Version Bump to V1.0.2.0 · c1e873e1
  Aviator authored Mar 03, 2019
  
  c1e873e1
02 Mar, 2019 2 commits
- [QT] Fixed Compiling Issues From Removed Options · d0e1f33e
  Aviator authored Mar 02, 2019
  
  d0e1f33e
- [QT] Fixed invalid "settxfee" command response · f012a667
  Aviator authored Mar 02, 2019
```
Thanks @ JSKitty | PIVX.org 
```
  f012a667