@@ -14,6 +14,24 @@ END

 $$ LANGUAGE plpgsql;

+DROP FUNCTION IF EXISTS subscribe_link(text,int);

+CREATE OR REPLACE FUNCTION subscribe_link(username text, linkid int)

+  RETURNS bool AS $$

+DECLARE

+  uid int;

+  result bool;

+  n_title text;

+  n_url text;

+BEGIN

+  SELECT INTO result NOT exists(SELECT * FROM user_links WHERE user_id=uid AND link_id=linkid);

+  IF result THEN

+    SELECT title,url INTO n_title,n_url FROM links WHERE links.id=linkid;

+    PERFORM put_link(username, n_url, n_title);

+  END IF;

+  RETURN result;

+END

+$$ LANGUAGE plpgsql;

+

 DROP FUNCTION IF EXISTS delete_link(text,int);

 CREATE OR REPLACE FUNCTION delete_link(username text, linkid int)

   RETURNS bool AS $$

@@ -30,10 +48,25 @@ BEGIN

 END

 $$ LANGUAGE plpgsql;

+DROP FUNCTION IF EXIST has_user_shared(text, text);

+CREATE OR REPLACE FUNCTION has_user_shared(username text, linkurl text) RETURNS bool AS $$

+DECLARE

+  result bool;

+BEGIN

+  SELECT INTO result EXISTS(

+    SELECT 1 FROM user_links ul

+    LEFT JOIN users u ON user_id=u.id

+    LEFT JOIN links l ON link_id=l.id

+    WHERE linkurl=l.url AND username=u.name

+  );

+  RETURN result;

+END

+$$ LANGUAGE plpgsql;

+

 DROP FUNCTION IF EXISTS get_bones(text, timestamp, int);

 DROP FUNCTION IF EXISTS get_bones(text, int, timestamp);

 CREATE OR REPLACE FUNCTION get_bones(username text, lim int, before timestamp)

-  RETURNS TABLE(url text, title text, posted timestamp, poster text, total_votes bigint, subscriber_vote int) AS $$

+  RETURNS TABLE(linkid int, url text, title text, posted timestamp, poster text, total_votes bigint, subscriber_vote int, shared bool) AS $$

 DECLARE

   subscriber_id int;

 BEGIN

@@ -43,9 +76,12 @@ BEGIN

     AS

       SELECT

         DISTINCT ON (links.url)

-        links.url,links.title,links.posted,users1.name,total_votes(links.id),user_vote(subscriber_id,links.id)

+        links.id,links.url,links.title,links.posted,users1.name,

+        total_votes(links.id),user_vote(subscriber_id,links.id),

+        has_user_shared(username, links.url)

         FROM user_subscriptions

         RIGHT JOIN user_links ON user_subscriptions.to_id=user_links.user_id

+        INNER JOIN links ON link_id=links.id

         INNER JOIN users ON users.id=fro_id

         LEFT JOIN users as users1 ON users1.id=to_id

         WHERE fro_id = subscriber_id

@@ -57,7 +93,8 @@ $$ LANGUAGE plpgsql;

 DROP FUNCTION IF EXISTS get_bones(text, int);

 CREATE OR REPLACE FUNCTION get_bones(username text, lim int)

-  RETURNS TABLE(url text, title text, posted timestamp, poster text, total_votes bigint, subscriber_vote int) AS $$

+  RETURNS TABLE(linkid int, url text, title text, posted timestamp, poster text, total_votes bigint,

+                subscriber_vote int, shared bool) AS $$

 DECLARE

   subscriber_id int;

 BEGIN

@@ -67,7 +104,9 @@ BEGIN

     AS

       SELECT

         DISTINCT ON (links.url)

-        links.url,links.title,links.posted,users1.name,total_votes(links.id),user_vote(subscriber_id,links.id)

+        links.id,links.url,links.title,links.posted,users1.name,

+        total_votes(links.id),user_vote(subscriber_id,links.id),

+        has_user_shared(username, links.url)

         FROM user_subscriptions

         RIGHT JOIN user_links ON user_subscriptions.to_id=user_links.user_id

         INNER JOIN links ON link_id=links.id

@@ -80,7 +119,8 @@ $$ LANGUAGE plpgsql;

 DROP FUNCTION IF EXISTS get_bones(text);

 CREATE OR REPLACE FUNCTION get_bones(username text)

-  RETURNS TABLE(url text, title text, posted timestamp, poster text, total_votes bigint, subscriber_vote int) AS $$

+  RETURNS TABLE(linkid int, url text, title text, posted timestamp, poster text, total_votes bigint,

+                subscriber_vote int, shared bool) AS $$

 DECLARE

   subscriber_id int;

 BEGIN

@@ -90,7 +130,9 @@ BEGIN

     AS

       SELECT

         DISTINCT ON (links.url)

-        links.url,links.title,links.posted,users1.name,total_votes(links.id),user_vote(subscriber_id,links.id)

