Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
05b1a86
Create README_team.md
snmangalam2708 Mar 12, 2020
a2a1d83
March_Madness structure
Mar 13, 2020
018259d
Merge branch 'master' of https://github.com/snmangalam2708/JustCode i…
Mar 13, 2020
8209a99
Update README_team.md
snmangalam2708 Mar 13, 2020
f70fe73
Update README_team.md
snmangalam2708 Mar 13, 2020
bef269d
pull
Mar 13, 2020
47ab8c2
pull
Mar 13, 2020
b3376c7
enum
Mar 13, 2020
3d3da08
Saving after pull from dev
asconem Mar 13, 2020
c35fe34
update
Mar 13, 2020
ac6b482
f
Mar 13, 2020
2c6629f
Merge pull request #1 from snmangalam2708/featureRaheel
DavidKellyonGitHub Mar 13, 2020
cc205f7
commit
raheeluppal Mar 13, 2020
a73a8e3
fix
raheeluppal Mar 13, 2020
aed061f
Merge pull request #2 from snmangalam2708/featureRaheel
DavidKellyonGitHub Mar 13, 2020
826527b
update
raheeluppal Mar 13, 2020
7caf028
region and team framework started
DavidKellyonGitHub Mar 14, 2020
b39fc15
Created console for regions and GUI for march madness bracket
Mar 14, 2020
2724648
Merge pull request #4 from snmangalam2708/featureSandeep
snmangalam2708 Mar 14, 2020
113134d
removed some conflicts in region
Mar 14, 2020
f758bff
Merge pull request #5 from snmangalam2708/featureSandeep
snmangalam2708 Mar 14, 2020
b6f84b2
made changes to region to avoid conflict
Mar 14, 2020
a1e64f4
Merge pull request #6 from snmangalam2708/featureSandeep
snmangalam2708 Mar 14, 2020
8acd2ed
Merge pull request #3 from snmangalam2708/region
snmangalam2708 Mar 14, 2020
96e9856
Minor changes
Mar 14, 2020
4bf4fb7
Merge pull request #7 from snmangalam2708/featureSandeep
snmangalam2708 Mar 14, 2020
e58ac5e
added region test coverage
DavidKellyonGitHub Mar 14, 2020
ac382f7
tests
raheeluppal Mar 14, 2020
99612ed
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
raheeluppal Mar 14, 2020
d1473a3
Merge pull request #8 from snmangalam2708/region
raheeluppal Mar 14, 2020
bc67ab8
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
raheeluppal Mar 14, 2020
b18541e
added team testing
DavidKellyonGitHub Mar 14, 2020
4058a7d
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
DavidKellyonGitHub Mar 14, 2020
e242d54
Merge pull request #9 from snmangalam2708/region
raheeluppal Mar 14, 2020
49ec051
tests
raheeluppal Mar 14, 2020
b7b5b9b
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
raheeluppal Mar 14, 2020
c310be9
Added ineteger exception for menu in Console
Mar 14, 2020
64e985c
Merge pull request #10 from snmangalam2708/featureSandeep
snmangalam2708 Mar 14, 2020
8d765c4
added region teams
DavidKellyonGitHub Mar 14, 2020
64822ff
added parser class
DavidKellyonGitHub Mar 14, 2020
b726552
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
DavidKellyonGitHub Mar 14, 2020
2873929
Merge pull request #11 from snmangalam2708/region
snmangalam2708 Mar 14, 2020
2c1486d
minor changes
Mar 14, 2020
0a8ecaa
Merge pull request #12 from snmangalam2708/featureSandeep
snmangalam2708 Mar 14, 2020
5410fd5
Updating after pull from dev
asconem Mar 15, 2020
2aae934
added jdbc to project
DavidKellyonGitHub Mar 15, 2020
e8afeb0
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
DavidKellyonGitHub Mar 15, 2020
a0373b5
Merge pull request #13 from snmangalam2708/region
raheeluppal Mar 15, 2020
277e751
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
raheeluppal Mar 15, 2020
5e671f4
jdbc
raheeluppal Mar 15, 2020
c37965b
added jdbc class and connect to db method
DavidKellyonGitHub Mar 15, 2020
82dfb2e
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
DavidKellyonGitHub Mar 15, 2020
f6431ac
Merge pull request #14 from snmangalam2708/jdbc
raheeluppal Mar 15, 2020
21bde5f
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
raheeluppal Mar 15, 2020
ae261db
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
asconem Mar 15, 2020
6ddbdf5
Pull request done
asconem Mar 15, 2020
a7941ff
added getTeamList method
DavidKellyonGitHub Mar 15, 2020
26c944f
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
DavidKellyonGitHub Mar 15, 2020
ce8f644
SQL queries functioning from my local database
DavidKellyonGitHub Mar 15, 2020
2eec90a
Merge pull request #15 from snmangalam2708/jdbc
raheeluppal Mar 16, 2020
0064bc5
pull
raheeluppal Mar 16, 2020
8b33c4c
Saving changes locally
asconem Mar 16, 2020
eb36b93
Saving changes locally
asconem Mar 16, 2020
c49865c
Bracket Selection
raheeluppal Mar 16, 2020
de2cf5f
Merge pull request #16 from snmangalam2708/featureRaheel
DavidKellyonGitHub Mar 17, 2020
b56d7ce
commit to pull
DavidKellyonGitHub Mar 17, 2020
54bba9f
commit to pull
DavidKellyonGitHub Mar 17, 2020
0651c02
fixed regionBracket
DavidKellyonGitHub Mar 17, 2020
c7a8d60
added some of the bracketSelection logic, pushing for kris review
DavidKellyonGitHub Mar 17, 2020
4eb951f
Merge pull request #17 from snmangalam2708/daveBracketSelection
DavidKellyonGitHub Mar 17, 2020
93bb046
corrected pickRegionWinner
DavidKellyonGitHub Mar 17, 2020
51c2416
completed bracketSelection - needs testing
DavidKellyonGitHub Mar 17, 2020
cf4212d
Merge pull request #18 from snmangalam2708/daveBracketSelection
raheeluppal Mar 17, 2020
b89238e
Merge pull request #19 from snmangalam2708/dev
raheeluppal Mar 17, 2020
8b720c6
Saving after pull from dev
asconem Mar 18, 2020
87c3580
Merge issue fixed
asconem Mar 18, 2020
f2a92c5
established connection to heroku db, need to populate db
DavidKellyonGitHub Mar 18, 2020
f0718c1
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
DavidKellyonGitHub Mar 18, 2020
b64ca9e
Merge pull request #20 from snmangalam2708/daveBracketSelection
asconem Mar 18, 2020
37b401d
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
asconem Mar 18, 2020
3f6d617
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
Mar 18, 2020
f8fac56
Add tests for getting and setting a team name on a given roster
asconem Mar 19, 2020
2c5ca73
Adjusting tests
asconem Mar 19, 2020
a0f3f49
Merge pull request #21 from snmangalam2708/featureMatt
raheeluppal Mar 19, 2020
670e4f5
pull
raheeluppal Mar 19, 2020
a4f8946
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode into…
raheeluppal Mar 19, 2020
11be970
working on accepting menu as numbers and items
Mar 19, 2020
97d9ece
added .idea to gitignore
Mar 19, 2020
763879b
added .idea to gitignore
Mar 19, 2020
2265ebf
Merge pull request #23 from snmangalam2708/jsonSQL
snmangalam2708 Mar 19, 2020
da1d4a9
Merge pull request #22 from snmangalam2708/jsonSQL
DavidKellyonGitHub Mar 27, 2020
ea27067
added mappers, services, some SQL to populate roster
DavidKellyonGitHub Mar 31, 2020
10681c2
Merge branch 'dev' of https://github.com/snmangalam2708/JustCode
DavidKellyonGitHub Mar 31, 2020
0c6d3eb
Merge pull request #24 from snmangalam2708/featureDave
snmangalam2708 Mar 31, 2020
51dd73f
pull
raheeluppal Apr 1, 2020
28d3307
pull
raheeluppal Apr 1, 2020
6198857
pull
raheeluppal Apr 2, 2020
8a26409
tests
raheeluppal May 13, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
# Log file
*.log

/.idea

# BlueJ files
*.ctxt

Expand Down
6 changes: 6 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions .idea/JustCode.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions .idea/March_Madness.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__junit_junit_4_12.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/libraries/Maven__org_postgresql_postgresql_42_2_11.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/libraries/mysql_connector_java_8_0_19.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading