Merge branch 'master' of http://github.com/LukeShu/leaguer

2 files changed, 51 insertions, 39 deletions

diff --git a/doc/Sprint1-Retrospective.md b/doc/Sprint1-Retrospective.md
index 84c6c60..ac717da 100644
--- a/doc/Sprint1-Retrospective.md
+++ b/doc/Sprint1-Retrospective.md
@@ -123,15 +123,28 @@ place, this has been fixed).
 # Implemented but not working well
 
 ## Match score models {#match-score}
+This only functioned properly for noting which team would win a match. We want
+more information to be included, such as individual player scores.  We also
+only had it working where the tournament host would decide who won.
 
 ## Server management {#srv-man}
 
+
+
 # Not implemented
 
 ## Scoring Algorithms {#score-algo}
 
+Scoring algorithms was not implemented because we did not have time for 
+implementing player statistics in the first sprint.  There were some
+preliminary approaches, but the task lost priority and was abandoned.
+
 ## Data entry {#data-entry}
 
+It was decided to not be a priority for sprint one due to time constraints. 
+Also, we want to implement data entry for League of Legends through 
+Riot Games (TM)'s API for grabbing match data.
+
 # End
 
 1. Each task must be mentioned under the right category (implemented
diff --git a/doc/Sprint2.md b/doc/Sprint2.md
index e018e32..a7bd719 100644
--- a/doc/Sprint2.md
+++ b/doc/Sprint2.md
@@ -5,40 +5,39 @@ author: [ Nathaniel Foy, Guntas Grewal, Tomer Kimia, Andrew Murrell, Luke Shumak
 
 # User Stories
 
-1) As a host/player, I would like to have only the options my group entitles me to.
+1) As an admin, I would like hosts/players, to have only the options
+   their group entitles them to.
 
-Security/Verification 
+2) As an admin, I would like anti-spam measures for registration.
 
-2) As a player I would like to review my peers and like to have our scores reflect these reviews.
+3) As a player I would like to review my peers and like to have our
+   scores reflect these reviews.
 
-Peer Review
+4) As a host I would like to have both game type specific settings and
+   tournament specific preferences available when creating a new
+   tournament.
 
-3) As a host I would like to have both game type specific settings and tournament specific preferences available when creating a new tournament.
+5) As a host/player spectator I would like to have Riot Games League
+   of Legends API integration.
 
-Settings/Preferences
-
-4) As a host/player spectator I would like to have Riot Games League of Legends API integration. 
-
-LoL API Integration
-
-5) As a host/player, I would like my pages to actively update without
+6) As a host/player, I would like my pages to actively update without
    refreshing my current page.
-   	- For this task, we will implent an Active Status Update system with AJAX.
+    - For this task, we will implent an Active Status Update system with AJAX.
 
-6) As a host/player, I would like to see an interactive tournament lobby page
+7) As a host/player, I would like to see an interactive tournament lobby page
    that displays tournament information and its matches.
 
-7) As a host/player, I would like the Leaguer application to be more intuitive
+8) As a host/player, I would like the Leaguer application to be more intuitive
    and easy to use.
 
-8) As a user, I would like past tournament and player information to be 
+9) As a user, I would like past tournament and player information to be
    persistent and searchable.
-   	- A working search bar should be implemented that will find specific
-   	  players or tournaments and return their pages.
+    - A working search bar should be implemented that will find specific
+      players or tournaments and return their pages.
 
-9) As a user, I would like Player Profile pages.
-	- For this task, we will be creating profile pages for registered users
-	  that have player-specific information: name, tournament history, etc.
+10) As a user, I would like Player Profile pages.
+    - For this task, we will be creating profile pages for registered users
+      that have player-specific information: name, tournament history, etc.
 
 # Tasks
 
@@ -52,40 +51,40 @@ several days.
 +=========================================================+======+========+====+
 | Define Specific Unit Tests for Security                 |    3 | All    |  1 |
 +---------------------------------------------------------+------+--------+----+
-| Implement Anti-spam measures                            |    2 | Davis  |  1 |
-+---------------------------------------------------------+------+--------+----+
-| Gravitar Integration                                    |    2 | Foy    |  1 |
+| Implement Anti-spam measures                            |    2 | Davis  |  2 |
 +---------------------------------------------------------+------+--------+----+
-| ProjectLeaguer Logo                                     | spike| D&G    |  7 |
+| Email Verification Option                               |    5 | Luke   |  2 |
 +---------------------------------------------------------+------+--------+----+
-| Email Verification Option                               |    5 | Luke   |  1 |
-+---------------------------------------------------------+------+--------+----+
-| Implement Teammate Rating System (peer review view)     |    5 | Guntas |  2 |
+| Implement Teammate Rating System (peer review view)     |    5 | Guntas |  3 |
 +---------------------------------------------------------+------+--------+----+
 | Design/Code Scoring/Pairing Algorithms and Procedures   |    5 | D&F&A  |  3 |
 +---------------------------------------------------------+------+--------+----+
-| Implement gametype specific and tournament              |    8 | Luke&A |  3 |
+| Implement gametype specific and tournament              |    8 | Luke&A |  4 |
 | specific settings and preferences                       |      | Guntas |    |
 +---------------------------------------------------------+------+--------+----+
-| Retrieve data from Riot Games (TM) API                  |    3 | Foy    |  4 |
+| Retrieve data from Riot Games (TM) API                  |    3 | Foy    |  5 |
++---------------------------------------------------------+------+--------+----+
+| Parse Riot data and attach to scoring subsystem         |    5 | Davis  |  5 |
++---------------------------------------------------------+------+--------+----+
+| Teach Andrew and Tomer AJAX                             |    2 | Luke   |  6 |
 +---------------------------------------------------------+------+--------+----+
-| Parse Riot data and attach to scoring subsystem         |    5 | Davis  |  4 |
+| Make pages auto-update with AJAX                        |    5 | T&A    |  6 |
 +---------------------------------------------------------+------+--------+----+
-| Teach Andrew and Tomer AJAX                             |    2 | Luke   |  5 |
+| Setting up a Tournament View for matches and tree       |    5 | Tomer  |  7 |
 +---------------------------------------------------------+------+--------+----+
-| Make pages auto-update with AJAX                        |    5 | T&A    |  5 |
+| Increase Usability                                      |    3 | All-L  |  8 |
 +---------------------------------------------------------+------+--------+----+
-| Setting up a Tournament View for matches and tree       |    5 | Tomer  |  6 |
+| ProjectLeaguer Logo                                     | spike| D&G    |  8 |
 +---------------------------------------------------------+------+--------+----+
-| Increase Usability                                      |    3 | All-L  |  7 |
+| Develop comprehensive data storage for s&p&other        |    5 | Luke&A |  9 |
 +---------------------------------------------------------+------+--------+----+
-| Develop comprehensive data storage for s&p&other        |    5 | Luke&A |  8 |
+| Create Player Profile Pages                             |    2 | Tomer  | 10 |
 +---------------------------------------------------------+------+--------+----+
-| Create Player Profile Pages                             |    2 | Tomer  |  4 |
+| Gravitar Integration                                    |    2 | Foy    | 10 |
 +---------------------------------------------------------+------+--------+----+
-| Test it                                                 |    1 | All-L  |  2 |
+| Test it                                                 |    1 | All-L  | all|
 +---------------------------------------------------------+------+--------+----+
-| Peer review                                             |    1 | All    |  1 |
+| Peer review                                             |    1 | All    | all|
 +---------------------------------------------------------+------+--------+----+
 
 Total Size of Iteration: 55