+        links.id,links.url,links.title,links.posted,users1.name,

+        total_votes(links.id),user_vote(subscriber_id,links.id),

+        has_user_shared(username, links.url)

         FROM user_subscriptions

         RIGHT JOIN user_links ON user_subscriptions.to_id=user_links.user_id

         INNER JOIN links ON link_id=links.id

@@ -103,7 +145,7 @@ $$ LANGUAGE plpgsql;

 DROP FUNCTION IF EXISTS get_bone(text);

 CREATE OR REPLACE FUNCTION get_bone(username text)

-  RETURNS TABLE(name text, url text, title text, posted timestamp, linkid int, votes bigint) AS $$

+  RETURNS TABLE(name text, url text, title text, posted timestamp, linkid int, votes bigint, shared bool) AS $$

 BEGIN

   RETURN QUERY SELECT users.name, links.url, links.title, links.posted, links.id, total_votes(links.id)

       FROM users

@@ -380,3 +422,4 @@ BEGIN

   RETURN result;

 END

 $$ LANGUAGE plpgsql;

+

@@ -56,3 +56,14 @@ CREATE TABLE user_ak (

   UNIQUE (user_id, ak),

   PRIMARY KEY (id)

 );

+

+DROP VIEW IF EXISTS recently_active_users;

+CREATE VIEW recently_active_users AS

+WITH recent_users AS (

+  SELECT user_id,name,posted

+  FROM user_links

+  LEFT JOIN links ON link_id = links.id

+  RIGHT JOIN users ON user_id=users.id

+  WHERE posted > now() - interval '1 week'

+  ORDER BY posted desc, user_id)

+SELECT DISTINCT ON (user_id) user_id,name,posted FROM recent_users;

@@ -1,12 +1,13 @@

 Flask==0.10.1

-Flask-Cors==2.1.0

-Flask-Limiter==0.8.1

-Flask-Login==0.3.0

+Flask-Cors==2.1.2

+Flask-Limiter==0.9.1

+Flask-Login==0.3.2

 Flask-OAuth==0.12

-Flask-Security==1.7.4

-Flask-WTF==0.11

-lxml==3.4.4

+Flask-Security==1.7.5

+Flask-WTF==0.12

+lxml==3.5.0

 psycopg2==2.6.1

 python-dateutil==2.4.2

-textblob==0.9.1

-uWSGI==2.0.11

+requests==2.9.1

+textblob==0.11.0

+uWSGI==2.0.12

new file mode 100644

@@ -0,0 +1,2 @@

+marrow

+marrowpass

@@ -19,9 +19,11 @@ except ImportError:

         secret_key = base64.b64encode(os.urandom(24))

         debug = False

         static_root =  os.path.join(os.path.dirname(__file__), os.path.pardir, 'static')

+        server_name = "localhost"

 app.secret_key = config.secret_key

 app.debug = config.debug

+app.config["SERVER_NAME"] = config.server_name

 limiter = Limiter(app)

 limiter.limit("60/hour 3/second", key_func=lambda: request.host)(user.user_blueprint)

@@ -1,5 +1,6 @@

 import flask

 from flask import Blueprint, session, redirect, url_for, escape, request, abort, g

+import flask_login;

 from flask.ext.cors import cross_origin

 from flask.ext.login import login_required, current_user

 import urllib2

@@ -31,7 +32,7 @@ def as_json(f):

         return res

     return _inner

-@bone_blueprint.route('/link/<linkid>', methods=['GET','DELETE'])

+@bone_blueprint.route('/link/<linkid>', methods=['GET','POST','DELETE'])

 @login_required

 def delete_link(linkid):

     db = database.get_db()

@@ -42,6 +43,11 @@ def delete_link(linkid):

             cur.execute('SELECT id,url,title,posted FROM links WHERE id=%s', (linkid,))

             nid,url,title,posted = cur.fetchone()

             result = dict(id=nid,url=url,title=title,posted=posted.isoformat())

+        elif request.method == 'POST':

+            result = False

+            if 'username' in session:

+                cur.execute('SELECT subscribe_link(%s,%s)', (current_user.id,linkid))

+                result = cur.fetchone()[0]

         elif request.method == 'DELETE':

             result = False

             if 'username' in session:

@@ -56,7 +62,7 @@ def clean_url(url):

         netloc, path = path, netloc

     return urlparse.urlunparse((scheme, netloc, path, params, query, fragment))

-def get_title(url):

+def get_siteinfo(url):

     return config.titlegetter.get_title(url)

 @bone_blueprint.route('/vote/total')

@@ -135,7 +141,8 @@ def submit_link():

     if username is not None:

         url, title = obj['url'],obj['title']

         url = clean_url(url)

-        title = get_title(url)

+        title, url = get_siteinfo(url) # this makes sure that the url is the site's preferred URL

