Commits · master · hive / hive-io

29 Dec, 2020 4 commits
- Merge branch 'develop' into 'master' · 851828d9
  therealwolf authored Dec 29, 2020
```
Develop

See merge request !90
```
  851828d9
- Merge branch 'nftshowroom' into 'develop' · 5e7ce78e
  therealwolf authored Dec 29, 2020
```
NFTShowroom to Ecosystem

See merge request !88
```
  5e7ce78e
- Merge branch 'develop' into 'master' · edcaedd8
  therealwolf authored Dec 29, 2020
```
disabled infobar

See merge request !89
```
  edcaedd8
- disabled infobar · 94b08939
  therealwolf authored Dec 29, 2020
  
  94b08939
26 Dec, 2020 2 commits
- NFTShowroom logo · 6362f4db
  RK authored Dec 26, 2020
  
  6362f4db
- NFTShowroom added · f536fa24
  RK authored Dec 26, 2020
  
  f536fa24
18 Dec, 2020 2 commits
- Merge branch 'develop' into 'master' · 0bc228a7
  therealwolf authored Dec 18, 2020
```
fixed hivefest timer

See merge request !87
```
  0bc228a7
- fixed hivefest timer · 1a40e1ab
  therealwolf authored Dec 18, 2020
  
  1a40e1ab
25 Nov, 2020 6 commits
- Merge branch 'develop' into 'master' · b2ffe66c
  therealwolf authored Nov 25, 2020
```
Develop

See merge request !86
```
  b2ffe66c
- Merge branch 'master' into 'develop' · b14365ca
  therealwolf authored Nov 25, 2020
```
# Conflicts:
#   src/components/infobar/infobar.vue
```
  b14365ca
- Merge branch 'improvements' into 'develop' · 42b1444d
  therealwolf authored Nov 25, 2020
```
simplified changing of variables

See merge request !85
```
  42b1444d
- simplified changing of variables · 55fa90bd
  therealwolf authored Nov 25, 2020
  
  55fa90bd
- Merge branch 'patch-1' into 'master' · 8c6e5a7f
  good-karma authored Nov 25, 2020
```
fix hivefe.st link

See merge request !84
```
  8c6e5a7f
- fix hivefe.st link · 79bef0e5
  good-karma authored Nov 25, 2020
  
  79bef0e5
23 Nov, 2020 12 commits
- Merge branch 'develop' into 'master' · 2d967a69
  therealwolf authored Nov 23, 2020
```
Develop

See merge request !83
```
  2d967a69
- Merge branch 'prettier' into 'develop' · 0f121a4d
  therealwolf authored Nov 23, 2020
```
fix infobar

See merge request !82
```
  0f121a4d
- fix infobar · f98c37a4
  therealwolf authored Nov 23, 2020
  
  f98c37a4
- Merge branch 'prettier' into 'develop' · df6b2f65
  therealwolf authored Nov 23, 2020
```
Prettier

See merge request !81
```
  df6b2f65
- fixed prettier · 8cd1aaf7
  therealwolf authored Nov 23, 2020
  
  8cd1aaf7
- deleting · fdffc23a
  RK authored Nov 22, 2020
  
  fdffc23a
- Removed extra · fe7940c0
  RK authored Nov 22, 2020
  
  fe7940c0
- Moving after BT although not alphabetical · ef256f07
  RK authored Nov 22, 2020
  
  ef256f07
- Remove the too long AltSpaceVR text · a1d6fdcf
  RK authored Nov 22, 2020
  
  a1d6fdcf
- Reverting the css changes · 82858244
  RK authored Nov 22, 2020
  
  82858244
- Rewrote the Hive blurb · de1e6c8e
  RK authored Nov 22, 2020
  
  de1e6c8e
- Move Beaxy alphabetically · 2a422aa8
  RK authored Nov 22, 2020
  
  2a422aa8
22 Nov, 2020 1 commit
- Remove myriad, replace with numerous · 18e1ab5f
  RK authored Nov 22, 2020
  
  18e1ab5f
17 Nov, 2020 8 commits
- Replace beaxy.png · 23da7647
  RK authored Nov 17, 2020
  
  23da7647
- Replace beaxy.png · 774b86cd
  RK authored Nov 17, 2020
  
  774b86cd
- Replace beaxy.png · 44f5db07
  RK authored Nov 17, 2020
  
  44f5db07
- Merge branch 'revert-de9da093' into 'develop' · 4f1b31b8
  therealwolf authored Nov 17, 2020
```
Revert "Merge branch 'hivefest-plus' into 'develop'"

See merge request !78
```
  4f1b31b8
- Revert "Merge branch 'hivefest-plus' into 'develop'" · 57e275e3
  therealwolf authored Nov 17, 2020
```
This reverts merge request !77
```
  57e275e3
- Merge branch 'hivefest-plus' into 'develop' · de9da093
  therealwolf authored Nov 17, 2020
```
Hivefest and other updates

See merge request !77
```
  de9da093
- Adding Beaxy · a4da3031
  RK authored Nov 16, 2020
  
  a4da3031
- Upload New File · 0645c2ce
  RK authored Nov 16, 2020
  
  0645c2ce
16 Nov, 2020 5 commits
- Changed 'blockchain' in title for 'ecosystem' to offer a more correct representation. · d88a72c6
  RK authored Nov 16, 2020
  
  d88a72c6
- Correction on transaction speed · f5ea4da4
  RK authored Nov 16, 2020
```
Correction dozens of dApps, changed to myriad as conflicting regarding previous statement of being battle-tested by hundreds
```
  f5ea4da4
- Replace blurb with one that offers more information about Hive. Also minor rewording. · 3b16c600
  RK authored Nov 16, 2020
  
  3b16c600
- Fix the Exchanges title CSS · 347dbcf9
  RK authored Nov 16, 2020
  
  347dbcf9
- Adding the NFT Showroom · 6850a025
  RK authored Nov 16, 2020
  
  6850a025