4313 Commits

Author	SHA1	Message	Date
Andrei Zavatski	e22a71c6b8	Add visual difference between hovered and selected states	2019-11-21 19:42:07 +03:00
Andrei Zavatski	23fc7b1987	Implement updateHighlighted method	2019-11-21 19:02:24 +03:00
Andrei Zavatski	984ec11a78	Make Ruleset a bindable	2019-11-21 18:56:48 +03:00
Andrei Zavatski	737c2bd1c8	Remove pointless const	2019-11-21 18:50:29 +03:00
Andrei Zavatski	458496206c	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-21 18:49:37 +03:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Dean Herbert	0d4854ac09	Add News Overlay skeleton and header (#5726) ... Add News Overlay skeleton and header Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-22 00:14:31 +09:00
Dean Herbert	1a6b5e8714	Implement TotalCommentsCounter component for CommentsContainer (#6867) ... Implement TotalCommentsCounter component for CommentsContainer	2019-11-21 23:45:23 +09:00
Dean Herbert	76722534ec	Fix cancel button animating when entering a dialog (#6825) ... Fix cancel button animating when entering a dialog Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-21 23:22:17 +09:00
Dean Herbert	f173961def	Add some extra search keywords to settings (#6893) ... Add some extra search keywords to settings Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-21 22:51:20 +09:00
Dean Herbert	d7cb23a909	Remove redundant keyword	2019-11-21 22:51:00 +09:00
Dean Herbert	8b1fb2d5a1	Standardise keyword specifications	2019-11-21 22:35:15 +09:00
Andrei Zavatski	f066d8434c	Apply suggestions	2019-11-21 00:26:39 +03:00
Andrei Zavatski	6b3010535f	Simplify Keywords usage for SettingsSubsection	2019-11-20 21:03:31 +03:00
Andrei Zavatski	f3d9abc84a	Capitalize Bar for consistency	2019-11-20 19:57:02 +03:00
Andrei Zavatski	7d8252183e	CI fix	2019-11-20 19:42:57 +03:00
Andrei Zavatski	e820ddd3e8	Implement settings keywords	2019-11-20 19:27:34 +03:00
Berkan Diler	6cab517b2d	.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.	2019-11-20 13:37:47 +01:00
Huo Yaoyuan	374ef6ff83	Merge branch 'master' into sharpen	2019-11-20 17:30:58 +08:00
Huo Yaoyuan	b1b234c6fb	Use paramref.	2019-11-17 20:49:36 +08:00
Andrei Zavatski	509440ea14	TotalCommentsCounter implementation	2019-11-16 18:02:34 +03:00
Andrei Zavatski	f2862e95e0	CI fix	2019-11-15 12:15:51 +03:00
Andrei Zavatski	e51fd00d58	CI fix	2019-11-15 12:09:31 +03:00
Andrei Zavatski	18f77008db	Update dependency	2019-11-15 12:04:01 +03:00
Andrei Zavatski	9fd225bda7	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new	2019-11-15 11:58:05 +03:00
Andrei Zavatski	2592a0489b	Use existing ModNoMod	2019-11-15 11:57:40 +03:00
Andrei Zavatski	1218d41b50	Make Ruleset a property	2019-11-15 11:52:49 +03:00
Andrei Zavatski	b7efc276f1	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-15 11:42:32 +03:00
Dean Herbert	813aebca1d	Remove unintentional dependency	2019-11-15 14:51:01 +09:00
Dean Herbert	6d06b444ba	Allow screen to specify whether to apply audio rate adjustments from mods	2019-11-15 13:47:14 +09:00
Dan Balasescu	cd9902cc9f	Merge branch 'master' into commit-on-focus-lost	2019-11-15 08:58:59 +09:00
Huo Yaoyuan	0998afdbdb	Use ReferenceEquals instead of SequenceEqual.	2019-11-14 19:38:08 +08:00
Dean Herbert	bf567e6df5	Make settings textboxes commit on focus lost	2019-11-14 14:19:55 +09:00
Andrei Zavatski	2d3fadc1a8	Don't update mod filter visibility on every beatmap change	2019-11-14 00:38:37 +03:00
Andrei Zavatski	633c497602	Hide content if beatmap has no leaderboard	2019-11-13 17:36:08 +03:00
Huo Yaoyuan	87d40cf8d0	Resolve equals usages.	2019-11-13 22:35:50 +08:00
Andrei Zavatski	d1853ea55b	Fix incorrect formatting for switch/case	2019-11-13 17:29:50 +03:00
Andrei Zavatski	8005ee73af	Trim whitespace	2019-11-13 17:23:46 +03:00
Andrei Zavatski	3f6140db6d	Improve loading animation	2019-11-13 17:18:58 +03:00
Andrei Zavatski	4e90daf212	Implement NoScoresPlaceholder	2019-11-13 16:39:33 +03:00
Andrei Zavatski	2dbee5da79	Update dependency	2019-11-13 16:06:37 +03:00
Andrei Zavatski	6715b25ddd	Apply suggestions	2019-11-13 16:04:15 +03:00
Dean Herbert	f11ad7535d	Merge branch 'master' into rankings-tables	2019-11-13 15:39:13 +09:00
Dean Herbert	230de261c8	Merge branch 'master' into fix-popup-dialog-button	2019-11-13 15:39:08 +09:00
Dean Herbert	0292cea2c4	Merge branch 'master' into beatmap-mod-selector	2019-11-13 15:39:08 +09:00
Dean Herbert	367d12aef9	Merge branch 'master' into beatmap-overlay-mod-selector-new	2019-11-13 15:39:06 +09:00
Dean Herbert	ce60f8262c	Merge branch 'master' into sharpen	2019-11-13 15:38:59 +09:00
Dean Herbert	c751328665	Disable button when not logged in	2019-11-13 12:13:33 +09:00
Andrei Zavatski	5f609b48da	Use local bindable for api.LocalUser	2019-11-13 00:29:28 +03:00
Andrei Zavatski	99ec84ed38	Update dependency	2019-11-13 00:26:19 +03:00
Andrei Zavatski	2719be7769	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new	2019-11-13 00:24:40 +03:00
Andrei Zavatski	27f721eec2	Use = instead of += for OnSelectionChanged Action	2019-11-13 00:24:13 +03:00
Andrei Zavatski	3903e59f2f	Add null check for notification overlay	2019-11-13 00:01:13 +03:00
Andrei Zavatski	dfd5c88075	Typo fix	2019-11-13 00:00:08 +03:00
Ganendra Afrasya	8276428efc	Add IsPresent check when dialog popping out	2019-11-12 20:48:26 +07:00
Dean Herbert	da819261e0	Shrink and darken loading layer to better suit button	2019-11-12 21:38:16 +09:00
Dean Herbert	5110ae82a1	Tidy up implementation	2019-11-12 21:38:08 +09:00
Huo Yaoyuan	42a98c5d87	Use constants.	2019-11-12 20:07:01 +08:00
Huo Yaoyuan	ca52d09e81	Enforce expression body for typical simple ones.	2019-11-12 19:56:37 +08:00
Huo Yaoyuan	e5e8e70704	Use pattern matching.	2019-11-12 19:55:19 +08:00
Huo Yaoyuan	bbeab6fa76	Use auto property.	2019-11-12 19:53:25 +08:00
Dean Herbert	58df6930b2	Get error message from server	2019-11-12 19:34:20 +09:00
Dean Herbert	f04d7f733f	Merge remote-tracking branch 'upstream/master' into favourite-beatmap	2019-11-12 19:19:29 +09:00
Dean Herbert	a83c3523ae	Merge branch 'master' into rankings-tables	2019-11-12 18:59:43 +09:00
Andrei Zavatski	a69a4643c9	Simplify LINQ expressions	2019-11-12 08:45:21 +03:00
Andrei Zavatski	fa01e11a6e	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-12 08:25:42 +03:00
Dean Herbert	4516da223d	Merge branch 'master' into fix-mod-section-overflow	2019-11-12 11:35:01 +09:00
Andrei Zavatski	0578f91a76	Small logic adjustments	2019-11-11 19:06:46 +03:00
Andrei Zavatski	32cc7b3d4d	CI fix	2019-11-11 19:04:50 +03:00
Andrei Zavatski	c5b64e26a3	Layout adjustment	2019-11-11 18:51:29 +03:00
Andrei Zavatski	5f5d130d1a	Update mod filter visibility on user change	2019-11-11 18:40:57 +03:00
Andrei Zavatski	31191dadf1	Handle mods change	2019-11-11 18:31:42 +03:00
Andrei Zavatski	2cfd54ca0d	Handle scope changing	2019-11-11 18:27:48 +03:00
Andrei Zavatski	00b9229737	Add mod filter to beatmap overlay	2019-11-11 18:21:07 +03:00
Andrei Zavatski	32b2f5e330	Use Bindable for ScoresContainer	2019-11-11 18:10:25 +03:00
Andrei Zavatski	3655f88180	Merge dependency	2019-11-11 17:56:57 +03:00
Andrei Zavatski	4145e25f7b	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-11 17:55:10 +03:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
Dean Herbert	9db73d33cc	Remove horizontal padding on toolbar ruleset selector (#6780) ... Remove horizontal padding on toolbar ruleset selector	2019-11-11 10:02:30 +09:00
Andrei Zavatski	93954c8da0	Use BindableList for selected mods	2019-11-10 23:58:07 +03:00
Andrei Zavatski	e3d8e29cdd	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector	2019-11-10 23:38:41 +03:00
Dean Herbert	5c47641608	Reorder conditional	2019-11-09 16:23:22 +09:00
Joehu	b675024161	Remove horizontal padding on toolbar ruleset selector	2019-11-08 20:28:24 -08:00
Bartłomiej Dach	70feab8316	Merge branch 'master' into prev-button-revamp	2019-11-06 22:41:33 +01:00
Andrei Zavatski	423e26a4d1	Fix header text could be sticked together	2019-11-06 13:07:25 +03:00
Andrei Zavatski	0f53725005	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables	2019-11-06 13:03:34 +03:00
Andrei Zavatski	4330507da8	Use api.IsLoggedIn	2019-11-06 12:46:25 +03:00
Andrei Zavatski	1f3b209a6c	Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix	2019-11-06 12:26:41 +03:00
Dean Herbert	09e9ef0e4b	Add background colour to music player ProgressBar (#6741) ... Add background colour to music player ProgressBar	2019-11-06 17:44:08 +09:00
Ganendra Afrasya	02c21a1379	Make progress bar hoverable	2019-11-06 14:11:47 +07:00
Ganendra Afrasya	d985d04857	Add background colour to music player ProgressBar	2019-11-06 14:07:34 +07:00
smoogipoo	0b09fb293e	Fix background being coloured	2019-11-06 15:16:00 +09:00
Dean Herbert	a3d8738cab	Merge branch 'master' into vote-pill-fix	2019-11-06 14:52:06 +09:00
Dean Herbert	4ce3450cfc	Move button implementation to OsuButton	2019-11-06 14:08:52 +09:00
Dean Herbert	44d0791676	Update button usage	2019-11-05 16:26:31 +09:00
unknown	a92b32f6dc	add basic tests	2019-11-05 00:56:09 +08:00
unknown	1216d66a4c	Merge remote-tracking branch 'origin/customized-mods' into customized-mods	2019-11-04 23:21:45 +08:00
Joehu	fe23b9a262	Fix mod section overflowing mod select overlay at higher ui scale	2019-11-03 07:32:47 -08:00
Andrei Zavatski	48385dbdfe	Layout adjustments	2019-11-03 14:31:23 +03:00
Dean Herbert	5127b52c25	Merge remote-tracking branch 'upstream/master' into game-handles-links	2019-11-03 13:04:18 +09:00
Andrei Zavatski	1e73cf1025	Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables	2019-11-01 21:14:09 +03:00
Dean Herbert	898520935e	Move link handling code to OsuGame ... This allows for future calls from arguments / associations	2019-11-01 11:40:51 +09:00
Dan Balasescu	54681a6206	Merge branch 'master' into catch-api-request-exceptions	2019-11-01 11:33:23 +09:00
Dean Herbert	ce19b2ed36	Avoid using CreateChildDependencies with a *child* bindable ... Don't do this.	2019-10-31 17:16:26 +09:00
Dean Herbert	3e3ff81229	Reorder methods	2019-10-31 17:13:00 +09:00
Dean Herbert	4f04abf282	Fix tabs to match design (should not show pinhair line)	2019-10-31 16:54:28 +09:00
Dean Herbert	5d47a2e557	Merge branch 'master' into add-beatmap-ruleset-selector	2019-10-31 16:42:32 +09:00
Dean Herbert	bf45fa6309	Use lambda function expression	2019-10-31 16:24:03 +09:00
Dean Herbert	f8187fa301	Don't rely on masking for bar display	2019-10-31 16:23:10 +09:00
Dean Herbert	923041c3f9	Merge branch 'master' into beatmap-overlay-ruleset-selector	2019-10-31 15:15:52 +09:00
Dean Herbert	0cd912fcd3	Cover all non-APIAccess APIRequest calls with exception handling	2019-10-31 15:04:13 +09:00
Andrei Zavatski	4730453083	Apply suggestions	2019-10-31 02:10:00 +03:00
Andrei Zavatski	d90545227c	Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix	2019-10-30 23:49:56 +03:00
Dan Balasescu	4322933470	Merge branch 'master' into signin-ux-improvement	2019-10-30 12:10:52 +09:00
Andrei Zavatski	8ad5ccda68	Test steps rearrangement and condition fix	2019-10-30 04:16:14 +03:00
Andrei Zavatski	2c31492bbe	Fix comment can be voted if user is null	2019-10-30 03:27:06 +03:00
Andrei Zavatski	1502a6c631	Cleanups	2019-10-30 03:09:14 +03:00
Andrei Zavatski	092d16bb64	Dont use binding to set disabled value	2019-10-29 23:43:16 +03:00
Andrei Zavatski	30d9b21b86	Condition simplification	2019-10-29 21:57:20 +03:00
Andrei Zavatski	e287dae64b	Fix VotePill can be activated by the comment sender	2019-10-29 21:25:48 +03:00
Ganendra Afrasya	5c2917d303	Place sign in button inside ShakeContainer	2019-10-30 00:50:04 +07:00
Dean Herbert	54befb6f8f	Remove adjacent day separators	2019-10-29 15:45:41 +09:00
Dean Herbert	b06e70e546	Add failing test showing issue with day separator logic	2019-10-29 15:27:08 +09:00
Dean Herbert	09a6d1184a	Tidy up order of scroll changes	2019-10-29 14:33:05 +09:00
Dean Herbert	d1c6e3f620	Add test for scroll to end when max history is exceeded	2019-10-29 14:32:52 +09:00
Andrei Zavatski	85769982a0	Refactor LoadingButton	2019-10-24 17:49:34 +03:00
Dean Herbert	967551fec0	Renames and xmldoc	2019-10-24 13:10:17 +09:00
Ganendra Afrasya	d22e12d104	Update doc	2019-10-24 10:28:23 +07:00
Ganendra Afrasya	c6d4fc8b24	Apply review	2019-10-24 08:00:45 +07:00
Ganendra Afrasya	224a887773	Merge remote-tracking branch 'origin/master' into prev-button-revamp	2019-10-24 07:44:18 +07:00
Andrei Zavatski	b310fd9d44	Adjust naming inside the LoadingButton	2019-10-23 13:39:42 +03:00
Dean Herbert	40c202c394	Merge branch 'master' into comments-vote-pill	2019-10-23 15:41:54 +09:00
smoogipoo	851773a842	Apply adjustments for framework changes	2019-10-23 14:04:06 +09:00
Joehu	7b7a87afa8	Put back mobile conditional	2019-10-22 19:51:29 -07:00
Joehu	8154cc1b16	Fix registration textboxes always focusing after pressing escape	2019-10-22 14:40:56 -07:00
Dean Herbert	e9aa7f3218	Subclass and use yellow for stand-alone chat display	2019-10-23 00:24:19 +09:00
Dean Herbert	3b4823abe7	Use foreach	2019-10-23 00:17:37 +09:00
Dean Herbert	0ba287a7fd	Rename variable	2019-10-23 00:14:22 +09:00
Dean Herbert	7084aa7b81	Merge branch 'master' into chat-day-separator	2019-10-22 15:48:42 +09:00
Dean Herbert	001eae2c02	Merge remote-tracking branch 'upstream/master' into make-most-textbox-carets-movable	2019-10-22 15:04:16 +09:00
Andrei Zavatski	09b2f11bd5	Remove unused variable	2019-10-22 03:14:20 +03:00
Andrei Zavatski	b1eac6b400	Apply suggested changes	2019-10-22 03:11:19 +03:00
Andrei Zavatski	e9ae838f46	CI fixes	2019-10-22 02:16:52 +03:00
Joehu	f7924d3bad	Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox"	2019-10-21 16:00:09 -07:00
Andrei Zavatski	2896ed90e2	Fix incorrect date comparison	2019-10-22 01:55:26 +03:00
Andrei Zavatski	bb7af1e39c	Fix some margin/padding issues	2019-10-22 01:45:04 +03:00
Andrei Zavatski	d19041fa53	Implement DaySeparator class	2019-10-22 01:30:37 +03:00
Andrei Zavatski	75f444e431	Basic implementation	2019-10-22 00:44:58 +03:00
Salman Ahmed	eed6f708a2	Merge branch 'master' into beatmap-overlay-ruleset-selector	2019-10-19 04:06:43 +03:00
Andrei Zavatski	266f9a065f	Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill	2019-10-18 19:25:05 +03:00
Dean Herbert	6b0976ff1e	Remove a weird unicode charcter from file	2019-10-18 16:55:42 +09:00
Andrei Zavatski	9daafb4636	Simplify hover/unhover logic	2019-10-18 03:06:01 +03:00
Joehu	e5b50b5e1f	Fix slider bar regression when using arrows	2019-10-17 13:54:36 -07:00
Andrei Zavatski	22511e41e2	Use received data to set isVoted bindable	2019-10-17 23:20:01 +03:00
Andrei Zavatski	9ee63a8c1a	Apply suggested changes	2019-10-17 16:28:32 +03:00
Andrei Zavatski	a858e713f8	Fix multiple spaces	2019-10-17 15:40:09 +03:00
Andrei Zavatski	6b196a6ce7	CI fixes	2019-10-17 15:24:51 +03:00
Andrei Zavatski	42cd4107a0	Implement CommentVoteRequest and adjust UI	2019-10-17 15:04:30 +03:00
Andrei Zavatski	a437ff74cc	Move VotePill to it's own file	2019-10-17 14:18:31 +03:00
Andrei Zavatski	1f28c00594	UI implementation	2019-10-17 13:10:28 +03:00
Andrei Zavatski	38dcd42d08	Parse voted comments	2019-10-17 12:35:12 +03:00
Ganendra Afrasya	326abc1a55	Apply reviews	2019-10-16 20:11:25 +07:00
Andrei Zavatski	2dac3a6efe	Handle hitting the maximum allowed number of favourited beatmaps	2019-10-16 13:58:29 +03:00
Dean Herbert	4f356f3aeb	Merge branch 'master' into favourite-beatmap	2019-10-16 18:22:09 +09:00
iiSaLMaN	60133ba0c3	Propagate BeatmapSetInfo to tab items with bindable	2019-10-15 23:33:50 +03:00
Andrei Zavatski	2543de22bd	Simplify DeletedChildrenPlaceholder behavior	2019-10-15 12:47:35 +03:00
Andrei Zavatski	7ba15df0c0	Convert to method group	2019-10-15 12:27:32 +03:00
Andrei Zavatski	d321794ef5	Make loadedTopLevelComments a local filed	2019-10-15 12:26:16 +03:00
Andrei Zavatski	96e31b9cca	Add support for deleted comments with message	2019-10-15 12:07:01 +03:00
Andrei Zavatski	213f00556d	Remove onShowDeletedChanged function	2019-10-15 11:30:50 +03:00
Andrei Zavatski	b2885e7b13	Move load() under the ctor	2019-10-15 11:26:58 +03:00
Andrei Zavatski	eb5dad08aa	Remove initial filed	2019-10-15 11:25:58 +03:00
Andrei Zavatski	3c714dc013	APICommentsController -> CommentBundle	2019-10-15 11:20:06 +03:00
Andrei Zavatski	75a2e383f2	Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api	2019-10-15 11:19:45 +03:00
Joehu	efc201ec85	Make PlaylistOverlay a VisibilityContainer	2019-10-14 16:40:53 -07:00
Joehu	ccc753a315	Make OverlayContainers with no blocking input VisibilityContainers	2019-10-14 16:27:59 -07:00
Andrei Zavatski	ad32d66365	CI fix	2019-10-15 01:10:23 +03:00
Andrei Zavatski	0fd6b0c852	Use linq expression to count deleted comments	2019-10-15 00:55:33 +03:00
Andrei Zavatski	b84c9dfd84	Use Humanizer.ToQuantity instead of manual parsing	2019-10-15 00:35:44 +03:00
Andrei Zavatski	09621f066e	Childs -> Children	2019-10-15 00:32:21 +03:00
Andrei Zavatski	d4843285db	CI fixes	2019-10-14 17:33:14 +03:00
Andrei Zavatski	139170cdc8	Fix incorrect padding for nested comments	2019-10-14 17:26:12 +03:00
Andrei Zavatski	b53fb0d228	Remove empty line	2019-10-14 17:07:50 +03:00
Andrei Zavatski	a81d5cd819	Handle links in message	2019-10-14 16:56:07 +03:00
Andrei Zavatski	7cd3f5656d	Cleanups	2019-10-14 16:43:43 +03:00
Andrei Zavatski	7ac87494e0	Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api	2019-10-14 16:21:34 +03:00
Dean Herbert	f0e9700349	Inline delegate event	2019-10-14 21:49:02 +09:00
Dean Herbert	b7ddf160b4	OnClick should actually handle the event	2019-10-14 21:48:12 +09:00
Dean Herbert	4e6ab1dad3	Tidy up state management via bindable usage	2019-10-14 21:42:07 +09:00
Dean Herbert	7794457550	Remove more constants	2019-10-14 21:36:10 +09:00
Dean Herbert	4822496c13	Fix more naming	2019-10-14 21:34:16 +09:00
Dean Herbert	89f270a19a	SortSelector -> SortTabControl	2019-10-14 21:32:41 +09:00
Dean Herbert	e191c2c50e	Tidy up constants and method naming	2019-10-14 21:32:16 +09:00
Andrei Zavatski	328b4d6863	Cancel request on dispose	2019-10-13 16:22:10 +03:00
Andrei Zavatski	a44cc2e70b	Implement CommentsShowMoreButton	2019-10-13 14:43:30 +03:00
Andrei Zavatski	60954f969d	DeletedChildsPlaceholder refactor	2019-10-13 12:38:50 +03:00
Andrei Zavatski	795ce81468	Use async loading for comment pages	2019-10-13 12:10:01 +03:00
Andrei Zavatski	4d971e49ff	Colours update	2019-10-13 11:50:27 +03:00
Andrei Zavatski	27e3ffd293	Update dependencies	2019-10-13 11:23:49 +03:00
Andrei Zavatski	7f867562ca	Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api	2019-10-13 11:15:43 +03:00