merging

README.md

@@ -80,6 +80,15 @@ Instructions for setting please are slightly different.
 1. `sudo chown celery:celery /var/log/celery`
 1. `sudo /etc/init.d/celeryd start`
 
+Updating Production
+--------------------
+
+1. Study the latest changes in the master branch, especially keep in mind how
+it has [changed from what's in production](https://github.com/Gluejar/regluit/compare/production...master).
+1. Update the production branch accordingly.  If everything in `master` is ready to be moved into `production`, you can just merge `master` into `production`. Otherwise, you can grab specific parts.  (How to do so is something that should probably be described in greater detail.)
+1. Login to unglue.it and run [`/opt/regluit/deploy/update-prod`](https://github.com/Gluejar/regluit/blob/master/deploy/update-prod)
+
+
 OS X Developer Notes
 -------------------
 

frontend/templates/unglued_list.html

@@ -91,7 +91,7 @@
                     <div class="pagination content-block-heading tabs-1">
                         {% get_pages %}
                         {% for page in pages %}
-                            <a href="{{ page.path }}#1">{{ page.number }}</a>
+                            <a href="{{ page.path }}#1" class="endless_page_link">{{ page.number }}</a>
                         {% endfor %}
                     </div>
                     {% endifequal %}

static/js/tabs.js

@@ -28,10 +28,7 @@
         } else {
         	tab = $j('#locationhash').html();
         }
-        
-        $j('#test1').html(location.hash).css('color', 'red');
-        $j('#test2').html(tab);
-        
+
         if(tab == "#1") {
 	        tabsDash2.hide();
     	    tabsDash3.hide();