{"shas":[["7724860d6e6e7634424b53b2c2d934523c40871b","70e0dc1f05f4f55f236d52277316bc8bf79e0c44@trincoll.edu","Cleaned some debugging output for the rest to merge.","Vlad Burca"],["7d86d03a2b85ab1ff13013fa740f4bb8c7fbbed3","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","Merge branch 'master' of /home/vburca/status into PostgresBranch\n\nConflicts:\n\tstatus/settings.template\n\tstatus/statusapp/templates/details.html\n\tstatus/statusapp/templatetags/index_filters.py\n\tstatus/statusapp/urls.py\n\tstatusapp/templates/index.html\n\tstatusapp/templatetags/details_filters.py\n\tstatusapp/views.py","Diego Calderon"],["2a9e386203980be555bed0210f7b274f21d496c2","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","Starting the process of consolidating all the branches, as well as the different features vlad and jeremy have been working on. There are still a few bugs. I need to take off the query slicing so that I can further filter the results, for one.","Diego Calderon"],["4b9274fa0bed770eb14ebd4ce6b8fd08d582cfd1","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","trying to checkout the master","Diego Calderon"],["5aee04f211cd970702e79a726680f5da5cf6b891","3e972dbb0c9c264948cf4d85a462064d0d34a45b@marlow.cs.wesleyan.edu","Graphs added, onion/signing-key filters revised.\n\nBefore, onion/signing-key filters failed when parsing raw descriptor\ninformation from authorities. The read/written graphs on the router\ndetail page have been implemented. statusapp.urls have been edited to\ninclude delimiters in the regular expressions.\n\nAdditionally, statusapp.views.index now only uses the more recent\nconsensus, as this is what is done in the current TorStatus\nimplementation.","Jeremy D Fehr"],["e5e25e5488e8c300ccf11f146055434112d1c204","70e0dc1f05f4f55f236d52277316bc8bf79e0c44@trincoll.edu","Added new feature of removing current session for preferences or search options.","Vlad Burca"],["4cad854087e9e23164ee880b505b11be04221a50","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","Some new session features","Diego Calderon"],["c432d56604b04981ff7b86f148e93d152c14658d","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","Merge branch 'master' of /home/vburca/status into PostgresBranch\n\nConflicts:\n\tstatus/statusapp/views.py\n\tstatus/tmp/sessionid38910e1b40aa38ccc6c490706499de7c","Diego Calderon"],["b45ab335697ba45d9856667769249ab43c6f0e41","3e972dbb0c9c264948cf4d85a462064d0d34a45b@marlow.cs.wesleyan.edu","Custom type cast relocated, small changes to graphs.","Jeremy D Fehr"],["d896d5bdfc908232ad46717da5780cf2a8f3b256","70e0dc1f05f4f55f236d52277316bc8bf79e0c44@trincoll.edu","Added the possibility to add the extra columns to the index page","Vlad Burca"],["bf9240a3af8508fbbdefd4812495d29a0318d87b","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","syncing with Jeremy","Diego Calderon"],["874d3797a28f7ee312151dc38f8e4944f4f5fe3b","70e0dc1f05f4f55f236d52277316bc8bf79e0c44@trincoll.edu","Merge branch 'master' of /home/jfehr/TorStatus\n\nConflicts:\n\tREADME.txt\n\tstatus/settings.template\n\tstatus/statusapp/templates/base.html\n\tstatus/statusapp/templates/details.html\n\tstatus/statusapp/templates/index.html\n\tstatus/statusapp/templatetags/details_filters.py\n\tstatus/statusapp/templatetags/index_filters.py\n\tstatus/statusapp/urls.py\n\tstatus/statusapp/views.py","Vlad Burca"],["6342a561d53a1efb32fc7e7d53c37b69c64107fe","3e972dbb0c9c264948cf4d85a462064d0d34a45b@marlow.cs.wesleyan.edu","A few minor changes to statusapp.views.readhist/writehist.","Jeremy D Fehr"],["96f6c743b658fda01d88193d84b7d4f7e61c63bf","3e972dbb0c9c264948cf4d85a462064d0d34a45b@marlow.cs.wesleyan.edu","Merge branch 'master' of /home/vburca/status","Jeremy D Fehr"],["bd22f161e9e2552ce9a025cbbcbc653adf5e1c7e","3e972dbb0c9c264948cf4d85a462064d0d34a45b@marlow.cs.wesleyan.edu","PEP8 cleanup.","Jeremy D Fehr"],["fd233caa8f2823f4f7a16bd36cd102dbb361e9ba","70e0dc1f05f4f55f236d52277316bc8bf79e0c44@trincoll.edu","Fixed small bug with the links on the countryflags.","Vlad Burca"],["abc9c8ee3ac68310828d60b018b5f388df70fa69","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","Merge branch 'master' of /home/jfehr/TorStatus into PostgresBranch\n\nConflicts:\n\tREADME.txt\n\tstatus/settings.template\n\tstatus/statusapp/templates/base.html\n\tstatus/statusapp/templates/details.html\n\tstatus/statusapp/templates/index.html\n\tstatus/statusapp/templatetags/details_filters.py\n\tstatus/statusapp/templatetags/index_filters.py\n\tstatus/statusapp/urls.py\n\tstatus/statusapp/views.py","Diego Calderon"],["8f8a549e9b0d6036f5547c78c3d60983c4bd53a4","3e972dbb0c9c264948cf4d85a462064d0d34a45b@marlow.cs.wesleyan.edu","Aggregate summary graph completed.\n\nFive more graphs to write; to be done tomorrow.","Jeremy D Fehr"],["025f232ca62f30e80d37e66e371bd58c1dfeda22","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","syncing with vlad","Diego Calderon"],["5e334ce343506cb514865bf9242b23ff159149db","a86e6e3dd429e78ea14569d0ace4d65af3a25bdb@wesleyan.edu","Merge branch 'master' of /home/vburca/status into PostgresBranch\n\nConflicts:\n\tstatus/statusapp/templates/details.html\n\tstatus/statusapp/templates/index.html\n\tstatus/statusapp/templatetags/details_filters.py\n\tstatus/statusapp/templatetags/index_filters.py\n\tstatus/statusapp/urls.py\n\tstatus/statusapp/views.py","Diego Calderon"]],"ref":"refs/heads/master","size":58,"head":"100371cf86cfb4fa95b47e4d567f912678f1d6fb","push_id":35309051}