+                                       #  TODO: this might need sanity checks . . . like make sure same site?

         with db.cursor() as cur:

             cur.callproc('put_link', (username, url, title))

             ## This returns (link_id, user_id)

@@ -151,9 +158,9 @@ def submit_link():

 @bone_blueprint.route('', methods=['GET'])

 @login_required

 def default_data():

-    result = '', 401, {}

-    if 'username' in session:

-        result = data(current_user.id)

+    print current_user.id

+    print 'username' in session

+    result = data(current_user.id)

     return result

 @bone_blueprint.route('/u/<username>', methods=['GET'])

@@ -162,10 +169,14 @@ def data(username):

     result = {'marrow':[], 'sectionTitle': sectionTitle}

     with database.get_db().cursor() as cur:

-        cur.execute("SELECT url, title, posted, linkid, votes from get_bone(%s);", (username,))

+        cur_username = 'anonymous'

+        if current_user.is_authenticated:

+            cur_username = current_user.id

+        cur.execute("SELECT url, title, posted, linkid, votes, has_user_shared(%s, url) from get_bone(%s);",

+                    (cur_username, username,))

         result['marrow'] = [

-                dict(id=linkid, url=url,title=title,posted=posted.isoformat(),votes=votes)

-                     for url,title,posted,linkid,votes

+                dict(id=linkid, url=url,title=title,posted=posted.isoformat(),votes=votes,shared=shared)

+                     for url,title,posted,linkid,votes,shared

                      in cur.fetchall()

         ]

     return json.dumps(result)

@@ -229,8 +240,9 @@ def subscriptions(before, count):

                 args = args + (before,)

             cur.callproc("get_bones", args)

             result['marrow'] = [

-                dict(poster=poster, url=url,title=title,posted=posted.isoformat(), votes=votes, myVote=myvote)

-                    for url,title,posted,poster,votes,myvote

+                dict(id=id,poster=poster, url=url,title=title,posted=posted.isoformat(), votes=votes,

+                     myVote=myvote, shared=shared)

+                    for id,url,title,posted,poster,votes,myvote,shared

                     in cur.fetchall()

             ]

     return (json.dumps(result), 200, {'Content-Type': 'application/json'})

@@ -1,28 +1,31 @@

 from flask import g

 import psycopg2

+

 try: from marrow_config import config

 except ImportError:

     class config:

-        db = "marrow"

-        user = "marrow"

-        password = "marrowpass"

-        host = "pgsqlserver.elangley.org"

+        class db:

+            db = "marrow"

+            user = "marrow"

+            password = "marrowpass"

+            host = "pgsqlserver.elangley.org"

-def get_db():

+def get_db(close=True):

     db = getattr(g, '_database', None)

+    _config = config.db

     if db is None:

-        db = g._database = psycopg2.connect(

-          database=config.db,

-          user=config.user,

-          password=config.password,

-          host=config.host

-        );

-    return db

+        db = g._database = [psycopg2.connect(

+          database=_config.db,

+          user=_config.user,

+          password=_config.password,

+          host=_config.host

+        ),close];

+    return db[0]

 def close_connection(exception):

     db = getattr(g, '_database', None)

-    if db is not None:

-        db.close()

+    if db is not None and db[1]:

+        db[0].close()

 def check_ak(db, username, ak):

     with db.cursor() as cur:

@@ -1,7 +1,8 @@

-import lxml.html

-import urllib2

-import urlparse

 import re

+import urlparse

+

+import lxml.html

+import requests

 from textblob import TextBlob

 from textblob_aptagger import PerceptronTagger

@@ -12,21 +13,41 @@ def titlecase(line):

 class DefaultTitleGetter(object):

     url_cleaner = re.compile('[+\-_]')

+    user_agent = {'User-Agent': 'Marrow Title Getter: https://joinmarrow.com'}

     def get_title(self, url):

+        s = requests.session()

         scheme, netloc, path, params, query, fragment = urlparse.urlparse(url, 'http')

-        data = urllib2.urlopen(url)

-        content_type = data.headers['content-type'].lower()

-        charset = 'utf-8'

-        if 'charset' in content_type:

-            charset = content_type.partition('charset=')[-1]

-        data = data.read()

-        data = data.decode(charset)

-        etree = lxml.html.fromstring(data)

-        titleElems = etree.xpath('//title')

-        title = url

-        if titleElems != []:

-            title = titleElems[0].text

+        data = s.get(url, headers=self.user_agent)

+        etree = lxml.html.fromstring(data.content.decode(data.encoding))

+

+        canonicalLink = etree.xpath('//link[@rel="canonical"]/@href')

+        oetree = etree

+        if canonicalLink != []:

+            canonicalLink = canonicalLink[0]

+            try:

+                data = s.get(canonicalLink, headers=self.user_agent)

+                etree = lxml.html.fromstring(data.content.decode(data.encoding))

+            except requests.exceptions.MissingSchema:

+                nscheme, nnetloc, npath, nparams, nquery, nfragment = urlparse.urlparse(canonicalLink)

