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.

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

Sprint7 b03990 d01295 minor issues #156

Merged
merged 16 commits into from
Dec 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
language: node_js

node_js:
- "6"
- "8"

addons:
- chrome: stable

services:
- xvfb

before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- npm start > /dev/null &
- npm run update-webdriver
- sleep 1 # give server time to start
Expand Down
3 changes: 3 additions & 0 deletions Gruntfile.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
var sass = require('node-sass');

module.exports = function (grunt) {

var build = {
Expand Down Expand Up @@ -179,6 +181,7 @@ module.exports = function (grunt) {

sass: {
options: {
implementation: sass,
sourceMap: false
},
dist: {
Expand Down
2 changes: 1 addition & 1 deletion app/views/detail/service.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ <h1>
<div ng-include="'views/detail/service/' + activeTab + '.html'"></div>
</div>

<div class="container notes-container">
<div class="container notes-container" ng-if="service.notes.length">
<h2>Notes</h2>
<hr />
<table ng-table="notesTableParams" template-pagination="views/customPaginationControls.html" show-filter="false" class="table borderless service-notes-table">
Expand Down
2 changes: 1 addition & 1 deletion app/views/management/notes.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<td class="actions-column text-center">
<span class="glyphicon glyphicon-pencil" title="edit" ng-click="editNote(note)"></span>
<span class="glyphicon glyphicon-time" title="schedule" ng-click="editSchedule(note)"></span>
<span class="glyphicon glyphicon-trash" title="delte" ng-click="confirmDelete(note)"></span>
<span class="glyphicon glyphicon-trash" title="delete" ng-click="confirmDelete(note)"></span>
</td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion karma.conf.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ module.exports = function (config) {

frameworks: ['jasmine'],

browsers: ['Chrome', 'Firefox'],
browsers: ['ChromeHeadless', 'Firefox'],

plugins: [
'karma-chrome-launcher',
Expand Down
Loading