Commits · master · hive / hive-io

20 Apr, 2021 3 commits
- Merge branch 'develop' into 'master' · acb782dd
  therealwolf authored Apr 20, 2021
```
Develop

See merge request !102
```
  acb782dd
- Merge branch 'develop' of gitlab.syncad.com-therealwolf42:hive/hive-io into develop · b77a73f4
  therealwolf authored Apr 20, 2021
  
  b77a73f4
- gtm · ac9eb00e
  therealwolf authored Apr 20, 2021
  
  ac9eb00e
12 Apr, 2021 4 commits
- Merge branch 'develop' into 'master' · d23b2d08
  therealwolf authored Apr 12, 2021
```
Develop

See merge request !101
```
  d23b2d08
- Merge branch 'tmxs-kc' into 'develop' · 142a4dc9
  therealwolf authored Apr 12, 2021
```
Minor updates: Wallets and Ecosystem

See merge request !100
```
  142a4dc9
- Merge branch 'develop' into 'tmxs-kc' · 90596dea
  therealwolf authored Apr 12, 2021
```
# Conflicts:
#   src/helpers/var.ts
```
  90596dea
- remove stem social for now · 87a68020
  RK authored Apr 12, 2021
  
  87a68020
08 Apr, 2021 1 commit
- keychain update site and icons · 7962956a
  RK authored Apr 08, 2021
  
  7962956a
28 Mar, 2021 4 commits
- Merge branch 'develop' into 'master' · a561299b
  good-karma authored Mar 28, 2021
```
Develop

See merge request !98
```
  a561299b
- Develop · 18fac440
  good-karma authored Mar 28, 2021
  
  18fac440
- Merge branch 'leo' into 'develop' · bc2fd324
  good-karma authored Mar 28, 2021
```
add leo, rm hivesigner

See merge request !97
```
  bc2fd324
- add leo, rm hivesigner · 5890301f
  feruz authored Mar 28, 2021
  
  5890301f
23 Feb, 2021 5 commits
- Merge branch 'develop' into 'master' · 3a2d829e
  good-karma authored Feb 23, 2021
```
Develop

See merge request !95
```
  3a2d829e
- Merge branch 'NFTMart' into 'develop' · 7fabbdd1
  good-karma authored Feb 23, 2021
```
Adds NFTMart, Rising Star, Vimm and Dlux

See merge request !93
```
  7fabbdd1
- Resize images/use better dlux image · acdaf006
  Rishi Panthee authored Feb 23, 2021
  
  acdaf006
- Merge branch 'develop' into 'master' · a64d2854
  good-karma authored Feb 23, 2021
```
Develop

See merge request !94
```
  a64d2854
- Merge branch 'add-travelfeed' into 'develop' · ec395b31
  Julian Peters authored Feb 23, 2021
```
TravelFeed added

See merge request !92
```
  ec395b31
10 Feb, 2021 3 commits
- add dlux · 5d48d7c6
  Rishi Panthee authored Feb 10, 2021
  
  5d48d7c6
- reduce file size · 3eac2d11
  Rishi Panthee authored Feb 09, 2021
  
  3eac2d11
- add nftmart, rising star, vimm · 3201fd20
  Rishi Panthee authored Feb 09, 2021
  
  3201fd20
08 Feb, 2021 1 commit
- TravelFeed added · b985c4e7
  tiotdev authored Feb 08, 2021
  
  b985c4e7
27 Jan, 2021 2 commits
- Merge branch 'develop' into 'master' · 949edb30
  therealwolf authored Jan 27, 2021
```
change 3speak.online to 3speak.co

See merge request !91
```
  949edb30
- Update src/helpers/var.ts · bb7b2787
  therealwolf authored Jan 27, 2021
  
  bb7b2787
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 3 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