+                if nscheme == '':

+                    nscheme = scheme

+                if nnetloc == '':

+                    nnetloc = netloc

+                canonicalLink = urlparse.urlunparse((nscheme, nnetloc, npath, nparams, nquery, nfragment))

+                try:

+                    data = s.get(canonicalLink, headers=self.user_agent)

+                    etree = lxml.html.fromstring(data.content.decode(data.encoding))

+                except IOError:

+                    etree = oetree

+            except IOError:

+                etree = oetree

+        else:

+            canonicalLink = url

+

+        title = etree.xpath('//title/text()')

+        if title != []:

+            title = title[0]

         elif path:

             # hacky way to make a title

             path = urlparse.unquote(path)

@@ -37,4 +58,4 @@ class DefaultTitleGetter(object):

             title = map(titlecase, path)

             title = u' \u2014 '.join(title)

             title = u' \u2014 '.join([title, netloc])

-        return title

+        return title, canonicalLink

@@ -2,6 +2,7 @@ import urlparse

 import urllib2

 import json

+# TODO: this should use the articlesearch API, if this is actually necessary

 class TimesTitleGetter(object):

     api_url='http://api.nytimes.com/svc/news/v3/content.json?url=%(url)s&api-key=%(api_key)s'

     site='nytimes.com'

@@ -13,4 +14,4 @@ class TimesTitleGetter(object):

         info = json.load(urllib2.urlopen(api_url))

         title = info['results'][0]['title']

         source = info['results'][0]['source']

-        return u'%s \u2014 %s' % (title, source)

+        return u'%s \u2014 %s' % (title, source), url

@@ -1,4 +1,5 @@

 import urllib2

+import requests

 import urlparse

 from .utils import memoize

@@ -34,11 +35,10 @@ class TitleGetter(object):

                 handler = self.getters[site]

                 break

-        title = None

         try:

-            title = handler.get_title(url)

-        except urllib2.HTTPError:

-            title = self.default_handler.get_title(url)

+            title, canonicalUrl = handler.get_title(url)

+        except requests.exceptions.RequestException:

+            title, canonicalUrl = self.default_handler.get_title(url)

-        return title.encode('utf-8')

+        return title.encode('utf-8'), canonicalUrl

@@ -111,6 +111,7 @@ def adduser():

                 session['username'] = username

                 result['status'] = True

                 _get_users()

+                login_user(User.get_user(username))

             except psycopg2.IntegrityError as e:

                 db.rollback()

                 if e.pgcode == '23505': #username not unique

@@ -121,6 +122,23 @@ def adduser():

             else: db.commit()

     return json.dumps(result)

+@user_blueprint.route('/active')

+def active():

+    result = dict(status=False, data=[])

+    with database.get_db() as db:

+        with db.cursor() as cur:

+            cur.execute("SELECT * FROM recently_active_users ORDER BY posted DESC LIMIT 10")

+            store = result['data']

+            for id,name,last_posted in cur.fetchall():

+                store.append(

+                    dict(

+                        id=id,

+                        name=name,

+                        last_posted=last_posted.isoformat()

+                    )

+                )

+    return (json.dumps(result), 200, {'Content-Type': 'application/json'})

+

 @user_blueprint.route('/following')

 @login_required

 def following():

@@ -142,7 +160,7 @@ import os, base64

 def gen_ak(db):

     return ak

-@user_blueprint.route('/<user>/env', methods=['POST'])

+@user_blueprint.route('/env/<user>', methods=['POST'])

 def getenv(user): pass

 @user_blueprint.route('/change-password', methods=['POST'])

