Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/Webinate/users into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MKHenson committed Jul 23, 2016
2 parents 28ace83 + 43b743d commit da98762
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion install-script-dev.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -e
echo "Downloading latest version from github dev"

#download latest
wget https://github.com/MKHenson/users/archive/dev.zip
wget https://github.com/Webinate/users/archive/dev.zip
unzip -o "dev.zip" "users-dev/*"

# Moves the dist folder to the current directory
Expand Down
2 changes: 1 addition & 1 deletion install-script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ version() {
echo "Downloading latest version from github $(version)"

#download latest
wget https://github.com/MKHenson/users/archive/v$(version).zip
wget https://github.com/Webinate/users/archive/v$(version).zip
unzip -o "v$(version).zip" "users-$(version)/*"

# Moves the dist folder to the current directory
Expand Down
7 changes: 3 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Users
===============

A small library providing utility methods for logging in and managing users. The application runs as a standalone
server with a RESTful API that allows you to interact with the underlying functions. Users requires NodeJS v.0.12.0 (or IO.js),
Node Package Manager (NPM) and a running instance of mongoDB
Expand Down Expand Up @@ -29,11 +28,11 @@ cd users

If you want the latest stable release
```
sudo curl -o- https://raw.githubusercontent.com/MKHenson/webinate-users/master/install-script.sh | bash
sudo curl -o- https://raw.githubusercontent.com/Webinate/users/master/install-script.sh | bash
```
If you want the latest dev release
```
sudo curl -o- https://raw.githubusercontent.com/MKHenson/webinate-users/dev/install-script-dev.sh | bash
sudo curl -o- https://raw.githubusercontent.com/Webinate/users/dev/install-script-dev.sh | bash
```

3) Call 'npm install' to load the dependencies for building the project from source code
Expand Down Expand Up @@ -65,7 +64,7 @@ The server uses mongoDB as its database engine - make sure this is running befor
node main.js --config="config.json" --logging="true" --logFile="logs.log" --numThreads="max"

The config file must be formatted as a valid JSON.
Please have a look at the [latest config definition](https://github.com/MKHenson/users/blob/master/src/definitions/custom/definitions.d.ts#L331)
Please have a look at the [latest config definition](https://github.com/Webinate/users/blob/master/src/definitions/custom/definitions.d.ts#L331)
for details of what each parameter does.

## Socket API
Expand Down
6 changes: 3 additions & 3 deletions src/dist-files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
"main": "server/Main.js",
"repository": {
"type": "git",
"url": "https://github.com/MKHenson/webinate-users.git"
"url": "https://github.com/Webinate/users.git"
},
"author": "Mathew Henson <[email protected]> (http://webinate.net)",
"license": "ISC",
"bugs": {
"url": "https://github.com/MKHenson/webinate-users/issues"
"url": "https://github.com/Webinate/users/issues"
},
"homepage": "https://github.com/MKHenson/webinate-users",
"homepage": "https://github.com/Webinate/users",
"dependencies": {
"entities": "~1.1.1",
"morgan": "~1.5.1",
Expand Down

0 comments on commit da98762

Please sign in to comment.