summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | Merged with master, many minor changes to statusapp.views.Jeremy Fehr2011-06-15
| | |
| * | Merge branch 'master' of https://github.com/dcalderon/TorStatusJeremy Fehr2011-06-15
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: settings.py statusapp/views.py
| | * | changed variable name to match with what is passed through the template ↵Diego Calderon2011-06-14
| | | | | | | | | | | | | | | | render mechanism.
| | * | Merge branch 'master' of github.com:dcalderon/TorStatusDiego Calderon2011-06-14
| | |\ \
| | | * | Edited README.txt via GitHubJeremy Fehr2011-06-14
| | | | |
| | * | | Merge branch 'master' of /home/dcalderon/status/statusDiego Calderon2011-06-14
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Merge branch 'master' of /home/dcalderon/status/statusDiego Calderon2011-06-14
| | |\ \ \
| | * | | | Stopped tracking a few filesDiego Calderon2011-06-14
| | | | | |
| | * | | | Merge branch 'master' of github.com:dcalderon/TorStatusDiego Calderon2011-06-13
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: settings.py
| | | * | | | Edited settings.py via GitHubJeremy Fehr2011-06-09
| | | | | | |
| | | * | | | Edited settings.py via GitHubJeremy Fehr2011-06-09
| | | | | | |
| | * | | | | Now the site is working, we had some css merging issues...Diego Calderon2011-06-13
| | | | | | |
| | * | | | | Merge branch 'master' of /home/vburca/statusDiego Calderon2011-06-13
| | |\ \ \ \ \
| | * | | | | | trying to make sure all files are commitedDiego Calderon2011-06-13
| | | | | | | |
| | * | | | | | Merge branch 'master' of /home/dcalderon/status/statusDiego Calderon2011-06-13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: statusapp/static/css/style.css statusapp/urls.py statusapp/views.py
| | * | | | | | | quick commitDiego Calderon2011-06-13
| | | | | | | | |
| | * | | | | | | Adding a few files we forgot to checkDiego Calderon2011-06-13
| | | | | | | | |
| | * | | | | | | unstableJeremy Fehr2011-06-09
| | | | | | | | |
| | * | | | | | | unstableJeremy Fehr2011-06-09
| | | | | | | | |
| * | | | | | | | Minor changes. Somewhat stable. Severely lacking documentation.Jeremy Fehr2011-06-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Began writing custom filters for the index page such that it will be no longer necessary to use the widthratio template tag for computing uptime in days and bandwidth in KB/s, but there are type issues with this that I can't figure out -- similar filters written for the details page work perfectly. Also began figuring out how to enable custom searches, but decided to hold off on this until raw SQL queries are removed and queries that use Django's ORM are implemented.
| * | | | | | | | Began writing views for the exit node query and csv pages.Jeremy Fehr2011-06-14
| | | | | | | | |
| * | | | | | | | Merge branch 'master' of /home/vburca/statusJeremy Fehr2011-06-14
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Forgot one line in README.txtJeremy Fehr2011-06-14
| | | | | | | | | |
* | | | | | | | | | I added a debug toolbar and am merging with jeremy.Diego Calderon2011-06-17
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' of /home/vburca/statusDiego Calderon2011-06-14
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: statusapp/views.py
| * | | | | | | | | Small typo in the description of a views methodVlad Burca2011-06-14
| |\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Made some cache optimizationsDiego Calderon2011-06-14
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of /home/vburca/statusDiego Calderon2011-06-14
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | / / / / / / / | |/ / / / / / / |/| | | | | | | Conflicts: statusapp/views.py
| * | | | | | | Minor changes in template of TorExitNodeQuery.Vlad Burca2011-06-14
| | | | | | | |
| * | | | | | | Merged with Diego.Vlad Burca2011-06-14
| | | | | | | |
| * | | | | | | Merge branch 'master' of /home/dcalderon/status/statusVlad Burca2011-06-14
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge branch 'master' of /home/jfehr/masterVlad Burca2011-06-14
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | merging with vladDiego Calderon2011-06-14
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'master' of /home/jfehr/masterDiego Calderon2011-06-14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Added README.txtJeremy Fehr2011-06-14
| | | | | | |
* | | | | | | Merge branch 'master' of /home/vburca/statusDiego Calderon2011-06-14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Designed template for TorExitNodeQuery.Vlad Burca2011-06-14
| |/ / / / /
* | | | | | Merge branch 'master' of /home/vburca/statusDiego Calderon2011-06-14
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: statusapp/static/css/statisticgraphs.css statusapp/views.py
| * | | | | Merge branch 'master' of /home/jfehr/masterVlad Burca2011-06-14
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: statusapp/views.py
| * | | | | | Removed some useless CSS from the Network Stat GraphsVlad Burca2011-06-14
| | | | | | |
* | | | | | | merging with vladDiego Calderon2011-06-14
| | | | | | |
* | | | | | | Merge branch 'master' of /home/jfehr/masterDiego Calderon2011-06-14
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | Conflicts: statusapp/views.py
| * | | | | The view for the index page now correctly displays all relays that show up ↵Jeremy Fehr2011-06-14
| | | | | | | | | | | | | | | | | | | | | | | | in consensuses in the last 24 hours.
* | | | | | Merge branch 'master' of /home/dcalderon/status/statusVlad Burca2011-06-14
|\ \ \ \ \ \
| * | | | | | Now I have some of the forms sending info to the python functions however ↵Diego Calderon2011-06-14
| |/ / / / / | | | | | | | | | | | | | | | | | | I'm still in the process of developing the functions
* | | | | | Fixed some CSS problems and added the CSS for the Network Stat GraphVlad Burca2011-06-14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Details page is now complete, save for a bit of template formatting, graphs, ↵Jeremy Fehr2011-06-14
| | | | | | | | | | | | | | | | | | | | | | | | and the router country.
| * | | | | Last commit for the night: learned about the "safe" filter.Jeremy Fehr2011-06-13
| | | | | |
| * | | | | The details page is almost done -- the family filter has been (painfully) ↵Jeremy Fehr2011-06-13
| | | | | | | | | | | | | | | | | | | | | | | | written.
* | | | | | Merge branch 'master' of /home/jfehr/masterVlad Burca2011-06-13
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: statusapp/templates/details.html