Skip to content

Commit

Permalink
Merge branch 'stable' of https://github.com/cs136/seashell into stable
Browse files Browse the repository at this point in the history
  • Loading branch information
e45lee committed Jul 12, 2017
2 parents ef6207c + 164a11d commit b57822d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ script:
-fcolor-diagnostics' -DCMAKE_CXX_FLAGS='-Qunused-arguments -fcolor-diagnostics'
-DPROCESSOR_COUNT=1 -DTRAVIS_BUILD=1" -l ""
- ./build_tools/install -a "-j2" -l "" -t "true"
- ./src/tests/frontend-tests/node_modules/karma/bin/karma start ./src/tests/frontend-tests/seashell.conf.js
# - ./src/tests/frontend-tests/node_modules/karma/bin/karma start ./src/tests/frontend-tests/seashell.conf.js
notifications:
slack:
secure: QTnHM1Cr1DDHY4laUKnpiQzcj3/NZ+qutlpzF6AcXBWhuGoTLLjmqIAPS6RvIpg0vHb2rxCEQ9g117iH5VFPv4FSoE5IfUeDM4CqheBvSmcbw5HmkCEgwaEcDyTd8iA0ChLmNzXsY8YEjQ5bS1xOsjLvKxwHj7Tg69ZWQhdnlDs=
2 changes: 2 additions & 0 deletions src/frontend/build/js.frontend
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.12.1/ui-bootstrap-tpls.min.js
//cdnjs.cloudflare.com/ajax/libs/angular-css/1.0.7/angular-css.min.js
//cdnjs.cloudflare.com/ajax/libs/dexie/1.4.1/dexie.js
//cdn.ravenjs.com/3.16.1/raven.min.js

# Overrides
js/lib/ui-codemirror.js
Expand All @@ -36,6 +37,7 @@ js/lib/md5.js
js/lib/bowser.min.js

# Seashell libraries
js/raven.js
js/socket/crypto.js
js/socket/websocket_client.js
js/storage-service.js
Expand Down
1 change: 1 addition & 0 deletions src/frontend/frontend/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ angular.module('frontend-app')
// makes the UI display an error message
self.report = function (error, shorthand, type) {
if (error) {
Raven.captureException(error);
console.error(error);
self.errors.push({shorthand: shorthand, error: error, type: type});
}
Expand Down
4 changes: 4 additions & 0 deletions src/frontend/frontend/frontend.js
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ angular.module('frontend-app', ['seashell-websocket', 'seashell-projects', 'ngCo
'$window', '$document', '$rootScope', 'localfiles',
function($cookies, ws, settings, errors, projects, $window, $document, $rootScope,
localfiles) {
var ck = $cookies.getObject(SEASHELL_CREDS_COOKIE);
if (ck) {
Raven.setUserContext({email: ck.user + "@uwaterloo.ca"});
}
ws.connect();
// Reload settings on (re)connect.
ws.register_callback('connected', function () {
Expand Down
1 change: 1 addition & 0 deletions src/frontend/js/raven.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Raven.config('https://[email protected]/189114').install();

0 comments on commit b57822d

Please sign in to comment.