Skip to content

Commit

Permalink
Merge branch 'develop' into feature/elasticsearch
Browse files Browse the repository at this point in the history
  • Loading branch information
polonel committed Jan 30, 2019
2 parents ab5cb14 + 10a08de commit 080eb35
Show file tree
Hide file tree
Showing 335 changed files with 305,756 additions and 118,692 deletions.
3 changes: 3 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/react", "@babel/env"]
}
93 changes: 93 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
version: 2.1

commands:
yarninstall:
steps:
- restore_cache:
name: Restore Yarn Package Cache
keys:
- yarn-packages-{{ checksum "yarn.lock" }}
- run:
name: Install Dependencies
command: yarn install --frozen-lockfile
- save_cache:
name: Save Yarn Package Cache
key: yarn-packages-{{ checksum "yarn.lock" }}
paths:
- ~/.cache/yarn

jobs:
build_general:
docker:
- image: circleci/node:10-stretch
- image: circleci/mongo:3.6
working_directory: ~/trudesk
steps:
- checkout
- yarninstall
- run:
name: Run Tests
command: yarn run test
- run:
name: Run Build
command: yarn run build
build_develop:
docker:
- image: circleci/node:10-stretch
- image: circleci/mongo:3.6
working_directory: ~/trudesk
steps:
- checkout
- yarninstall
- run:
name: Run Tests
command: yarn run test
- run:
name: Run Build
command: yarn run build
- run:
name: Run Codacy
command: yarn run codacy
build_production:
docker:
- image: circleci/node:10-stretch
- image: circleci/mongo:3.6
working_directory: ~/trudesk
steps:
- checkout
- run:
name: Install npx
command: sudo npm i -g npx
- yarninstall
- run:
name: Run Tests
command: yarn run test
- run:
name: Run Codacy
command: yarn run codacy
- run:
name: Semantic Release
command: npx semantic-release

