Browse Source

Merge branch 'experimental' of https://github.com/Musare/MusareNode into experimental

Kristian Vos 5 years ago
parent
commit
4e01768145
3 changed files with 4 additions and 4 deletions
  1. 2 2
      README.md
  2. 1 1
      docker-compose.yml
  3. 1 1
      frontend/components/User/Settings.vue

+ 2 - 2
README.md

@@ -34,8 +34,8 @@ Option 1: (not recommended for Windows users)
 Option 2:
  * [NodeJS](https://nodejs.org/en/download/)
  	* nodemon: `npm install -g nodemon`
- 	* node-gyp: `npm install -g node-gyp` [Instructions](https://github.com/nodejs/node-gyp/#installation)
- * [MongoDB](https://www.mongodb.com/download-center) Latest version *Known issues above version 3.3*
+ 	* [node-gyp](https://github.com/nodejs/node-gyp#installation): `npm install -g node-gyp`
+ * [MongoDB](https://www.mongodb.com/download-center) Currently version 4.0
  * [Redis (Windows)](https://github.com/MSOpenTech/redis/releases/tag/win-3.2.100) [Redis (Unix)](https://redis.io/download)
 
 ## Getting Started

+ 1 - 1
docker-compose.yml

@@ -17,7 +17,7 @@ services:
     volumes:
     - ./frontend:/opt/app
   mongo:
-    image: mongo:3.3
+    image: mongo:4.0
     ports:
     - "27017:27017"
     command: "--auth"

+ 1 - 1
frontend/components/User/Settings.vue

@@ -52,7 +52,7 @@
 		</div>
 		<a href="#" v-if="passwordStep === 1 && !password" @click="passwordStep = 2">Skip this step</a>
 
-		<a class="button is-github" v-if="!github" :href='"http://" + $parent.serverDomain + "/auth/github/link"'>
+		<a class="button is-github" v-if="!github" :href='$parent.serverDomain + "/auth/github/link"'>
 			<div class='icon'>
 				<img class='invert' src='/assets/social/github.svg'/>
 			</div>