Justin van der Merwe justinvdm
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/utils/travis-release.sh b/utils/travis-release.sh | |
| index a6ffc05..b161272 100755 | |
| --- a/utils/travis-release.sh | |
| +++ b/utils/travis-release.sh | |
| @@ -1,7 +1,7 @@ | |
| #!/bin/sh | |
| set -e | |
| -function release() { | |
| +release() { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/tuneme/client/css/style.scss b/tuneme/client/css/style.scss | |
| index 4750591..93de45f 100644 | |
| --- a/tuneme/client/css/style.scss | |
| +++ b/tuneme/client/css/style.scss | |
| @@ -4,4 +4,4 @@ | |
| @import "layout/layout"; | |
| @import "modules/modules"; | |
| @import "state/state"; | |
| -@import "version"; | |
| +@import "versions"; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/tuneme/templates/new/base.html b/tuneme/templates/new/base.html | |
| index d21cbb5..e4e8b47 100644 | |
| --- a/tuneme/templates/new/base.html | |
| +++ b/tuneme/templates/new/base.html | |
| @@ -32,7 +32,7 @@ | |
| LargeScreen = ((window.innerWidth || document.documentElement.clientWidth || document.body.clientWidth) >= 200); | |
| var operaMiniSingleView = '{% compress css %}{% spaceless %} | |
| - <link rel="stylesheet" type="text/x-scss" media="handheld" href="{{ STATIC_URL }}new/css/{{ ENV }}/opera_single_view.css"> | |
| + <link rel="stylesheet" type="text/css" media="handheld" href="{{ STATIC_URL }}new/css/{{ ENV }}/opera_single_view.css"> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| var PaginatedExtended = PaginatedState.extend(function(self, name, opts) { | |
| PaginatedState.call(self, name, opts); | |
| self.choices.try_again = 'Try again'; | |
| self.on('state:input', function(e) { | |
| var content = (e.content || '').trim(); | |
| var choice = self._current_choices[+content - 1]; | |
| if (choice == 'try_again') { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/gulpfile.js b/gulpfile.js | |
| index cbd611f..7a87d7c 100644 | |
| --- a/gulpfile.js | |
| +++ b/gulpfile.js | |
| @@ -9,24 +9,46 @@ var gulp = require('gulp'), | |
| notify = require('gulp-notify'), | |
| sourcemaps = require('gulp-sourcemaps'), | |
| sassdoc = require('sassdoc'), | |
| - livereload = require('gulp-livereload'), | |
| - scss_destination = 'iogt/static/css'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/gulpfile.js b/gulpfile.js | |
| index cbd611f..7a87d7c 100644 | |
| --- a/gulpfile.js | |
| +++ b/gulpfile.js | |
| @@ -9,24 +9,46 @@ var gulp = require('gulp'), | |
| notify = require('gulp-notify'), | |
| sourcemaps = require('gulp-sourcemaps'), | |
| sassdoc = require('sassdoc'), | |
| - livereload = require('gulp-livereload'), | |
| - scss_destination = 'iogt/static/css'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/gulpfile.js b/gulpfile.js | |
| index cbd611f..7a87d7c 100644 | |
| --- a/gulpfile.js | |
| +++ b/gulpfile.js | |
| @@ -9,24 +9,46 @@ var gulp = require('gulp'), | |
| notify = require('gulp-notify'), | |
| sourcemaps = require('gulp-sourcemaps'), | |
| sassdoc = require('sassdoc'), | |
| - livereload = require('gulp-livereload'), | |
| - scss_destination = 'iogt/static/css'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/gulpfile.js b/gulpfile.js | |
| index cbd611f..7a87d7c 100644 | |
| --- a/gulpfile.js | |
| +++ b/gulpfile.js | |
| @@ -9,24 +9,46 @@ var gulp = require('gulp'), | |
| notify = require('gulp-notify'), | |
| sourcemaps = require('gulp-sourcemaps'), | |
| sassdoc = require('sassdoc'), | |
| - livereload = require('gulp-livereload'), | |
| - scss_destination = 'iogt/static/css'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/containers/FirstEventContainer.js b/src/containers/FirstEventContainer.js | |
| index 9a3b72c..7bd4df0 100644 | |
| --- a/src/containers/FirstEventContainer.js | |
| +++ b/src/containers/FirstEventContainer.js | |
| @@ -1,7 +1,7 @@ | |
| import { connect } from 'react-redux'; | |
| import { FirstEvent } from 'src/components'; | |
| import { getAuthUserProfile } from 'src/stores/helpers'; | |
| -import { changeNavToScheduledCallsTab } from 'src/actions/navigation'; | |
| +import { addScheduledCall } from 'src/actions/schedule'; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/containers/FirstEventContainer.js b/src/containers/FirstEventContainer.js | |
| index 9a3b72c..3074b90 100644 | |
| --- a/src/containers/FirstEventContainer.js | |
| +++ b/src/containers/FirstEventContainer.js | |
| @@ -1,7 +1,7 @@ | |
| import { connect } from 'react-redux'; | |
| import { FirstEvent } from 'src/components'; | |
| import { getAuthUserProfile } from 'src/stores/helpers'; | |
| -import { changeNavToScheduledCallsTab } from 'src/actions/navigation'; | |
| +import { addScheduledCall } from 'src/actions/schedule'; |