Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
628aa2f9
authored
Nov 15, 2016
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
solved problem with Chart.js
parent
0828fa6f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
sails/src/assets/scripts/app.js
sails/src/tasks/config/concat.js
sails/src/assets/scripts/app.js
View file @
628aa2f9
...
@@ -16,7 +16,7 @@ var dashboardApp = angular.module('dashboardApp', [
...
@@ -16,7 +16,7 @@ var dashboardApp = angular.module('dashboardApp', [
'ngAnimate'
,
'ngAnimate'
,
'ngSanitize'
,
'ngSanitize'
,
'ngToast'
,
'ngToast'
,
'
C
hart.js'
,
'
c
hart.js'
,
'ngLodash'
'ngLodash'
]);
]);
...
...
sails/src/tasks/config/concat.js
View file @
628aa2f9
...
@@ -21,8 +21,8 @@ module.exports = function (grunt) {
...
@@ -21,8 +21,8 @@ module.exports = function (grunt) {
'assets/app/bower_components/angular-sanitize/angular-sanitize.js'
,
'assets/app/bower_components/angular-sanitize/angular-sanitize.js'
,
'assets/app/bower_components/ngtoast/dist/ngToast.js'
,
'assets/app/bower_components/ngtoast/dist/ngToast.js'
,
'assets/app/bower_components/chart.js/dist/Chart.js'
,
'assets/app/bower_components/chart.js/dist/Chart.
min.
js'
,
'assets/app/bower_components/angular-chart.js/dist/angular-chart.js'
,
'assets/app/bower_components/angular-chart.js/dist/angular-chart.
min.
js'
,
'assets/app/bower_components/ng-lodash/build/ng-lodash.js'
,
'assets/app/bower_components/ng-lodash/build/ng-lodash.js'
,
'assets/app/bower_components/ng-file-upload/angular-file-upload-shim.js'
,
'assets/app/bower_components/ng-file-upload/angular-file-upload-shim.js'
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment