summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
...
| * | | | | | | Merge branch 'master' of /home/vburca/statusDiego Calderon2011-06-08
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Conflicts resolvedDiego Calderon2011-06-08
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Now I'm using my databaseDiego Calderon2011-06-08
| | | | | | | | | |
* | | | | | | | | | Merge /home/jfehr/statusVlad Burca2011-06-09
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master' of /home/vburca/statusJeremy Fehr2011-06-09
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: statusapp/static/css/style.css
| * | | | | | | | | | Saving changes.Jeremy Fehr2011-06-09
| | | | | | | | | | |
* | | | | | | | | | | Trying to fix the header.Vlad Burca2011-06-09
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'master' of /home/jfehr/status;Vlad Burca2011-06-09
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: statusapp/templates/index.html
| * | | | | | | | | More index.html updates: global line width and font family defined, pictures ↵Jeremy Fehr2011-06-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resized. Headers remain clunky.
* | | | | | | | | | Fixed a minor bug (missing ;) in the CSS files.Vlad Burca2011-06-09
| | | | | | | | | |
* | | | | | | | | | Changed font size in title and fixed the <<Icons>> header tag.Vlad Burca2011-06-09
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch 'master' of /home/jfehr/statusVlad Burca2011-06-09
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: statusapp/static/css/style.css statusapp/templates/index.html
| * | | | | | | | Made the index page look just a little prettier and accessible.Jeremy Fehr2011-06-09
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'master' of /home/vburca/statusJeremy Fehr2011-06-09
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | committing changes to style.cssJeremy Fehr2011-06-09
| | | | | | | |
* | | | | | | | Cleaned the index.html of the stylesheet tags - moved everything to CSSVlad Burca2011-06-09
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'master' of /home/jfehr/statusVlad Burca2011-06-09
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'master' of /home/vburca/statusJeremy Fehr2011-06-09
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: statusapp/templates/index.html statusapp/views.py
| * | | | | | Statusentries and descriptors are now accessible by index.html.Jeremy Fehr2011-06-09
| | | | | | |
* | | | | | | Cleaned CSSVlad Burca2011-06-09
| |/ / / / / |/| | | | |
* | | | | | Removed an unnecessary JS fileVlad Burca2011-06-09
| | | | | |
* | | | | | Fixed the OS icons; display IP (hostname); created new column for contries ↵Vlad Burca2011-06-09
| |_|_|/ / |/| | | | | | | | | | | | | | (sortable). Cleaning the CSS...
* | | | | Templates update - Fixed a bug with the status icons and added sorting tables.Vlad Burca2011-06-08
| |_|/ / |/| | |
* | | | Merge /home/jfehr/statusVlad Burca2011-06-08
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: statusapp/templates/index.html
| * | | Merge branch 'master' of /home/vburca/statusJeremy Fehr2011-06-08
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Cleaned up index.html a bit more still. Conflicts: settings.py statusapp/templates/index.html
| * | | Fixed settings.py to reflect individual databases for development.Jeremy Fehr2011-06-08
| | | |
* | | | Some more changes to the template (icon header not properly formatted).Vlad Burca2011-06-08
| |/ / |/| |
* | | Improved templates - almost looks like official version.Vlad Burca2011-06-08
|/ /
* | Updated the template - highlight on lines and some more CSS features.Vlad Burca2011-06-08
| |
* | Improved the templates - created the first version of the header. Still ↵Vlad Burca2011-06-08
| | | | | | | | improving it.
* | Merged changes from Jeremy and fixed the global url of the files.Vlad Burca2011-06-08
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: statusapp/models.py statusapp/templates/index.html statusapp/urls.py
| * | Added comments in models.py, which will soon be completely rewrittenJeremy Fehr2011-06-08
| | | | | | | | | | | | from scratch; added additional functionality and columns in index.html.
| * | Cleaned up the file structure a bit, got static images working, andJeremy Fehr2011-06-07
| | | | | | | | | | | | cleaned up the index page.
| * | Cleaned up pesky .svn hidden subdirectories...Jeremy Fehr2011-06-07
| | |
| * | Updated index.html, starting to resolve static file issues (not stable).Jeremy Fehr2011-06-07
| | |
* | | Changed template imagesVlad Burca2011-06-08
| |/ |/|
* | Merge branch 'master' of /home/hfoss2011/statusVlad Burca2011-06-07
|\ \ | |/
| * Fixed models; main page now displays correctly.Jeremy Fehr2011-06-07
| |
| * cleaned up a bit of files, ensured that everything works.Jeremy Fehr2011-06-07
| |
| * Removed .svn subdirectory in static images as well as pyc and py~ filesJeremy Fehr2011-06-07
| |
* | Fixed the path to the CSS file so now the template should be displayed properly.Vlad Burca2011-06-07
|/
* Just getting all the files addedDiego Calderon2011-06-07
|
* updates I think now we will start pulling and working away from theDiego Calderon2011-06-07
| | | | master branch
* Another update database issues are still present. We are wondering whatDiego Calderon2011-06-07
| | | | | data from the database should we use to put on the page. Also how to access releational attributes of database classes.
* another update, we are having issues with the databaseDiego Calderon2011-06-07
|
* update againDiego Calderon2011-06-07
|
* Another updateDiego Calderon2011-06-07
|
* an updateDiego Calderon2011-06-07
|
* The initial commit. This should be a working copyDiego Calderon2011-06-07
generated by cgit v1.2.1 (git 2.18.0) at 2024-02-08 07:17:14 +0000