Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Final pull request! #49

Merged
merged 17 commits into from
May 11, 2019
Merged

Final pull request! #49

merged 17 commits into from
May 11, 2019

Conversation

glugg23
Copy link
Owner

@glugg23 glugg23 commented May 11, 2019

No description provided.

glugg23 and others added 17 commits May 7, 2019 13:00
@glugg23
Update README to have feature table
2f011ad
@glugg23
Get ip address from command line args
61df9be
@wrestlerdude
All the capital cities in a continent organised by largest population…
1299fcc 
… to smallest - FIXED!
@glugg23
Merge branch 'master' of https://github.com/glugg23/SET08103-G20 into…
8176db7 
… develop
@glugg23
Added some missing methods
7ea58c1
@glugg23
Merge branch 'develop' of https://github.com/glugg23/SET08103-G20 int…
742c9f5 
…o feature/final-delivery
@glugg23
Changed district population to not require country name
7895fb6
@glugg23
Merge branch 'develop' of https://github.com/glugg23/SET08103-G20 int…
18fae07 
…o feature/final-delivery
@glugg23
Added a TUI for getting screenshots of it working
02a8903 
This can be reverted once springboot is all working
@glugg23
Image for 1st feature
75ac5ae
@glugg23
Add contributions table
bb0fd03
@glugg23
Added prompt to let user know database is loading
e165c93
@wrestlerdude
Added the rest of the screenshots
c5114df
@wrestlerdude
Update README.md with screenshot linkks
06b2c9f
@glugg23
Added null check for questions 18 & 19
cba0ad7
@glugg23
Merge branch 'feature/final-delivery' into develop
a7534bd
@glugg23
Ignore Main.java as it will never have tests run on it and it has a h…
17f1e09 
…igh line count
wrestlerdude
wrestlerdude approved these changes May 11, 2019
View reviewed changes
Copy link
Collaborator

@wrestlerdude wrestlerdude left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Finally done - thank the gods.

jacobbarrow
jacobbarrow approved these changes May 11, 2019
View reviewed changes
Copy link
Collaborator

@jacobbarrow jacobbarrow left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Full steam ahead

@jacobbarrow jacobbarrow merged commit d89a447 into master May 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wrestlerdude wrestlerdude wrestlerdude approved these changes

@jacobbarrow jacobbarrow jacobbarrow approved these changes

@MrRa1n MrRa1n Awaiting requested review from MrRa1n

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@glugg23 @jacobbarrow @wrestlerdude