Skip to content

Commit

Permalink
Merged in entirely new server codebase
Browse files Browse the repository at this point in the history
  • Loading branch information
andersevenrud committed Nov 19, 2016
1 parent a89ef7a commit 47ad225
Show file tree
Hide file tree
Showing 130 changed files with 7,571 additions and 7,852 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ src/client/stylesheets/**
src/client/themes/**
src/templates/**
src/installer/**
src/server/node/modules/**/example.js
src/server/php/**
src/server/test/**
src/client/test/**
Expand Down
5 changes: 3 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
"unescape": true,
"EventTarget": true,
"Uint8Array": true,
"ArrayBuffer": true
"ArrayBuffer": true,
"Promise": true
},
"rules": {
"brace-style": 2,
Expand Down Expand Up @@ -44,7 +45,7 @@
],
"no-eq-null": 2,
"strict": [
2,
1,
"function"
],
"no-unused-expressions": 2,
Expand Down
6 changes: 0 additions & 6 deletions .jsdoc-client

This file was deleted.

6 changes: 0 additions & 6 deletions .jsdoc-server

This file was deleted.

4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ You can also submit patches and questions directly to me via [email](mailto:ande

## Information

Please read http://os.js.org/doc/manuals/man-development.html before you start making and submitting contributions to the repository.
You can find information about development here: https://os.js.org/manual/development/

## Resources

* [Homepage](https://os.js.org/)
* [Documentation](https://os.js.org/doc/)
* [Manual](https://os.js.org/manual/)
* [FAQ and discussion](https://github.com/os-js/OS.js/issues/49)
* [Chat room](https://gitter.im/os-js/OS.js)
* [Subreddit](https://www.reddit.com/r/osjs)
Expand Down
4 changes: 0 additions & 4 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,6 @@
grunt.log.writeln('This task is deprecated. use "grunt generate:package --name=REPO/NAME" instead.'['yellow'].bold);
});

grunt.registerTask('create-handler', '(DEPRECATED) Create a new handler with given name', function(arg1) {
grunt.log.writeln('This task is deprecated. use "grunt generate:handler --name=MyName" instead.'['yellow'].bold);
});

//
// Register aliases
//
Expand Down
73 changes: 1 addition & 72 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,6 @@ Installation is done in a few simple steps and only takes a minute to get runnin

For more general information look at the [README](README.md) file or in the [official documentation](https://os.js.org/doc/).

#### Table of Contents

* [Dependencies](#dependencies)
* [Installation methods](#installation)
1. Standard Installation
* [*NIX](#nix)
* [Windows](#windows)
2. Containers and Virtual Machines
* [Vagrant](#vagrant)
* [Docker](#docker)
* [NW.js](#nwjs)
3. Single-board-computers
* [Raspberry PI](#raspberry-pi)
* [Arduino](#arduino)
* [Intel Edison](#intel-edison)
4. Linux distribution
* [Setting up optional features](#setting-up-optional-features)

# Dependencies

You only need these packages installed:
Expand All @@ -32,58 +14,5 @@ You only need these packages installed:

# Installation

OS.js runs on all patforms and web-servers. Choose one of the methods described below, then proceed to the [run](#running) section.

## Standard Installation

You can also find documentation on this on the [official homepage](https://os.js.org/doc/manuals/man-install.html).

If you want to install on your computer or server directly:

### *NIX

See [install-nix.md](https://github.com/os-js/OS.js/blob/master/doc/install-nix.md).

### Windows

See [install-windows.md](https://github.com/os-js/OS.js/blob/master/doc/install-windows.md).

## Containers and Virtual Machines

If you want to install on your computer, but in an isolated environment (container)

### Vagrant

See [Vagrant.md](https://github.com/os-js/OS.js/blob/master/doc/Vagrant.md).

### Docker

See [Docker.md](https://github.com/os-js/OS.js/blob/master/doc/Docker.md).

### NW.js

See [NW.md](https://github.com/os-js/OS.js/blob/master/doc/NW.md).

## Single-board-computers

You can also install/deploy OS.js on these platforms, but has some spesific documentation:

### Raspberry PI

See [platform-raspi.md](https://github.com/os-js/OS.js/blob/master/doc/platform-raspi.md).

### Arduino

See [platform-arduino.md](https://github.com/os-js/OS.js/blob/master/doc/platform-arduino.md).

### Intel Edison

See [platform-edison.md](https://github.com/os-js/OS.js/blob/master/doc/platform-edison.md).

## Linux distribution

OS.js can run as a Linux distribution on top of X11. See [X11.md](https://github.com/os-js/OS.js/blob/master/doc/X11.md) for more information.

# Setting up optional features
https://os.js.org/manual/installation/

Visit the [official documentation](https://os.js.org/doc/manuals/) for more information.
6 changes: 0 additions & 6 deletions bin/gendoc

This file was deleted.

2 changes: 1 addition & 1 deletion bin/mysql-user.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@

function init() {
var config = JSON.parse(fs.readFileSync(path.join(ROOT, 'src', 'server', 'settings.json')));
var cfg = config.handlers.mysql;
var cfg = config.modules.auth.mysql;
var ccfg = {};

Object.keys(cfg).forEach(function(c) {
Expand Down
8 changes: 0 additions & 8 deletions doc/Docker.md

This file was deleted.

15 changes: 0 additions & 15 deletions doc/Vagrant.md

This file was deleted.

71 changes: 0 additions & 71 deletions doc/handler-mysql.md

This file was deleted.

9 changes: 0 additions & 9 deletions doc/handler-mysql.sql

This file was deleted.

63 changes: 0 additions & 63 deletions doc/handler-pam.md

This file was deleted.

56 changes: 0 additions & 56 deletions doc/handler-shadow.md

This file was deleted.

Loading

0 comments on commit 47ad225

Please sign in to comment.