summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-07 19:26:05 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-07 19:26:05 -0400
commitbdcc8073f8fa0daa1413cdb5e5b6b4e8cc0c74f8 (patch)
treedc3a581c3a36c21209b26fc03c82ff33d3bc176f /doc
parent4214112c7030fa695ff2d875b4b1888d5633a488 (diff)
parentff03350cea6cb09b9a3aa408ac04acc8883227a4 (diff)
Fixed merge conflicts
Diffstat (limited to 'doc')
-rw-r--r--doc/Sprint2-Retrospective.md9
-rw-r--r--doc/sprint3.md10
2 files changed, 13 insertions, 6 deletions
diff --git a/doc/Sprint2-Retrospective.md b/doc/Sprint2-Retrospective.md
index be84438..2aa129d 100644
--- a/doc/Sprint2-Retrospective.md
+++ b/doc/Sprint2-Retrospective.md
@@ -75,7 +75,14 @@ several days.
# Implemented and working
## Define Specific Unit Tests for Security {#security-test}
-## Implement Anti-spam measures {#anti-spam}
+
+## Implement Anti-spam measures {#anti-spam}
+
+To handle potential spam problems, Project Leaguer has implemented Simple Captcha
+on the user sign up page. Users must enter the correct code corresponding with
+Simple Captcha's generated image when registering. Usernames must also be unique.
+E-mail verification has been pushed to Sprint 3.
+
## Implement Teammate Rating System (peer review view) {#peer-review}
One of the more unique selling points of Project Leaguer lies with it's peer review
diff --git a/doc/sprint3.md b/doc/sprint3.md
index 67ec256..49ffb50 100644
--- a/doc/sprint3.md
+++ b/doc/sprint3.md
@@ -60,7 +60,7 @@ several days.
+---------------------------------------------------------+------+------------+----+
| Task Description | Size | Person | US |
+=========================================================+======+============+====+
-| Intelligent Error Handling (404 redirection) | 3 | Andrew | |
+| Intelligent Error Handling (404 redirection) | 3 | Andrew | 2 |
+---------------------------------------------------------+------+------------+----+
| Search | | | |
+---------------------------------------------------------+------+------------+----+
@@ -68,13 +68,13 @@ several days.
+---------------------------------------------------------+------+------------+----+
| Email verification | | | |
+---------------------------------------------------------+------+------------+----+
-| Alternate Scoring and pairing methods | | Davis | |
+| Alternate Scoring and pairing methods | | Davis | 4 |
+---------------------------------------------------------+------+------------+----+
| Preferences | | | |
+---------------------------------------------------------+------+------------+----+
| More types of seeded settings | | | |
+---------------------------------------------------------+------+------------+----+
-| Asynchronous Riot Pulls | | Nathaniel | |
+| Asynchronous Riot Pulls | | Nathaniel | 1 |
+---------------------------------------------------------+------+------------+----+
| Brackets | | Tomer | |
+---------------------------------------------------------+------+------------+----+
@@ -82,9 +82,9 @@ several days.
+---------------------------------------------------------+------+------------+----+
| Make it look professional | | | |
+---------------------------------------------------------+------+------------+----+
-| Expand Peer Evaluation | | G, A, D | |
+| Expand Peer Evaluation | | G, A, D | 5 |
+---------------------------------------------------------+------+------------+----+
-| Remote User IDs | | Davis | |
+| Remote User IDs | | Davis | 1 |
+---------------------------------------------------------+------+------------+----+
| Private Messages | | | |
+---------------------------------------------------------+------+------------+----+