Skip to content

Commit

Permalink
Merge remote branch 'dan/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
neomelonas committed Jan 22, 2010
2 parents 69e41eb + 7503e28 commit d2b18d6
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 32 deletions.
6 changes: 3 additions & 3 deletions .gitignore
@@ -1,4 +1,4 @@
# Ignore everything in here apart from the .gitignore file
*.sln
*.suo
# Ignore everything in here apart from the .gitignore file
*.sln
*.suo
doc/*.zip
58 changes: 29 additions & 29 deletions README.textile
@@ -1,29 +1,29 @@
h1. TODO
h2. DEFAULT BRANCH: +master+ -blueprint_Demerits-
# HTML
## -Remove *Comment* page-
## -Add *Demerit* page for individual demerits-
## Recode comment feature onto *Demerit* page
## Add sparkline/bar chart on Logged in HomePage for Student's Demerits over time
# CSS
## -Start incorporating *Blueprint CSS* classes-
## Make things pretty
# C#
## TBA
# XML
## +Provide an RSS feed, per student, to the parents+
# DOC
## -Update Use Case doc to accurately represent stuff-
## -Include Demerits ERD.vsd [ Possible database config ]- +Lies, included ERM instead+
## -Fix End Of Term errors-
##
# SQL
## Code database structure
## Normalize, etc., said database
## Create DB dump to run *Demerits* locally
# OTHER
## -Get group to fork-
# Future Thoughts
## NA
h1. TODO

h2. DEFAULT BRANCH: +master+ -blueprint_Demerits-

# HTML
## -Remove *Comment* page-
## -Add *Demerit* page for individual demerits-
## Recode comment feature onto *Demerit* page
## Add sparkline/bar chart on Logged in HomePage for Student's Demerits over time
# CSS
## -Start incorporating *Blueprint CSS* classes-
## Make things pretty
# C#
## TBA
# XML
## +Provide an RSS feed, per student, to the parents+
# DOC
## -Update Use Case doc to accurately represent stuff-
## -Include Demerits ERD.vsd [ Possible database config ]- +Lies, included ERM instead+
## -Fix End Of Term errors-
##
# SQL
## Code database structure
## Normalize, etc., said database
## Create DB dump to run *Demerits* locally
# OTHER
## -Get group to fork-
# Future Thoughts
## NA
Binary file modified doc/Demerits Business Rules.docx
Binary file not shown.

0 comments on commit d2b18d6

Please sign in to comment.