Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop to Master #4

Merged
merged 16 commits into from
Jun 27, 2016
Merged

Develop to Master #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8103061
Fixed display issue with ticket filter
polonel Apr 12, 2016
654d10f
Changed Breakdown Icon
polonel Apr 12, 2016
f5d0e53
Updated Install Script
polonel Apr 12, 2016
161e5b6
API Documentation Updated
polonel Apr 12, 2016
00a9db3
Merge branch 'master' into develop
polonel Apr 14, 2016
ffc1097
Misc Cleanup
polonel Apr 26, 2016
cc2e844
Charts now respect the timespan selected
polonel Apr 29, 2016
e9ad447
Missing Package.json update
polonel Apr 29, 2016
97f074c
Fixed Failing Test
polonel May 6, 2016
55f2198
Removed grunt-contrib-sass
polonel May 17, 2016
7ca8584
Fixed an issue with Ticket cache on ionic app
polonel Jun 6, 2016
b283e77
Merge branch 'develop' of https://github.com/polonel/trudesk into dev…
polonel Jun 6, 2016
30cf1ff
Fixed missing dependency
polonel Jun 20, 2016
4c13783
Updated API for Mobile App
polonel Jun 20, 2016
519e99c
Fixed Error in Route
polonel Jun 20, 2016
aca9a00
development route fix
polonel Jun 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added addins/.gitkeep
View file
Open in desktop
Empty file.
5 changes: 3 additions & 2 deletions gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ module.exports = function(grunt) {
files: [
'*.js',
'src/**/*.js',
'routes/**/*.js'
'routes/**/*.js',
'plugins/**/*.js'
],
tasks: ['express:web'],
options: {
Expand Down Expand Up @@ -129,7 +130,7 @@ module.exports = function(grunt) {
},

sass: {
build: {
dist: {
files: {
'public/css/app.css': 'src/sass/app.sass'
}
Expand Down
7 changes: 5 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@
"body-parser": "^1.12.3",
"busboy": "^0.2.9",
"chance": "^0.8.0",
"clone": "^1.0.2",
"coffee-script": "^1.10.0",
"connect-flash": "^0.1.1",
"connect-mongo": "^0.8.1",
"cookie": "^0.2.3",
"cookie-parser": "^1.3.4",
"daemon": "^1.1.0",
"debug": "^2.1.3",
"dive": "^0.5.0",
"email-templates": "^2.0.1",
"express": "^4.12.3",
"express-hbs": "^0.8.4",
Expand All @@ -31,10 +33,10 @@
"grunt-apidoc": "^0.10.1",
"grunt-contrib-cssmin": "^0.14.0",
"grunt-contrib-requirejs": "^0.4.4",
"grunt-contrib-sass": "^0.9.2",
"grunt-shell": "^1.1.2",
"grunt-contrib-uglify": "^0.11.0",
"grunt-jsdoc": "^1.0.0",
"grunt-sass": "^1.2.0",
"grunt-shell": "^1.1.2",
"handlebars": "^4.0.5",
"imap": "^0.8.14",
"kerberos": "0.0.17",
Expand Down Expand Up @@ -62,6 +64,7 @@
"uglify-js": "^2.4.20",
"underscore": "^1.8.3",
"underscore.string": "^3.0.3",
"unzip": "^0.1.11",
"util": "^0.10.3",
"winston": "^2.1.1"
},
Expand Down
Loading