@@ -48,6 +48,10 @@ html {

 * {

   box-sizing: border-box;

+  -webkit-font-feature-settings: 'kern' 1, 'liga' 1;

+  -moz-font-feature-settings: 'kern' 1;

+  -o-font-feature-settings: 'kern' 1;

+  text-rendering: geometricPrecision;

 }

 body {

@@ -115,6 +119,8 @@ img {

 .identicon {

   border-radius: 50%;

+  /*border: thin solid #888;*/

+  box-shadow: 0em 0em 0.1em black;

   vertical-align: middle;

 }

@@ -134,9 +140,41 @@ img {

   width: 9em;

 }

+.filter-form {

+  padding-bottom: 0px;

+}

+

 ul.subscription-list {

   text-align: center;

-  /*background: #eee;*/

+  position: relative;

+  background: #888;

+  /*text-shadow: 0em 0em 0.1em black;*/

+  /*color: white;                    */

+  border: thin solid black;

+  padding: 0.75em 1.5em;

+  max-height: 1.5em;

+  overflow: hidden;

+  transition: max-height 1.5s ease, padding 1.5s ease;

+}

+

+ul.subscription-list.opened {

+  max-height: 12em;

+  padding-bottom: 2.5em;

+}

+

+ul.subscription-list > .list-control {

+  position: absolute;

+  width: 100%;

+  bottom: 0px;

+  left: 0px;

+  height: 1.5em;

+  background: #888;

+  color: white;

+  cursor: pointer;

+}

+ul.subscription-list > .list-control:hover {

+  background-color: #ccc;

+  /*color: black;*/

 }

 ul.subscription-list::after {

@@ -260,6 +298,11 @@ footer a.facebook-link:hover {

   margin-top: 10px;

 }

+#nav-main h3 {

+  text-align: right;

+  margin-top: 20px;

+}

+

 /* @end */

 /* @group List Module */

@@ -413,6 +456,19 @@ div.marrow {

   font-size: 80%;

   color: #aaa;

 }

+a.add-link {

+  color: green;

+  display: inline-block;

+  vertical-align: top;

+  position: relative;

+  top: 0.2em;

+  /*position: absolute;*/

+  /*margin-left: -1em;*/

+}

+a.add-link:hover {

+  text-decoration: none;

+  color: olive;

+}

 a.delete-link {

   color: red;

   display: inline-block;

Binary files a/static/images/icons/android-chrome-144x144.png and b/static/images/icons/android-chrome-144x144.png differ

Binary files a/static/images/icons/android-chrome-192x192.png and b/static/images/icons/android-chrome-192x192.png differ

Binary files a/static/images/icons/android-chrome-36x36.png and b/static/images/icons/android-chrome-36x36.png differ

Binary files a/static/images/icons/android-chrome-48x48.png and b/static/images/icons/android-chrome-48x48.png differ

Binary files a/static/images/icons/android-chrome-72x72.png and b/static/images/icons/android-chrome-72x72.png differ

Binary files a/static/images/icons/android-chrome-96x96.png and b/static/images/icons/android-chrome-96x96.png differ

Binary files a/static/images/icons/apple-touch-icon-114x114.png and b/static/images/icons/apple-touch-icon-114x114.png differ

Binary files a/static/images/icons/apple-touch-icon-120x120.png and b/static/images/icons/apple-touch-icon-120x120.png differ

Binary files a/static/images/icons/apple-touch-icon-144x144.png and b/static/images/icons/apple-touch-icon-144x144.png differ

Binary files a/static/images/icons/apple-touch-icon-152x152.png and b/static/images/icons/apple-touch-icon-152x152.png differ

Binary files a/static/images/icons/apple-touch-icon-180x180.png and b/static/images/icons/apple-touch-icon-180x180.png differ

Binary files a/static/images/icons/apple-touch-icon-57x57.png and b/static/images/icons/apple-touch-icon-57x57.png differ

Binary files a/static/images/icons/apple-touch-icon-60x60.png and b/static/images/icons/apple-touch-icon-60x60.png differ

Binary files a/static/images/icons/apple-touch-icon-72x72.png and b/static/images/icons/apple-touch-icon-72x72.png differ

Binary files a/static/images/icons/apple-touch-icon-76x76.png and b/static/images/icons/apple-touch-icon-76x76.png differ

Binary files a/static/images/icons/apple-touch-icon-precomposed.png and b/static/images/icons/apple-touch-icon-precomposed.png differ

Binary files a/static/images/icons/apple-touch-icon.png and b/static/images/icons/apple-touch-icon.png differ

@@ -2,11 +2,11 @@

 <browserconfig>

   <msapplication>

     <tile>

-      <square70x70logo src="/images/icons/mstile-70x70.png"/>

-      <square150x150logo src="/images/icons/mstile-150x150.png"/>

-      <square310x310logo src="/images/icons/mstile-310x310.png"/>

-      <wide310x150logo src="/images/icons/mstile-310x150.png"/>

-      <TileColor>#000000</TileColor>

+      <square70x70logo src="/images/icons/mstile-70x70.png?v=all2jv2L7Q"/>

+      <square150x150logo src="/images/icons/mstile-150x150.png?v=all2jv2L7Q"/>

+      <square310x310logo src="/images/icons/mstile-310x310.png?v=all2jv2L7Q"/>

+      <wide310x150logo src="/images/icons/mstile-310x150.png?v=all2jv2L7Q"/>

+      <TileColor>#da532c</TileColor>

     </tile>

   </msapplication>

 </browserconfig>

Binary files a/static/images/icons/favicon-16x16.png and b/static/images/icons/favicon-16x16.png differ

new file mode 100644

Binary files /dev/null and b/static/images/icons/favicon-194x194.png differ

Binary files a/static/images/icons/favicon-32x32.png and b/static/images/icons/favicon-32x32.png differ

Binary files a/static/images/icons/favicon-96x96.png and b/static/images/icons/favicon-96x96.png differ

Binary files a/static/images/icons/favicon.ico and b/static/images/icons/favicon.ico differ

@@ -2,40 +2,41 @@

 	"name": "Marrow",

 	"icons": [

 		{

-			"src": "\/images\/icons\/android-chrome-36x36.png",

+			"src": "\/images\/icons\/android-chrome-36x36.png?v=all2jv2L7Q",

 			"sizes": "36x36",

 			"type": "image\/png",

 			"density": "0.75"

 		},

 		{

-			"src": "\/images\/icons\/android-chrome-48x48.png",

+			"src": "\/images\/icons\/android-chrome-48x48.png?v=all2jv2L7Q",

 			"sizes": "48x48",

 			"type": "image\/png",

 			"density": "1.0"

 		},

 		{

-			"src": "\/images\/icons\/android-chrome-72x72.png",

+			"src": "\/images\/icons\/android-chrome-72x72.png?v=all2jv2L7Q",

 			"sizes": "72x72",

 			"type": "image\/png",

 			"density": "1.5"

 		},

 		{

-			"src": "\/images\/icons\/android-chrome-96x96.png",

+			"src": "\/images\/icons\/android-chrome-96x96.png?v=all2jv2L7Q",

 			"sizes": "96x96",

 			"type": "image\/png",

 			"density": "2.0"

 		},

 		{

-			"src": "\/images\/icons\/android-chrome-144x144.png",

+			"src": "\/images\/icons\/android-chrome-144x144.png?v=all2jv2L7Q",

 			"sizes": "144x144",

 			"type": "image\/png",

 			"density": "3.0"

 		},

 		{

-			"src": "\/images\/icons\/android-chrome-192x192.png",

+			"src": "\/images\/icons\/android-chrome-192x192.png?v=all2jv2L7Q",

 			"sizes": "192x192",

 			"type": "image\/png",

 			"density": "4.0"

 		}

-	]

+	],

+	"display": "standalone"

 }

Binary files a/static/images/icons/mstile-144x144.png and b/static/images/icons/mstile-144x144.png differ

Binary files a/static/images/icons/mstile-150x150.png and b/static/images/icons/mstile-150x150.png differ

Binary files a/static/images/icons/mstile-310x150.png and b/static/images/icons/mstile-310x150.png differ

Binary files a/static/images/icons/mstile-310x310.png and b/static/images/icons/mstile-310x310.png differ

Binary files a/static/images/icons/mstile-70x70.png and b/static/images/icons/mstile-70x70.png differ

new file mode 100644

@@ -0,0 +1,49 @@

+<?xml version="1.0" standalone="no"?>

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"

+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">

+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"

+ width="360.000000pt" height="337.000000pt" viewBox="0 0 360.000000 337.000000"

+ preserveAspectRatio="xMidYMid meet">

+<metadata>

+Created by potrace 1.11, written by Peter Selinger 2001-2013

+</metadata>

+<g transform="translate(0.000000,337.000000) scale(0.100000,-0.100000)"

+fill="#000000" stroke="none">

+<path d="M309 3354 c-21 -26 8 -65 75 -99 106 -54 97 57 94 -1162 -3 -1060 -3

+-1062 -24 -1090 -11 -15 -46 -40 -78 -55 -63 -31 -88 -66 -66 -93 11 -13 47

+-15 264 -13 l251 3 3 23 c5 32 -12 49 -81 83 -105 53 -97 -33 -97 1053 0 517

+2 937 6 934 3 -3 234 -487 514 -1074 l508 -1069 38 -3 39 -2 470 1017 c258

+560 491 1063 517 1118 l47 100 1 -991 0 -991 -23 -34 c-14 -21 -44 -44 -80

+-62 -64 -30 -89 -65 -67 -92 11 -13 58 -15 335 -15 351 0 356 1 336 53 -6 16

+-29 34 -64 51 -30 14 -67 40 -81 57 l-26 31 0 1066 c0 1225 -10 1106 100 1162

+67 34 92 68 70 95 -11 13 -48 15 -273 13 l-261 -3 -475 -1007 c-262 -554 -479

+-1004 -482 -1000 -4 4 -226 458 -495 1010 l-488 1002 -247 0 c-213 0 -248 -2

+-260 -16z"/>

+<path d="M158 461 c-144 -46 -196 -218 -100 -333 91 -108 265 -80 334 56 l15

+28 13 -33 c40 -102 161 -148 265 -100 52 24 74 50 95 112 l17 50 7 -33 c16

+-83 110 -158 196 -158 72 1 170 71 186 135 8 32 20 32 28 1 3 -14 18 -39 32

+-56 105 -124 308 -74 342 85 l8 40 7 -41 c10 -61 45 -105 106 -136 63 -32 110

+-35 166 -9 53 24 90 66 108 120 l14 44 13 -37 c16 -48 66 -105 107 -122 42

+-18 115 -18 156 0 42 18 82 61 102 110 l17 39 19 -44 c27 -58 55 -87 107 -110

+98 -43 203 -4 253 93 10 21 19 50 20 65 1 23 3 20 10 -13 12 -50 71 -121 116

+-140 41 -18 114 -18 156 0 38 15 94 76 103 111 8 33 20 32 32 -3 24 -70 109

+-131 182 -132 40 0 127 38 152 66 62 71 62 207 0 278 -25 28 -112 66 -152 66

+-73 -1 -158 -62 -182 -132 -12 -35 -24 -36 -32 -3 -9 35 -65 96 -103 111 -42

+18 -115 18 -156 0 -45 -19 -104 -90 -116 -140 -7 -33 -9 -36 -10 -13 -1 35

+-32 95 -63 124 -31 28 -93 53 -133 53 -43 0 -114 -31 -142 -61 -12 -13 -31

+-44 -42 -68 l-19 -44 -17 39 c-20 49 -60 92 -102 110 -41 18 -114 18 -156 0

+-41 -17 -91 -74 -107 -122 l-13 -37 -14 44 c-18 54 -55 96 -108 120 -56 26

+-103 23 -166 -8 -61 -32 -96 -76 -106 -137 l-7 -41 -8 40 c-34 159 -237 209

+-342 85 -14 -17 -29 -42 -32 -56 -8 -31 -20 -31 -28 1 -16 64 -114 134 -186

+135 -86 0 -180 -75 -196 -158 l-7 -33 -17 50 c-21 62 -43 88 -95 112 -100 46

+-221 4 -262 -91 l-15 -35 -20 40 c-11 22 -28 48 -37 59 -39 44 -139 74 -193

+57z m529 -79 c91 -65 79 -218 -21 -266 -105 -50 -216 21 -216 139 0 59 25 106

+72 136 43 26 122 22 165 -9z m800 0 c91 -65 79 -218 -21 -266 -49 -23 -107

+-20 -146 7 -56 37 -73 69 -73 132 0 63 17 95 74 133 43 30 120 27 166 -6z

+m796 2 c37 -27 67 -85 67 -129 0 -44 -30 -102 -67 -129 -15 -11 -48 -21 -77

+-24 -41 -3 -57 1 -85 20 -57 38 -75 72 -75 133 0 61 18 95 75 133 28 19 44 23

+85 20 29 -3 62 -13 77 -24z m787 4 c55 -38 75 -73 75 -133 0 -60 -19 -95 -76

+-133 -28 -19 -44 -23 -85 -20 -28 3 -62 13 -77 24 -32 23 -67 90 -67 127 0 57

+45 126 95 147 39 17 101 11 135 -12z"/>

+</g>

+</svg>

@@ -4,28 +4,31 @@

   <title>Marrow</title>

   <base href="/" />

   <meta charset="utf-8">

-  <meta name="msapplication-TileColor" content="#000000">

-  <meta name="msapplication-TileImage" content="/images/icons/mstile-144x144.png">

-  <meta name="msapplication-config" content="/images/icons/browserconfig.xml">

-  <meta name="theme-color" content="#000000">

   <meta name="viewport" content="width=device-width, initial-scale=1">

   <!-- Favicons/App Icons -->

-  <link rel="apple-touch-icon" sizes="57x57" href="/images/icons/apple-touch-icon-57x57.png">

-  <link rel="apple-touch-icon" sizes="60x60" href="/images/icons/apple-touch-icon-60x60.png">

-  <link rel="apple-touch-icon" sizes="72x72" href="/images/icons/apple-touch-icon-72x72.png">

-  <link rel="apple-touch-icon" sizes="76x76" href="/images/icons/apple-touch-icon-76x76.png">

-  <link rel="apple-touch-icon" sizes="114x114" href="/images/icons/apple-touch-icon-114x114.png">

-  <link rel="apple-touch-icon" sizes="120x120" href="/images/icons/apple-touch-icon-120x120.png">

-  <link rel="apple-touch-icon" sizes="144x144" href="/images/icons/apple-touch-icon-144x144.png">

-  <link rel="apple-touch-icon" sizes="152x152" href="/images/icons/apple-touch-icon-152x152.png">

-  <link rel="apple-touch-icon" sizes="180x180" href="/images/icons/apple-touch-icon-180x180.png">

-  <link rel="icon" type="image/png" href="/images/icons/favicon-32x32.png" sizes="32x32">

-  <link rel="icon" type="image/png" href="/images/icons/android-chrome-192x192.png" sizes="192x192">

-  <link rel="icon" type="image/png" href="/images/icons/favicon-96x96.png" sizes="96x96">

-  <link rel="icon" type="image/png" href="/images/icons/favicon-16x16.png" sizes="16x16">

-  <link rel="manifest" href="/images/icons/manifest.json">

-  <link rel="shortcut icon" href="/images/icons/favicon.ico">

+  <link rel="apple-touch-icon" sizes="57x57" href="/images/icons/apple-touch-icon-57x57.png?v=all2jv2L7Q">

+  <link rel="apple-touch-icon" sizes="60x60" href="/images/icons/apple-touch-icon-60x60.png?v=all2jv2L7Q">

+  <link rel="apple-touch-icon" sizes="72x72" href="/images/icons/apple-touch-icon-72x72.png?v=all2jv2L7Q">

+  <link rel="apple-touch-icon" sizes="76x76" href="/images/icons/apple-touch-icon-76x76.png?v=all2jv2L7Q">

+  <link rel="apple-touch-icon" sizes="114x114" href="/images/icons/apple-touch-icon-114x114.png?v=all2jv2L7Q">

+  <link rel="apple-touch-icon" sizes="120x120" href="/images/icons/apple-touch-icon-120x120.png?v=all2jv2L7Q">

+  <link rel="apple-touch-icon" sizes="144x144" href="/images/icons/apple-touch-icon-144x144.png?v=all2jv2L7Q">

+  <link rel="apple-touch-icon" sizes="152x152" href="/images/icons/apple-touch-icon-152x152.png?v=all2jv2L7Q">

+  <link rel="apple-touch-icon" sizes="180x180" href="/images/icons/apple-touch-icon-180x180.png?v=all2jv2L7Q">

+  <link rel="icon" type="image/png" href="/images/icons/favicon-32x32.png?v=all2jv2L7Q" sizes="32x32">

+  <link rel="icon" type="image/png" href="/images/icons/favicon-194x194.png?v=all2jv2L7Q" sizes="194x194">

+  <link rel="icon" type="image/png" href="/images/icons/favicon-96x96.png?v=all2jv2L7Q" sizes="96x96">

+  <link rel="icon" type="image/png" href="/images/icons/android-chrome-192x192.png?v=all2jv2L7Q" sizes="192x192">

+  <link rel="icon" type="image/png" href="/images/icons/favicon-16x16.png?v=all2jv2L7Q" sizes="16x16">

+  <link rel="manifest" href="/images/icons/manifest.json?v=all2jv2L7Q">

+  <link rel="mask-icon" href="/images/icons/safari-pinned-tab.svg" color="#8eb7cf">

+  <link rel="shortcut icon" href="/images/icons/favicon.ico?v=all2jv2L7Q">

+  <meta name="msapplication-TileColor" content="#da532c">

+  <meta name="msapplication-TileImage" content="/images/icons/mstile-144x144.png?v=all2jv2L7Q">

+  <meta name="msapplication-config" content="/images/icons/browserconfig.xml?v=all2jv2L7Q">

+  <meta name="theme-color" content="#8eb7cf">

+

   <!-- JS -->

   <script src="//crypto-js.googlecode.com/svn/tags/3.0.2/build/rollups/md5.js"></script>

   <script src="/lib/angular.min.js"></script>

@@ -46,64 +49,70 @@

 </head>

 <body>

-<!--

-   -  <script>

-   -    window.fbAsyncInit = function() {FB.init({

-   -        appId      : '1420153671647757',

-   -        xfbml      : true,

-   -        version    : 'v2.3'

-   -      });

-   -    };

-   -

-   -    (function(d, s, id){

-   -      var js, fjs = d.getElementsByTagName(s)[0];

-   -      if (d.getElementById(id)) {return;}

-   -      js = d.createElement(s); js.id = id;

-   -      js.src = "//connect.facebook.net/en_US/sdk.js";

-   -      fjs.parentNode.insertBefore(js, fjs);

-   -    }(document, 'script', 'facebook-jssdk'));

-   -  </script>

-   -

-   -->

-  <div id="page-container">

-    <main ng-view></main>

-    <header>

-      <h1 class="site-logo">Marrow</h1>

-    </header>

-    <nav id="nav-main" ng-controller="SidebarCtrl">

-      <ul>

-        <li><a href="/">Home</a></li>

-        <li><a href ng-click="subscriptions()">My Lists</a></li>

-        <li><a href ng-click="random()">Random</a></li>

-        <li class="logout-link"><a href ng-click="logout()">Log Out</a></li>

-      </ul>

-      <!--

-         -<div class="appstore-links">

-         -  <a href="https://play.google.com/store/apps/details?id=com.joinmarrow.marrow">

-         -    <img alt="Android app on Google Play" src="https://developer.android.com/images/brand/en_app_rgb_wo_45.png" />

-         -  </a>

-         -</div>

-         -->

-    </nav>

-    <footer>

-      <span class="beta-message">

-        This service is currently in beta. Like us on

-        <a class="facebook-link" href="https://www.facebook.com/join.marrow">Facebook.</a>

-        Try the

-        <a style="color: blue"

-           href="https://chrome.google.com/webstore/detail/add-to-marrow/pcgflajngpeopkemlijnnggfchoglpad">

-          Chrome Extension

-        </a>

-        to get the newest links delivered straight to your browser.

-        <!--or report problems on <a class="facebook-link" href="https://bugs.joinmarrow.com">bugs.joinmarrow.com</a>.-->

-      </span>

-    </footer>

-  </div>

-  <script>

-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){

-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

-        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)