Avans/MusicPlayer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34 Commits 7 Branches 0 Tags
5e40a1e7a320600596ed35fb4fe466a1e5c8ab2c
Commit Graph
34 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kennyboy55 5e40a1e7a3 Merge branch 'developer' into gui 
Conflicts:
	MusicPlayer/MusicPlayer/Program.cs
 2015-10-29 21:39:54 +01:00
Yorick Rommers 3a0449ec27 Merge remote-tracking branch 'origin/api' into developer 2015-10-29 21:38:44 +01:00
Yorick Rommers ae73848177 Implemented some API functions 2015-10-29 21:38:04 +01:00
kennyboy55 ada4321bca Change to public. New Structure. 2015-10-29 21:21:35 +01:00
kennyboy55 f79b2ace28 Changed Structure 2015-10-29 20:55:36 +01:00
kennyboy55 9108f17acc Merge branch 'developer' into gui 
Conflicts:
	MusicPlayer/MusicPlayer/MusicPlayer.csproj
 2015-10-29 20:47:00 +01:00
Yorick Rommers 1bf6fe80bb Merge remote-tracking branch 'origin/api' into developer 2015-10-29 20:45:50 +01:00
kennyboy55 9f64137e68 Added new stuff 2015-10-29 20:45:23 +01:00
Yorick Rommers fa863d562e updated gitignore 2015-10-29 20:45:16 +01:00
Yorick Rommers 1849f0e0c5 Merge api to dev 2015-10-29 20:44:18 +01:00
Yorick Rommers 415e87b787 API getSongURLbyid working 2015-10-29 20:37:36 +01:00
Janco Kock 050d405152 Added a fancy icon 2015-10-29 20:16:27 +01:00
kennyboy55 a45d506dbc Added controls panel and playing of music 2015-10-29 20:12:59 +01:00
kennyboy55 23a7373338 Merge branch 'developer' into gui 2015-10-29 19:55:45 +01:00
Yorick Rommers 2de025edf7 Merge gui into dev 2015-10-29 19:43:45 +01:00
yorickr 8e51cfad07 Merge api to dev 2015-10-29 19:33:56 +01:00
jancoow 8b6efac738 Added a working server connector 2015-10-15 14:57:59 +02:00
kennyboy55 5491f1d165 Updated GUI 2015-10-15 14:52:10 +02:00
Yorick Rommers bdf6366dc0 Werkt nog niet 2015-10-15 14:36:51 +02:00
kennyboy55 6acb6ecd7a Bugfixes 2015-10-15 14:11:16 +02:00
kennyboy55 3f1483beeb Fixed file 2015-10-15 14:07:47 +02:00
kennyboy55 3cc9bcffb3 Merge branch 'developer' into gui 
Conflicts:
	MusicPlayer/MusicPlayer/MusicPlayer.csproj
 2015-10-15 14:03:59 +02:00
jancoow 78c86d5680 Added receivedata to a thread 2015-10-15 13:58:33 +02:00
kennyboy55 c2e603efaf Added Jsonsoft Nuget! 2015-10-15 13:58:08 +02:00
Yorick Rommers eb5e1254b0 Added some fields to stubs 2015-10-15 13:55:42 +02:00
Yorick Rommers f643ff2967 Fixed errors. 2015-10-15 13:50:52 +02:00
kennyboy55 9a84ae5586 Added missing files 2015-10-15 13:45:57 +02:00
Yorick Rommers ac23302e81 Merge branch 'api' of https://github.com/yorickr/musicplayer into api 2015-10-15 13:42:56 +02:00
Yorick Rommers a9a104bd41 Added class stubs 2015-10-15 13:42:38 +02:00
kennyboy55 bfc01b635f Added first gui version 2015-10-15 13:42:12 +02:00
jancoow 9364ebddc4 Addes some functionality to networkhandler, fixed wrong namespace 2015-10-15 13:41:27 +02:00
jancoow af735a8502 Added files to visualstudio 2015-10-15 13:13:55 +02:00
jancoow 72c75b457d Added start of networkhandler and apihandler 2015-10-15 13:02:50 +02:00
kennyboy55 67c7e13812 First commit 2015-10-15 12:59:35 +02:00