Avans/ErgometerDoctorApplication
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46 Commits 2 Branches 0 Tags
29051fdaff15fe82dbb4d2dacf1a1f649214c36a
Commit Graph
46 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kennyboy55 29051fdaff Added keypresses and sanitization 2015-10-20 22:40:12 +02:00
kennyboy55 1d968bc263 Fixed time input 2015-10-20 22:39:21 +02:00
kennyboy55 1c149736ba Added enter events and empty box after action 2015-10-20 20:01:03 +02:00
kennyboy55 d67221d19f Merge remote-tracking branch 'origin/develop' into develop 2015-10-20 19:41:15 +02:00
kennyboy55 9f992bb38b Added broadcast 2015-10-20 19:40:22 +02:00
Jannick van Ballegooijen 9c499b241d style change 2015-10-20 19:24:12 +02:00
Jannick van Ballegooijen 52c9ef0155 style change 2015-10-20 17:00:59 +02:00
Jannick van Ballegooijen 679d3ad4ef style change session panel 2015-10-20 16:56:29 +02:00
kennyboy55 33a5ffe7af Spelling 2015-10-20 16:03:10 +02:00
kennyboy55 1c0028be4f Fixed layout 2015-10-20 15:35:07 +02:00
kennyboy55 c043b92e31 Merge remote-tracking branch 'origin/develop' into develop 2015-10-20 15:09:17 +02:00
kennyboy55 5af966a6d9 Bugfixes 2015-10-20 15:08:51 +02:00
Jannick van Ballegooijen b1b47acec9 changed visibility 2015-10-20 15:08:48 +02:00
Jannick van Ballegooijen 0894ea7231 Merge branch 'develop' of https://github.com/KettlerX7AvansA5/ErgometerDoctorApplication into develop 2015-10-20 15:04:48 +02:00
Jannick van Ballegooijen ea6a2316a8 Added setpanel 2015-10-20 15:04:21 +02:00
kennyboy55 88b32e83f2 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	ErgometerDoctorApplication/MainWindow.cs
 2015-10-20 13:46:59 +02:00
Aareschluchtje a0e71b562b Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	ErgometerDoctorApplication/MainWindow.cs
 2015-10-20 13:45:23 +02:00
kennyboy55 38f5ee9ee4 Changed size 2015-10-20 13:43:55 +02:00
Aareschluchtje 91a659b6fb Added history 2015-10-20 13:43:34 +02:00
kennyboy55 dfc4ab9b42 Send chat with old session 2015-10-20 12:57:47 +02:00
kennyboy55 48b9e1365e Fixed old client data 2015-10-20 11:19:08 +02:00
kennyboy55 af684d2986 Implemented user viewing/adding. 
Tried to add old sessions (broken).
 2015-10-20 00:26:56 +02:00
kennyboy55 90c4072bb1 Merge errors fixed 2015-10-19 22:35:28 +02:00
kennyboy55 1e1cc54371 Merge remote-tracking branch 'origin/develop' into develop 
Conflicts:
	ErgometerDoctorApplication/ConActiveSessions.cs
	ErgometerDoctorApplication/MainWindow.cs
 2015-10-19 22:32:39 +02:00
kennyboy55 689897626b Rebuild connecting, recreated active sessions, bugfixes 2015-10-19 22:24:58 +02:00
Aareschluchtje 3d52e6d36a Added new ugly table 2015-10-19 22:21:16 +02:00
kennyboy55 3ccf78b3ff Move ChatItem to library. Fix bugs with connecting. 2015-10-19 18:51:18 +02:00
kennyboy55 3e854214dd Merge remote-tracking branch 'origin/develop' into develop 2015-10-19 17:30:05 +02:00
kennyboy55 96b15eb85a Fixed chat 2015-10-19 17:29:47 +02:00
Aareschluchtje a977b90d80 Recommited stupid table. 2015-10-19 16:17:48 +02:00
Aareschluchtje 10f7c0ecfc Revert "Some more table stuff." 
This reverts commit e65d80edc2.
 2015-10-19 16:13:21 +02:00
Aareschluchtje e65d80edc2 Some more table stuff. 2015-10-19 16:04:53 +02:00
Jannick van Ballegooijen 520a6f61ff Merge branch 'develop' of https://github.com/KettlerX7AvansA5/ErgometerDoctorApplication into develop 2015-10-19 15:02:47 +02:00
Jannick van Ballegooijen 670adcaf11 removed teeth 2015-10-19 15:02:16 +02:00
Aareschluchtje a401fdc4c5 Added a little beginning to the table. 2015-10-17 22:57:31 +02:00
kennyboy55 a645f2fe05 Added client content 2015-10-17 21:47:25 +02:00
Aareschluchtje 5839452e20 Added timer for updating sessions. 2015-10-16 11:56:06 +02:00
kennyboy55 1e97975bad Added client windows 2015-10-16 10:42:55 +02:00
kennyboy55 22e773d25a Login to server. 
Receive data: sessions, users..
 2015-10-13 22:05:27 +02:00
Jannick van Ballegooijen 32cef0289d Started session window 2015-10-11 19:59:16 +02:00
Jannick van Ballegooijen 586493739e merge 2015-10-11 19:35:14 +02:00
Jannick van Ballegooijen b8e37fdbcf Added Login screen 
-"empty" buttons
 2015-10-11 19:32:53 +02:00
kennyboy55 84acd482d7 Added login form, broke a lot of stuff 2015-10-09 20:50:08 +02:00
kennyboy55 c3844d6299 Changed display name 2015-10-09 10:06:12 +02:00
Jannick van Ballegooijen 0877f3e607 Added basic window functionality(switching panels) 
- used visibility true/false
- to do: research more effective method when encountering performance issues
 2015-10-02 15:09:23 +02:00
kennyboy55 ea93f8b05e First commit 2015-10-02 10:07:30 +02:00