Spoteezer.git - Music app in Java

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/develop' into develop	Clyhtsuriva	2021-06-26	40	-38/+62
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # bin/musichub/business/Album.class # bin/musichub/business/AudioBook.class # bin/musichub/business/AudioElement.class # bin/musichub/business/Category.class # bin/musichub/business/Genre.class # bin/musichub/business/Language.class # bin/musichub/business/MusicHub.class # bin/musichub/business/NoAlbumFoundException.class # bin/musichub/business/NoElementFoundException.class # bin/musichub/business/NoPlayListFoundException.class # bin/musichub/business/PlayList.class # bin/musichub/business/Song.class # bin/musichub/business/SortByAuthor.class # bin/musichub/business/SortByDate.class # bin/musichub/business/SortByGenre.class # bin/musichub/main/Main.class # bin/musichub/util/XMLHandler.class # src/main/java/musichub/business/AudioElement.java # src/main/java/musichub/business/MusicHub.java # src/main/java/musichub/business/Song.java # src/main/java/musichub/main/Main.java
\| *	Delete .classpath	Clyhtsuriva	2021-06-26	1	-6/+0
\| \|
\| *	Delete .project	Clyhtsuriva	2021-06-26	1	-17/+0
\| \|
\| *	Delete .idea directory	Clyhtsuriva	2021-06-26	4	-28/+0
\| \|
\| *	Merge pull request #4 from Said-Belhadj/feature/STZ-0001	Clyhtsuriva	2021-06-26	49	-5/+138
\| \|\ \| \| \| \| \| \|	Feature/stz 0001
\| \| *	Add reset, pause, quit functionality	said belhadj	2021-06-26	46	-18/+100
\| \| \|
\| \| *	Add the possibility to listen a song thanks to Audio System library	said belhadj	2021-06-26	7	-4/+55
\| \|/
* \|	Merge branch 'feature/STZ-0007' into develop	Clyhtsuriva	2021-06-26	132	-5/+8034
\|\ \ \| \|/ \|/\|
\| *	Removed reduced pom and added the content of STZ-0001 with a switch modif.	Clyhtsuriva	2021-06-26	65	-149/+208
\| \|
\| *	Update	Clyhtsuriva	2021-06-26	50	-84/+84
\| \|
\| *	Changed the architecture to respect maven and generated an empty javadoc	Clyhtsuriva	2021-06-26	129	-23/+7829
\| \|
\| *	Adding the pom.xml and target folder created from mvn package.	Clyhtsuriva	2021-06-26	6	-0/+164
\|/
*	Merge pull request #2 from Said-Belhadj/hotfix/STZ-0004	Said Belhadj	2021-06-25	1	-1/+3
\|\ \| \| \| \|	Fixing STZ-0004 issue.
\| *	Fixing STZ-0004 issue.	Clyhtsuriva	2021-06-25	1	-1/+3
\|/
*	Delete initial_class_diagram.png	Clyhtsuriva	2021-06-17	1	-0/+0
\|
*	Added initial_class_diagram.png	Clyhtsuriva	2021-06-17	1	-0/+0
\|
*	Update of README.md and renaming the diagram	Clyhtsuriva	2021-06-17	2	-1/+1
\|
*	Update Untitled Diagram.png	Clyhtsuriva	2021-06-17	1	-0/+0
\|
*	Update Untitled Diagram.png	Clyhtsuriva	2021-06-17	1	-0/+0
\|
*	Update Untitled Diagram.png	Clyhtsuriva	2021-06-17	1	-0/+0
\|
*	Update Untitled Diagram.png	Clyhtsuriva	2021-06-17	1	-0/+0
\|
*	Update Untitled Diagram.png	Clyhtsuriva	2021-06-17	1	-0/+0
\|
*	ClassDiagram.png	Said Belhadj	2021-06-17	1	-0/+0
\|
*	Merge branch 'master' into develop	Clyhtsuriva	2021-06-08	37	-1/+1356
\|\
\| *	Update of README.md and MusicHub.java	Clyhtsuriva	2021-06-08	2	-4/+18
\| \|
\| *	Adding LICENSE and README.md	Clyhtsuriva	2021-06-06	2	-0/+675
\| \|
\| *	Initial jMusicHubProject	Clyhtsuriva	2021-06-06	36	-0/+1341
\|
*	Initial commit	Said Belhadj	2021-05-25	2	-0/+675