diff --git a/README.md b/README.md index 7e9590f5..b39cd64e 100644 --- a/README.md +++ b/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 ------------------- diff --git a/frontend/templates/unglued_list.html b/frontend/templates/unglued_list.html index 98309e1a..1b576b73 100644 --- a/frontend/templates/unglued_list.html +++ b/frontend/templates/unglued_list.html @@ -91,7 +91,7 @@ {% endifequal %} diff --git a/static/js/tabs.js b/static/js/tabs.js index 8c1b3177..8c4e6ed0 100644 --- a/static/js/tabs.js +++ b/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();