Permalink
Browse files

Merge branch 'master' of github.com:LockerProject/Locker

  • Loading branch information...
2 parents 7ebf761 + f97239c commit 4ef6870a643411df19baa563af7768b82c6559b9 @smurthas smurthas committed Oct 20, 2011
Showing with 6 additions and 11 deletions.
  1. +1 −1 Apps/MergedContacts
  2. +1 −0 Apps/UseUI/dashboard-client.js
  3. +3 −8 Apps/UseUI/static/js/app.js
  4. +0 −1 Apps/UseUI/static/js/ga.js
  5. +1 −1 Apps/photosv0.9
Submodule MergedContacts updated 46 files
+ static/css/Muli-Light-webfont.eot
+146 −0 static/css/Muli-Light-webfont.svg
+ static/css/Muli-Light-webfont.ttf
+ static/css/Muli-Light-webfont.woff
+ static/css/Muli-Regular-webfont.eot
+146 −0 static/css/Muli-Regular-webfont.svg
+ static/css/Muli-Regular-webfont.ttf
+ static/css/Muli-Regular-webfont.woff
+ static/css/nevis-webfont.eot
+156 −0 static/css/nevis-webfont.svg
+ static/css/nevis-webfont.ttf
+ static/css/nevis-webfont.woff
+313 −442 static/css/style.css
+ static/img/18-envelope.png
+ static/img/facebook-logo.png
+ static/img/flickr.png
+ static/img/foursquare-logo.png
+ static/img/github-logo-bg.png
+ static/img/github-logo.png
+ static/img/mail.png
+ static/img/search.png
+ static/img/social-icons/facebook.png
+ static/img/social-icons/flickr.png
+ static/img/social-icons/foursquare.png
+ static/img/social-icons/github.png
+ static/img/social-icons/mail.png
+ static/img/social-icons/twitter.png
+ static/img/spinner.gif
+ static/img/twitter.png
+4 −0 static/img/www.addictedtocoffee.de/AUTHOR.txt
+32 −0 static/img/www.addictedtocoffee.de/LICENSE.txt
+ static/img/www.addictedtocoffee.de/facebook.png
+ static/img/www.addictedtocoffee.de/facebook_hover.png
+ static/img/www.addictedtocoffee.de/flickr.png
+ static/img/www.addictedtocoffee.de/foursquare.png
+ static/img/www.addictedtocoffee.de/github.png
+ static/img/www.addictedtocoffee.de/social-github-black-g.png
+ static/img/www.addictedtocoffee.de/social-github-black-octocat.png
+ static/img/www.addictedtocoffee.de/social-github-blue-g.png
+ static/img/www.addictedtocoffee.de/social-github-blue-octocat.png
+ static/img/www.addictedtocoffee.de/social_linked-in.png
+8 −0 static/img/www.addictedtocoffee.de/tumblr.webloc
+ static/img/www.addictedtocoffee.de/twitter.png
+74 −107 static/index.html
+31 −58 static/js/client.js
+0 −1 static/js/config.js.example
@@ -71,6 +71,7 @@ var options = { logger: {
debug: new Function()
}};
var io = socketio.listen(app,options);
+io.set("transports", ["jsonp-polling", "xhr-polling", "htmlfile"]);
app.get('/apps', function(req, res) {
res.writeHead(200, {'Content-Type': 'application/json'});
@@ -11,7 +11,7 @@ var searchSelector = '.search-header-row:not(.template),.search-result-row:not(.
if ( ! window.location.origin) window.location.origin = window.location.protocol+"//"+window.location.host;
var externalBase = window.location.origin;
-var _gaq = _gaq || [];
+var _gaq = [['_setAccount', 'UA-22812443-1'], ['_trackPageview']];;
$(document).ready(
function() {
@@ -156,7 +156,6 @@ $(document).ready(
renderApp();
- $(window).resize(resizeFrame);
resizeFrame();
}
);
@@ -448,9 +447,7 @@ function drawViewer(viewer, isSelected) {
$.get('/synclets/github/run?id=repos', function(){});
showGritter('syncgithub');
try {
- if (typeof _gaq !== "undefined" && _gaq !== null) {
- _gaq.push(['_trackPageview', '/track/syncviewers']);
- }
+ _gaq.push(['_trackPageview', '/track/syncviewers']);
} catch(err) {
console.error(err);
}
@@ -487,9 +484,7 @@ function drawViewers() {
drawViewer(viewersToRender[i], data.selected[app] === viewersToRender[i].handle);
if (viewersToRender[i].author !== 'Singly') {
try {
- if (typeof _gaq !== "undefined" && _gaq !== null) {
- _gaq.push(['_trackPageview', '/track/installedviewers']);
- }
+ _gaq.push(['_trackPageview', '/track/installedviewers']);
} catch(err) {
console.error(err);
}
@@ -1,4 +1,3 @@
-_gaq = [['_setAccount', 'UA-22812443-1'], ['_trackPageview']];
(function(d, t) {
var g = d.createElement(t),
s = d.getElementsByTagName(t)[0];

0 comments on commit 4ef6870

Please sign in to comment.