Merge remote-tracking branch 'origin/master'

# Conflicts:
#	asm/libraries/tomcrypt
This commit is contained in:
WolverinDEV 2018-08-15 21:07:18 +02:00
commit 68c4482e0c
3 changed files with 18 additions and 2 deletions

5
.gitignore vendored
View file

@ -7,3 +7,8 @@ auth/js/auth.js.map
.idea/ .idea/
#This is just for me local (a nice animation which i may implement later) #This is just for me local (a nice animation which i may implement later)
animates/ animates/
asm/**
!asm/identity/
!asm/src/
!asm/CMakeLists.txt
!asm/make_opus.sh

View file

@ -4,7 +4,10 @@ Welcome here! This repository is created with two reasons:
1. People can bring their own ideas and follow their implementation 1. People can bring their own ideas and follow their implementation
2. People can see TeaSpeak Web client progress and avoid creating repetitive issues all the time. 2. People can see TeaSpeak Web client progress and avoid creating repetitive issues all the time.
#Requirements
1. TypeScript Version 2.8.3
#
To **report an issue**, then find and push the **New Issue** button, fill all the fields you see in a template, and then click the **Submit new issue** button. To **report an issue**, then find and push the **New Issue** button, fill all the fields you see in a template, and then click the **Submit new issue** button.

View file

@ -1,7 +1,7 @@
{ {
"name": "client", "name": "client",
"version": "1.0.0", "version": "1.0.0",
"description": "", "description": "Welcome here! This repository is created with two reasons:\r 1. People can bring their own ideas and follow their implementation\r 2. People can see TeaSpeak Web client progress and avoid creating repetitive issues all the time.",
"main": "main.js", "main": "main.js",
"directories": { "directories": {
"test": "test" "test": "test"
@ -20,5 +20,13 @@
"@types/jquery": "^3.3.0", "@types/jquery": "^3.3.0",
"@types/text-encoding": "0.0.32", "@types/text-encoding": "0.0.32",
"@types/websocket": "0.0.38" "@types/websocket": "0.0.38"
} },
"repository": {
"type": "git",
"url": "git+https://github.com/MypowerHD/TeaWeb.git"
},
"bugs": {
"url": "https://github.com/MypowerHD/TeaWeb/issues"
},
"homepage": "https://github.com/MypowerHD/TeaWeb#readme"
} }