diff --git a/.gitignore b/.gitignore index 423f019..08715ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ tomcat.8* target +git-log diff --git a/git-log.txt b/git-log.txt new file mode 100644 index 0000000..5a5d327 --- /dev/null +++ b/git-log.txt @@ -0,0 +1,18 @@ +11fc9f5 (HEAD -> master, origin2/master) Merge remote-tracking branch 'origin2/master' +4629601 updating readme +0df089b Update README.md +2b574d1 Merge remote-tracking branch 'origin2/master' +ce0df8a Deleted unused files, added CSS +ac72e1a Update Readme +c2bec1f Update README.md +f5dfdca Created album page feature +dc452b8 Added getArtist method, AlbumDao + test, changed Album constructor +85dc69b Created Album class +1e57b57 Forgot to stage all changes last time +f8004fd Fixed addArtist, added a form to artistList, deleted unused index-page +2e315f5 Added ArtistDaoTest and addArtist method to ArtistDao +cb20bb1 Added dependencies, artistList-page +0f6b790 Added DB class, modified ArtistDao +709e385 Added Artist, ArtistDao +4dc1f5d Update .project +6c9dd13 Initial commit diff --git a/screenshots/ohjelmointi2-all-artists.PNG b/screenshots/ohjelmointi2-all-artists.PNG new file mode 100644 index 0000000..87e02c0 Binary files /dev/null and b/screenshots/ohjelmointi2-all-artists.PNG differ diff --git a/screenshots/ohjelmointi2-artistpage.png b/screenshots/ohjelmointi2-artistpage.png new file mode 100644 index 0000000..5232c45 Binary files /dev/null and b/screenshots/ohjelmointi2-artistpage.png differ