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

2 files changed, 55 insertions, 46 deletions

diff --git a/doc/Sprint1-Retrospective.md b/doc/Sprint1-Retrospective.md
index f299d58..0889c84 100644
--- a/doc/Sprint1-Retrospective.md
+++ b/doc/Sprint1-Retrospective.md
@@ -11,7 +11,7 @@ author: [ Nathaniel Foy, Guntas Grewal, Tomer Kimia, Andrew Murrell, Luke Shumak
 2) As a host/player, I would like to register and have an account.
     - For this task, we will be creating the user registration and log
       in capabilities for Leaguer.
-3) As a host, I would like to start a tournamnet.
+3) As a host, I would like to start a tournament.
     - For this task, we will be creating a base tournament system for a
       host to run.
 4) As a host/player, I would like to enter scores for players.
@@ -23,7 +23,6 @@ author: [ Nathaniel Foy, Guntas Grewal, Tomer Kimia, Andrew Murrell, Luke Shumak
     - For this task, we will be creating a Leaguer homepage and ensure that it
       is pleasing to the eye and easy to navigate.
 
-
 # Tasks
 
 The "size" is using the modified Fibonacci scale.  A '1' is expected
@@ -39,7 +38,7 @@ several days.
 +---------------------------------------------------------+------+--------+----+
 | [Deploy rails on Luke's server](#deploy-rails)          |    3 | Luke   |  1 |
 +---------------------------------------------------------+------+--------+----+
-| [Create log-in system backend (verification, cookies,   |    5 | Davis  |  2 |
+| [Create log-in system back-end (verification, cookies,  |    5 | Davis  |  2 |
 | and redirection)](#login-backend)                       |      |        |    |
 +---------------------------------------------------------+------+--------+----+
 | [Create log-in system UI](#login-ui)                    |    2 | Tomer  |  2 |
@@ -86,18 +85,29 @@ several days.
 
 ## Learn Rails {#learn-rails}
 
-This task went OK.
+Learning Rails has been a growing experience for the majority of the
+team. Some of us coming from no significant experience to being able
+to put together a relatively functional product in only three weeks
+has been an impressive journey.
 
 ## Deploy Rails {#deploy-rails}
 
-f
+The entire team became familiar with deploying Rails in our rather
+diverse working environments and successfully deployed a server
+instance located at demo.projectleaguer.net.
 
-## Login (backend) {#login-backend}
+## Login (back-end) {#login-backend}
 
-f
+Our login back-end successfully logs users in and our and can handle
+user registrations and first-come-first-serve uniqueness validation.
 
 ## Login (UI) {#login-ui}
 
+Our login user interface successfully differentiates between logged in
+and logged out users as well as between users of different
+designations (although for the demo some of the hooks were not in
+place, this has been fixed).
+
 ## Tournament settings {#tourney-settings}
 
 ## Tournament registration {#tourney-registration}
diff --git a/doc/Sprint2.md b/doc/Sprint2.md
index c695e9b..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 task 2, we will implement 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