summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-27Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
2014-03-27Merge branch 'master' of https://github.com/LukeShu/leaguerTomer Kimia
Conflicts: app/views/tournaments/show.html.erb
2014-03-27DogDavisLWebb
2014-03-27Doing this to see if it worksDavisLWebb
2014-03-27New tournement start pageTomer Kimia
2014-03-25Adding match status after solving conflictsguntasgrewal
2014-03-25Match Status addedguntasgrewal
2014-03-25revert GuntasAndrewMurrell
2014-03-25added match statusguntasgrewal
2014-03-25Tournament Name addedguntasgrewal
2014-03-25Tournament has a NAME nowguntasgrewal
2014-03-25Merge branch 'clean'guntasgrewal
2014-03-25Changes to generate.shguntasgrewal
2014-03-10Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-10Final upload of files.AndrewMurrell
2014-03-10Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-03-10User story additions and specifications.nfoy
2014-03-10write about the permissions systemLuke Shumaker
2014-03-10Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-10fix bad mergeLuke Shumaker
2014-03-10Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-10Small change in tourny viewguntasgrewal
2014-03-10Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-10write areas for improvementLuke Shumaker
2014-03-10Added those 2 sections.AndrewMurrell
2014-03-10Finished those 2 other areas.AndrewMurrell
2014-03-10Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-10Homepage and Tournamentguntasgrewal
2014-03-10Merge branch 'master' of https://github.com/LukeShu/Leaguerwebb39
2014-03-10Merge https://github.com/LukeShu/Leaguerwebb39
Conflicts: doc/Sprint1-Retrospective.md
2014-03-10Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-03-10added match controller informationwebb39
2014-03-10Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
2014-03-10retrospective: server management storyLuke Shumaker
2014-03-10Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-03-10Sprint1-Retro: Tournament view task.nfoy
2014-03-10Merge branch 'master' of http://github.com/LukeShu/leaguerAndrewMurrell
2014-03-10Added the first four descriptionsAndrewMurrell
2014-03-10spell checkLuke Shumaker
2014-03-10re-order some sprint2 tasksLuke Shumaker
2014-03-10Merge branch 'master' of github.com:LukeShu/leagerLuke Shumaker
Conflicts: doc/Sprint2.md
2014-03-10stuffLuke Shumaker
2014-03-10Found typo in Sprint 2.nfoy
Sprint 1 - Retro: Explained tasks under both implemented but not working well and not implemented.
2014-03-10reword the thingsLuke Shumaker
2014-03-10Merge branch 'master' of https://github.com/LukeShu/leaguernfoy
2014-03-10Sprint2 User Stories 5 through 9.nfoy
2014-03-10Merge branch 'master' of https://github.com/LukeShu/leaguerguntasgrewal
2014-03-10User Stories 1-4guntasgrewal
2014-03-10linkify all the tasks in the sprint1 retrospectiveLuke Shumaker
2014-03-10touch up docsLuke Shumaker
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-10-31 21:00:33 +0000