workflows:
version: 2.1
general:
jobs:
- build_general:
filters:
branches:
ignore:
- develop
- master
develop:
jobs:
- build_develop:
filters:
branches:
only: develop
production:
jobs:
- build_production:
filters:
branches:
only: master
4 changes: 4 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/src/public/js/plugins/*
/src/public/js/vendor/*
/mobile/*
/public/*
37 changes: 16 additions & 21 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,30 @@
{
"plugins": ["node"],
"extends": ["eslint:recommended", "plugin:node/recommended"],
"plugins": ["import", "prettier", "standard"],
"extends": ["standard", "prettier", "prettier/standard"],
"root": true,
"parserOptions": {
"ecmaVersion": 5
},
"env": {
"browser": true,
"node": true
"node": true,
"mocha": true
},
"rules": {
"standard/no-callback-literal": 0, // enable after error handing refactor
"node/exports-style": ["error", "module.exports"],
"new-cap": 0,
"no-console": "off",
// "new-cap": "error",
"quotes": ["error", "single"],
"curly": ["error", "multi-or-nest"],
"complexity": ["error", 20],
"wrap-iife": ["error", "outside"],
"semi": ["error", "always"],
"no-extra-semi": "error",
"no-func-assign": "error",
"no-redeclare": "error"
"complexity": ["error", 20]
},
"globals": {
"angular": 1,
"define": 1,
"requirejs": 1,
"MG": 1,
"Snackbar": 1,
"ROLES": 1,
"io": 1,
"d3": 1
"angular": true,
"define": true,
"requirejs": true,
"MG": true,
"Snackbar": true,
"ROLES": true,
"io": true,
"d3": true
}
}
}
1 change: 1 addition & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exemptLabels:
- critical
- in progress
- planned
- backlog
# Label to use when marking an issue as stale
staleLabel: wontfix
# Comment to post when marking an issue as stale. Set to `false` to disable
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ node_modules
*.sassc

#custom
package-lock.json
config.json
import.csv
/src/mailer/templates/promo/
Expand All @@ -53,3 +54,9 @@ public/css/app.css
*.local
sonar-project.properties
.scannerwork/

public/uploads/assets/*.*
/src/backup/bin/
backups/

public/uploads/assets/upload/
19 changes: 0 additions & 19 deletions .travis.yml

This file was deleted.

66 changes: 66 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,69 @@
## [1.0.5](https://github.com/polonel/trudesk/compare/v1.0.4...v1.0.5) (2019-01-09)


### Bug Fixes

* **api:** tickets [#124](https://github.com/polonel/trudesk/issues/124) - unable to update ticket status ([ab614a4](https://github.com/polonel/trudesk/commit/ab614a4))
* **backup:** crash on restore ([a613612](https://github.com/polonel/trudesk/commit/a613612))
* **backup:** restore directory fails to create ([d68a045](https://github.com/polonel/trudesk/commit/d68a045))
* **backup:** restore sending error response to soon ([605c8d8](https://github.com/polonel/trudesk/commit/605c8d8))
* **mailcheck:** event leak ([23eaab3](https://github.com/polonel/trudesk/commit/23eaab3))
* **nav:** disappearing dashboard button ([32a4e87](https://github.com/polonel/trudesk/commit/32a4e87))
* **overdue:** overdue card showing incorrect tickets ([72e2584](https://github.com/polonel/trudesk/commit/72e2584))
* **tags:** tags with min2 were not creating ([9a22364](https://github.com/polonel/trudesk/commit/9a22364))
* **ticket:** fix [#116](https://github.com/polonel/trudesk/issues/116) - ability to configure character limit on tickets ([88ae488](https://github.com/polonel/trudesk/commit/88ae488))

## [1.0.4](https://github.com/polonel/trudesk/compare/v1.0.3...v1.0.4) (2019-01-03)


### Bug Fixes

* **appearance:** dark theme colors ([7ac11ad](https://github.com/polonel/trudesk/commit/7ac11ad))
* **attachments:** failed to upload on docker ([36a5bcb](https://github.com/polonel/trudesk/commit/36a5bcb))
* **crash:** idle users array out-of-bounds ([ebacda9](https://github.com/polonel/trudesk/commit/ebacda9))
* **mailer:** undefined value error ([b3658f1](https://github.com/polonel/trudesk/commit/b3658f1))


### Reverts

* **routes:** miscommit ([9198e47](https://github.com/polonel/trudesk/commit/9198e47))

## [1.0.3](https://github.com/polonel/trudesk/compare/v1.0.2...v1.0.3) (2018-12-03)


### Bug Fixes

* **accounts:** crash if user was deleted with active conversations [#109](https://github.com/polonel/trudesk/issues/109) ([6ea0ad4](https://github.com/polonel/trudesk/commit/6ea0ad4))
* **assets:** security fix ([b081965](https://github.com/polonel/trudesk/commit/b081965))
* **install:** server crash due to invalid middleware ([88367d9](https://github.com/polonel/trudesk/commit/88367d9))
* **mobile:** secure assets not loading ([dca823e](https://github.com/polonel/trudesk/commit/dca823e))
* **reports:** unable to download reports [#106](https://github.com/polonel/trudesk/issues/106) ([a2cdb7f](https://github.com/polonel/trudesk/commit/a2cdb7f))
* **sass:** not compiling for install server ([e0f744d](https://github.com/polonel/trudesk/commit/e0f744d))
* **static:** file access path ([568c343](https://github.com/polonel/trudesk/commit/568c343))
* **style:** disabled classes applied incorrectly ([884519c](https://github.com/polonel/trudesk/commit/884519c))
* **style:** incorrect border style ([5edfb0f](https://github.com/polonel/trudesk/commit/5edfb0f))
* **styles:** incorrect styles ([ae0d82f](https://github.com/polonel/trudesk/commit/ae0d82f))
* **tickettype:** crash when deleting ticket type [#113](https://github.com/polonel/trudesk/issues/113) ([dc4d335](https://github.com/polonel/trudesk/commit/dc4d335))


### Reverts

* **static:** files path var ([dd440e0](https://github.com/polonel/trudesk/commit/dd440e0))

## [1.0.2](https://github.com/polonel/trudesk/compare/v1.0.1...v1.0.2) (2018-11-03)


### Bug Fixes

* **assets:** security fix ([4f6c00d](https://github.com/polonel/trudesk/commit/4f6c00d))
* **database:** connection returning true even if error occured ([0156c4b](https://github.com/polonel/trudesk/commit/0156c4b))
* **database:** removed incorrect events ([357752d](https://github.com/polonel/trudesk/commit/357752d))
* **mobile:** chrome 53+ not allowing selects to open. [#96](https://github.com/polonel/trudesk/issues/96) ([7d71135](https://github.com/polonel/trudesk/commit/7d71135))
* **styles:** issue [#101](https://github.com/polonel/trudesk/issues/101) editing issue/comment/note ([46ab7e8](https://github.com/polonel/trudesk/commit/46ab7e8))
* **styles:** new tickets had incorrect classes ([4793c31](https://github.com/polonel/trudesk/commit/4793c31))
* **tickets:** public ticket crash [#103](https://github.com/polonel/trudesk/issues/103) ([19b75f1](https://github.com/polonel/trudesk/commit/19b75f1))
* **timezone:** option to set local timezone ([e3eb12a](https://github.com/polonel/trudesk/commit/e3eb12a))

## [1.0.1](https://github.com/polonel/trudesk/compare/v1.0.0...v1.0.1) (2018-09-27)


Expand Down
2 changes: 1 addition & 1 deletion LICENSE.txt → LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright 2014-2018 Chris Brame
Copyright 2014-2019 Chris Brame

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
90 changes: 50 additions & 40 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,55 +1,65 @@
<a href="http://trudesk.io"><img src="http://trudesk.io/TD_Black.png" width="375" /></a>

<br/><br/>

[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7b3acb53c33b4a40bb32da109bbdd1a9)](https://www.codacy.com/app/polonel/trudesk?utm_source=github.com&utm_medium=referral&utm_content=polonel/trudesk&utm_campaign=badger)
[![Build Status](https://semaphoreci.com/api/v1/polonel/trudesk/branches/develop/badge.svg)](https://semaphoreci.com/polonel/trudesk)

[http://trudesk.io](http://trudesk.io/)

Trudesk is an open source help desk solution still in active development.

Built on [Node.JS](http://nodejs.org) and [MongoDB](http://www.mongodb.org).

### Requirements
+ Node.JS v9.10.0 or later
+ MongoDB 3.6 or later

### Install & Run
1. Clone the repo using: ```git clone http://www.github.com/polonel/trudesk```
2. Install dependencies: ```npm i yarn -g && yarn```
3. Build the scripts: ```npm run build```
3. Start the server: ```npm start```
4. Navigate to: ```http://localhost:8118```

#### Ubuntu 16.04 Install Script
```curl -L -s http://www.trudesk.io/install/install_ubuntu.sh | sudo bash```

#### Trudesk Virtual Appliance
The Trudesk Virtual Appliance can quickly deploy to both Virtual Box as well as VMWare. Visit the appliance documentation for more information.
<h1 align="center">
<a href="http://trudesk.io"><img src="http://trudesk.io/TD_Black.png" width="500" /></a>
</h1>
<p align="center">
<a href="https://api.codacy.com/project/badge/Grade/7b3acb53c33b4a40bb32da109bbdd1a9"><img src="https://img.shields.io/codacy/grade/7b3acb53c33b4a40bb32da109bbdd1a9/develop.svg?style=flat-square" /></a>
<a href="https://standarsjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg?style=flat-square" /></a>
<img src="https://img.shields.io/circleci/token/ad7d2d066a75685a15c8e2fd08bd75e53b18fbb7/project/github/polonel/trudesk/develop.svg?style=flat-square" />
<a href="http://hits.dwyl.io/polonel/trudesk"><img src="http://hits.dwyl.io/polonel/trudesk.svg" /></a>
<a href="https://forum.trudesk.io"><img src="https://img.shields.io/discourse/https/forum.trudesk.io/topics.svg?style=flat-square" /></a>
<a title="Crowdin" target="_blank" href="https://crowdin.com/project/trudesk"><img src="https://d322cqt584bo4o.cloudfront.net/trudesk/localized.svg?style=flat-square"></a>
<a href="https://github.com/polonel/trudesk/blob/master/LICENSE"><img src="https://img.shields.io/badge/license-APACHE%202-green.svg?style=flat-square" /></a>
<a href="https://github.com/polonel/trudesk/releases"><img src="https://img.shields.io/github/release/polonel/trudesk.svg?style=flat-square" /></a>
<a href="http://trudesk.io/docs"><img src="https://img.shields.io/badge/documentation-click%20to%20read-blue.svg?style=flat-square" /></a>
<br />
<sub>© 2014-2019, Chris Brame (<b><a href="https://github.com/polonel">@polonel</a></b>).</sub>
</p>
<br />

### Open Source Help Desk - Simply Organized.
Quickly resolve issues & task with an easy to use solution. Built with one goal in mind, to keep work loads organized and simple. Get started today at <a href="http://trudesk.io">Trudesk.io</a>

<p align="center">
<img src="http://trudesk.io/images/hero-td-right.png" />
</p>

### Online Demo
An online demo is live with fake data at <a href="http://docker.trudesk.io">http://docker.trudesk.io</a>. <br />
<sub>**Note: demo data resets every two hours**<sub>
``` text
Username: demo.user
Password: password
```

#### Deploy Trudesk Anywhere
**Trudesk** is built with <a href="https://nodejs.org">nodejs</a> and <a href="https://mongodb.org">mongodb</a> and can run on any cloud provider, docker, bare-metal, or even a raspberry pi.
Take it for a spin on Ubuntu 16.04 with a one liner - <br />`curl -L -s http://www.trudesk.io/install/install_ubuntu.sh | sudo bash`

###### Trudesk Virtual Appliance
The Trudesk Virtual Appliance can quickly deploy to both Virtual Box and VMWare. Visit the appliance documentation for more information.
[Trudesk Virtual Appliance Documentation](http://www.trudesk.io/v1/guide/installation.html#Virtual-Appliance)

### Documentation
___Docs are still in development___

To view the online documentation: [http://www.trudesk.io/v1/guide](http://www.trudesk.io/v1/guide)

### Help
if you like what you see here, and want to help support the work being done, you could:

+ Contribute code, issues and pull requests
+ Spread the word about trudesk
+ [![alt tag](https://www.paypalobjects.com/en_US/i/btn/btn_donate_SM.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=USPWFP6P6RTKC) Or you can buy me a cup of cofee or even dinner :)
Online documentation: [http://www.trudesk.io/docs](http://www.trudesk.io/docs)

### Contributing
If you like what you see here, and want to help support the work being done, you could:
+ Report Bugs
+ Request/Implement Features
+ Refactor Codebase
+ Help Write Documentation
+ Translation - Help translate trudesk on [Crowdin](https://crwd.in/trudesk).

### Sponsors
Just a few who have made the project possible.
<br />
<a href="https://www.browserstack.com"><img src="https://trudesk.io/images/browserstack-logo-600x315.png" width="115" /></a>

Trudesk is tested with confidence using [BrowserStack](https://browserstack.com).

### License

Copyright 2014-2018 Chris Brame
Copyright 2014-2019 Chris Brame

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
Loading

0 comments on commit 080eb35

Please sign in to comment.