7544 Commits

Author	SHA1	Message	Date
miterosan	142e1b8587	update the line endings	2018-04-14 13:32:48 +02:00
miterosan	5bfb386226	Merge remote-tracking branch 'origin/master' into Private_Messages	2018-04-14 13:31:03 +02:00
miterosan	1b51da70af	Create an abstraction for APIMessagesRequest	2018-04-14 13:23:16 +02:00
smoogipoo	fe77417e03	Merge remote-tracking branch 'origin/master' into ignored_input_handler	2018-04-13 22:23:33 +09:00
Dan Balasescu	258e17566c	Merge branch 'master' into update-nunit-3.10.1	2018-04-13 22:05:26 +09:00
Dean Herbert	a0f9f8d512	Update frramework again	2018-04-13 21:47:50 +09:00
FreezyLemon	4b3a129738	bump NUnit to version 3.10.1	2018-04-13 13:19:52 +02:00
Dean Herbert	9f5a52b641	Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler	2018-04-13 19:54:15 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	a1a7e63646	Merge branch 'master' into ignored_input_handler	2018-04-13 18:05:12 +09:00
Endrik Tombak	d9f587edff	Merge remote-tracking branch 'upstream/master' into alt-eagerselect	2018-04-13 11:55:35 +03:00
Dean Herbert	f7c50dee65	Merge branch 'master' into beatmap_set_overlay_difficulties_ordering	2018-04-13 16:48:43 +09:00
Dan Balasescu	2699ad8c89	Merge branch 'master' into lowercase-back-button	2018-04-13 14:14:18 +09:00
Joehu	128446e51d	Remove composer from player loader	2018-04-12 16:46:46 -07:00
miterosan	a9f3885d28	Remove not needed using	2018-04-12 23:29:23 +02:00
miterosan	e39f5a1adf	Rename var chatmanager -> channelManager ... Apply requested changes	2018-04-12 23:19:13 +02:00
TocoToucan	9acea6eab0	Order beatmap difficulty icons correctly	2018-04-12 19:33:30 +03:00
Joehu	61d6f52a53	Lowercase back button	2018-04-12 08:26:25 -07:00
TocoToucan	7c3441e2d0	ActiveInputHandlers -> IgnoredInputHandler	2018-04-12 17:06:35 +03:00
Dean Herbert	127f0d7b01	Fix smoogipoo's comments	2018-04-12 21:17:17 +09:00
Dean Herbert	0ca703beaa	Add some missing xmldoc	2018-04-12 21:04:45 +09:00
Dean Herbert	b50bad0072	Merge branch 'master' into editor-clock	2018-04-12 19:29:58 +09:00
Dean Herbert	3ddf00ee74	Merge branch 'master' into high-level-xmldoc	2018-04-12 19:05:10 +09:00
smoogipoo	baae4427ff	Move string-token property to OAuth	2018-04-12 14:30:28 +09:00
smoogipoo	e007365916	Save OAuth token to config on every token change	2018-04-12 14:23:49 +09:00
smoogipoo	6e35910419	Remove start/stop clock logic ... Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.	2018-04-12 14:06:36 +09:00
smoogipoo	a2484fbf56	Move back to DI-ing adjustable clock into SummaryTimeline	2018-04-12 13:37:02 +09:00
smoogipoo	fbc50d6030	Merge master into editor-clock	2018-04-12 13:35:53 +09:00
Dan Balasescu	9e2494c57b	Merge branch 'master' into high-level-xmldoc	2018-04-12 12:59:37 +09:00
miterosan	4927abfde5	Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages	2018-04-11 20:54:08 +02:00
miterosan	a5e0311253	Trim whitespaces	2018-04-11 20:53:35 +02:00
miterosan	6e81fda40e	Merge branch 'master' into Private_Messages	2018-04-11 20:48:06 +02:00
miterosan	499ecd3843	Fix the warnings	2018-04-11 20:44:35 +02:00
miterosan	c2020742b2	Actually use the fact that ChannelManager is now a component	2018-04-11 20:37:51 +02:00
miterosan	2056258def	Fix code sanity	2018-04-11 20:31:16 +02:00
miterosan	697b551f3e	Fix Selected tab beeing choosen multiple times	2018-04-11 20:27:33 +02:00
miterosan	3860594f40	Rename everything into channel and remove everything chat	2018-04-11 20:01:57 +02:00
miterosan	39ecc3d31d	Add Test Case, improve displaying the avatar, use a chatTabControl instead of putting both in ChatOverlay, readd shadow. ... Requires osu-framework for a fix	2018-04-11 18:23:09 +02:00
Dean Herbert	903dd7a015	Fix regression causing hard crash ... Regressed in #2373. My bad.	2018-04-11 19:24:19 +09:00
miterosan	85f736ae89	Allow opening a new chat with right click on User ... Allow faster viewing of the usertab using lasy loading	2018-04-09 23:14:39 +02:00
miterosan	762b4412e5	Convert if to switch	2018-04-09 22:29:48 +02:00
miterosan	5512d58c1d	Remove the sealed modifier	2018-04-09 21:06:05 +02:00
smoogipoo	b97c4e8b44	Fix all possible cases of crossthread import data races	2018-04-09 12:45:44 +09:00
miterosan	aa26ea483d	remove using, remove empty agrument list	2018-04-08 22:43:01 +02:00
miterosan	2a314f052a	Trim more whitespace	2018-04-08 22:28:50 +02:00
miterosan	0a207e00d5	Trim whilespace	2018-04-08 22:24:55 +02:00
miterosan	4b7ffd09d9	Trim whitespace	2018-04-08 22:18:29 +02:00
miterosan	a48ccb5603	Implement Private chat	2018-04-08 22:12:57 +02:00
miterosan	a70b329155	Split drawing and business logic of ChatOverlay	2018-04-08 18:21:48 +02:00
miterosan	525e50e8dd	Merge remote-tracking branch 'origin/master' into Private_Messages	2018-04-08 15:23:09 +02:00