794 Commits

Author	SHA1	Message	Date
Andrei Zavatski	cf2a9db8e0	Implement basic layout for kudosu history	2019-08-09 11:14:38 +03:00
Andrei Zavatski	749a00cc2f	Force bindable change	2019-08-05 12:49:54 +03:00
Andrei Zavatski	c591cb83eb	Merge remote-tracking branch 'refs/remotes/ppy/master' into move-graph-data-to-statistics	2019-08-05 12:45:29 +03:00
Dan Balasescu	b9c406f3b2	Merge branch 'master' into profile-ruleset-selector-improvements	2019-08-05 13:31:23 +09:00
smoogipoo	d839717131	Remove unnecessary intermediate method	2019-08-05 13:18:29 +09:00
Andrei Zavatski	d693a54c84	Move RankHistoryData to User Statistics	2019-08-04 14:35:26 +03:00
Andrei Zavatski	3ae5428dad	ProfileRulesetSelector improvements	2019-08-04 14:15:16 +03:00
Andrei Zavatski	c8acbdb1d9	Update the colour	2019-08-04 06:15:15 +03:00
Andrei Zavatski	416f9d89db	CI fixes	2019-08-03 05:49:01 +03:00
Andrei Zavatski	37be4fbf16	Use GridContainer for layout	2019-08-03 05:34:14 +03:00
Andrei Zavatski	de96e5dfc6	Apply suggested changes	2019-08-02 07:41:11 +03:00
Andrei Zavatski	5547592768	CI fixes	2019-08-01 23:04:18 +03:00
Andrei Zavatski	e66a3494b9	make the container hidden by default	2019-08-01 22:50:01 +03:00
Andrei Zavatski	13fe1732d8	adjust height values to avoid random jumps	2019-08-01 21:32:04 +03:00
Andrei Zavatski	90c59ab39d	implement PreviousUsernamesContainer	2019-08-01 21:26:59 +03:00
Andrei Zavatski	0f36088ef8	Add loved section	2019-08-01 11:06:29 +03:00
Dean Herbert	ddb98c705a	Merge branch 'master' into update-follower-count	2019-07-28 12:53:40 +09:00
Andrei Zavatski	ee6fed5b33	Use fixed height	2019-07-22 18:17:49 +03:00
Dean Herbert	2f111e6cf4	Fix incorrect corner radius	2019-07-22 23:57:26 +09:00
Dean Herbert	4dc9309a7e	Merge branch 'master' into underscored_link	2019-07-22 23:46:57 +09:00
smoogipoo	066bee3535	Simplify offset calculation	2019-07-19 16:02:33 +09:00
smoogipoo	f87e9b8017	Remove unnecessary tooltip text	2019-07-18 20:17:19 +09:00
smoogipoo	ca72409dc2	More closely match osu-web styling	2019-07-18 20:16:10 +09:00
Dean Herbert	f175f597e7	Update follower count API source	2019-07-18 14:05:57 +09:00
Andrei Zavatski	9458bca58f	Update usage of requests	2019-07-15 13:37:25 +03:00
Andrei Zavatski	d62e42ba14	Remove custom link container implementation	2019-07-15 13:09:21 +03:00
Andrei Zavatski	b93b26a036	Fix link formatting	2019-07-14 19:38:46 +03:00
Andrei Zavatski	c8192d6f3a	Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link	2019-07-14 19:10:47 +03:00
Dean Herbert	19e8198bff	Merge branch 'master' into flow_container_insert	2019-07-11 22:53:57 +09:00
Joehu	a1fb41ea66	Use FillFlowContainer on flag and country	2019-07-02 10:53:52 -07:00
Joehu	d387629e53	Fix layout of profile top header to match web	2019-07-02 10:52:24 -07:00
Roman Kapustin	0c95dff3d6	Make FlowContainer insertion cleaner	2019-07-01 18:41:08 +03:00
Dean Herbert	d6c28dc6d7	Simplify and fix state management	2019-06-27 15:31:47 +09:00
Dean Herbert	25499f74a7	Remove redundant font set	2019-06-27 15:31:36 +09:00
smoogipoo	b397652af4	Remove ability to set arbitrary accent colours	2019-06-27 15:02:26 +09:00
smoogipoo	7f5587d894	RulesetTabItem -> ProfileRulesetTabItem	2019-06-27 14:54:31 +09:00
smoogipoo	803198ff20	Gamemode -> Ruleset	2019-06-27 14:53:18 +09:00
Andrei Zavatski	2e49b4ffcd	Update the component with an abstract RulesetSelector class	2019-06-26 18:56:40 +03:00
Dean Herbert	6a541d9a10	Merge branch 'master' into user_profile_modes	2019-06-25 00:59:51 +09:00
smoogipoo	5272b3a929	Use .Darken() instead of hex-based colour	2019-06-24 13:27:58 +09:00
Andrei Zavatski	8430ac6d1c	remove unused using	2019-06-23 19:19:36 +03:00
Andrei Zavatski	1c20df780a	Adjust triangles colour	2019-06-23 17:08:18 +03:00
Andrei Zavatski	4963d4e8df	CI fixes	2019-06-22 03:08:18 +03:00
Andrei Zavatski	3723ea05de	Adjust Title style	2019-06-22 02:52:07 +03:00
Andrei Zavatski	4cd3b15f6e	Add triangles	2019-06-22 02:40:33 +03:00
Andrei Zavatski	dbf53e9bda	Use correct background colour for sections	2019-06-22 02:06:30 +03:00
Dean Herbert	540b61da0a	Add some spacing between user profile ranks	2019-06-21 15:27:19 +09:00
Dan Balasescu	c79c4641f3	Merge branch 'master' into use-modelbackeddrawable	2019-06-21 14:26:07 +09:00
KingLuigi4932	5f5441c692	Add ShowPlaceholderOnNull in updateable flag + do not show placeholders in some overlays	2019-06-19 20:17:02 +03:00
Andrei Zavatski	2fb1052a1e	Add missing space	2019-06-18 21:04:36 +03:00
Andrei Zavatski	03d560ed41	Initial implementation	2019-06-18 19:13:21 +03:00
KingLuigi4932	d665f1fe4b	Seperate drawable and updateable flag from Country + Use UpdateableFlag	2019-06-17 20:57:57 +03:00
KingLuigi4932	794ba17a2f	Seperate UpdateableRank from DrawableRank and use it	2019-06-17 20:04:09 +03:00
EVAST9919	ea492772cf	Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes	2019-06-08 11:31:28 +03:00
Dean Herbert	2531250f89	Fix paginated layouts only showing one column even if enough space is available for more	2019-06-07 14:58:04 +09:00
EVAST9919	923f9fb6cd	Naming adjustments	2019-06-07 01:43:26 +03:00
EVAST9919	e9403bf2f7	Move GamemodeControl to UserProfileOverlay	2019-06-04 19:33:55 +03:00
EVAST9919	8260b61db5	Fix CI issues	2019-06-04 19:02:09 +03:00
EVAST9919	0c48aec265	Split SetDefaultGamemode into two functions	2019-06-04 18:37:31 +03:00
EVAST9919	d0d846469a	Move GamemodeTabItem to a distinct class	2019-06-04 18:14:03 +03:00
EVAST9919	367fdcf519	Make GamemodeControl depend on rulesets	2019-06-04 18:07:52 +03:00
EVAST9919	a0f7f69f46	retrieve user's default playmode	2019-06-04 17:51:56 +03:00
EVAST9919	0abb48882c	Implement GamemodeControl	2019-06-04 16:22:54 +03:00
Dean Herbert	e8315085c0	Better handle OnClick	2019-06-04 10:26:21 +09:00
EVAST9919	d5a2ebf79f	Fix endless loading state part 2	2019-06-04 04:04:33 +03:00
EVAST9919	2c71371282	Fix endless loading state	2019-06-04 02:06:15 +03:00
EVAST9919	fe6b4112c6	Adjust colors to match web design	2019-06-04 01:47:45 +03:00
Dean Herbert	633c3b74ec	Don't handle clicks when in a loading state	2019-06-03 17:10:33 +09:00
Dean Herbert	c4f4f32db8	Shorten fade duration	2019-06-03 17:10:33 +09:00
EVAST9919	b32ffab580	Make the DrawableMostPlayedBeatmap inherit OsuHoverContainer	2019-05-31 02:19:09 +03:00
EVAST9919	e715cc8f6e	Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link	2019-05-30 23:29:11 +03:00
EVAST9919	fe9e53e383	Add a testcase	2019-05-30 23:07:04 +03:00
EVAST9919	2933169614	Move the button into a separate class	2019-05-30 22:55:59 +03:00
EVAST9919	73fb28f9f7	Make the button inherit from OsuHoverContainer	2019-05-30 22:48:27 +03:00
EVAST9919	877fe97107	Merge remote-tracking branch 'refs/remotes/ppy/master' into more_button_update	2019-05-30 22:17:22 +03:00
Dean Herbert	c950f37497	Ad missing link	2019-05-30 16:57:54 +09:00
Dean Herbert	e5999dd9b1	Update font sizes to match web	2019-05-30 16:49:18 +09:00
EVAST9919	9a13c52ffd	Add missing lines	2019-05-29 21:19:03 +03:00
EVAST9919	97dbc95bc6	Kudosu section update	2019-05-29 21:02:20 +03:00
EVAST9919	1baf922f2c	CI fixes	2019-05-29 20:36:14 +03:00
EVAST9919	6efa61b992	Split UnderscoredLinkContainer in different classes	2019-05-29 20:24:01 +03:00
EVAST9919	52fad723a2	Implement DrawableMostPlayedBeatmap	2019-05-29 19:51:59 +03:00
EVAST9919	8bcb4485ed	implement UnderscoredLinkContainer	2019-05-29 19:00:20 +03:00
EVAST9919	5169e31d54	Fix CI issues	2019-05-28 19:53:00 +03:00
EVAST9919	19fbab6892	Applied suggested changes	2019-05-28 19:39:31 +03:00
EVAST9919	857eb9b83a	Fix CI stuff	2019-05-28 17:21:34 +03:00
EVAST9919	6ca3bd086f	ShowMore button update	2019-05-28 17:04:05 +03:00
EVAST9919	69ada11f41	use constant value	2019-05-24 20:01:47 +03:00
EVAST9919	cda97a61fa	Add a bit of smoothness to the rank graph	2019-05-24 19:43:53 +03:00
smoogipoo	e76d785c10	Move method above nested class	2019-05-21 16:05:59 +09:00
Dean Herbert	7169eb67d2	Merge branch 'master' into abstract-profile-header	2019-05-21 15:33:47 +09:00
Dan Balasescu	67ac76aae7	Merge branch 'master' into move-tooltip-text	2019-05-21 15:00:09 +09:00
Dean Herbert	aba945934d	Move OverlayHeaderTabControl to correct namespace	2019-05-21 13:58:12 +09:00
Dean Herbert	5a9c3ab9fa	Move UserProfileOverlay's header into an abstract implementation	2019-05-21 13:58:03 +09:00
Dean Herbert	247dad7e86	Use OsuColour for profile overlay	2019-05-21 13:54:19 +09:00
Dean Herbert	bc962bf8f0	Move TooltipText to OsuClickableContainer	2019-05-21 13:51:38 +09:00
smoogipoo	77263bd56e	Linkify more user links	2019-05-14 18:11:32 +09:00
Joehu	f14690e3b8	Swap profile play styles and last visit positions	2019-05-12 09:04:11 -07:00
smoogipoo	5128dc32e4	Remove unnecessary fillmode	2019-05-08 23:13:21 +09:00
smoogipoo	17a9f191cd	Fix incorrect texture name usage for some rank icons	2019-05-08 23:08:08 +09:00
smoogipoo	13b9b04bb8	Apply more cases/fix some existing ones	2019-05-07 13:23:09 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
Dean Herbert	0fa0271878	Add animation when collapsing or expanding the profile details section	2019-05-04 11:03:18 +09:00
Joehu	ac31a9640a	Add number sign to centre info rankings	2019-05-02 03:47:20 -07:00
Joehu	c6992bd6f9	Switch hidden/expanded centre profile header information	2019-05-02 03:37:15 -07:00
jorolf	b61807da40	Add number sign inside ToString ... Co-Authored-By: Joehuu <madamba.joehu@outlook.com>	2019-05-01 17:55:30 -07:00
Joehu	6b7397b9cf	Check for null instead of not null	2019-04-30 22:07:06 -07:00
Joehu	9b2d5727cd	Fix wrong check	2019-04-30 21:54:25 -07:00
Joehu	1408513ebd	Use similar check used on tooltip	2019-04-30 21:51:56 -07:00
Joehu	3cd6ccfc3d	Add number sign in front of profile rankings	2019-04-30 20:47:44 -07:00
Dean Herbert	f9f6e1f04a	Clamp values to avoid potentially weird element	2019-04-28 20:13:36 +09:00
Dean Herbert	8ab5149336	SupporterLevel -> SupportLevel	2019-04-28 20:11:36 +09:00
Dean Herbert	27ba89444e	Remove unnecessary using statements	2019-04-28 01:08:14 +09:00
Dean Herbert	fa340a9eff	Merge branch 'master' into profile-header-update	2019-04-27 23:48:23 +09:00
smoogipoo	50a775145c	Separate variables	2019-04-26 13:56:26 +09:00
smoogipoo	2f4bf423a4	Renamespace	2019-04-26 13:51:39 +09:00
smoogipoo	7047303b0f	Add tooltips to all buttons	2019-04-26 13:29:58 +09:00
smoogipoo	4adf590036	Combine hover/active state handling in tab control	2019-04-26 12:41:00 +09:00
smoogipoo	d5b91c6455	Cleanup top header container + user handling	2019-04-26 12:32:15 +09:00
smoogipoo	838325fed4	Remove HasTooltipContainer, use separate composites	2019-04-26 11:58:45 +09:00
smoogipoo	f8c5ee457b	Reduce tabcontrol spacing	2019-04-25 20:09:42 +09:00
smoogipoo	8329e53b6c	Remove extra space from header title	2019-04-25 20:08:14 +09:00
smoogipoo	2caea38f8c	Cleanup centre header container	2019-04-25 20:05:59 +09:00
smoogipoo	9d5b81165e	Adjust button stylings	2019-04-25 19:51:05 +09:00
smoogipoo	0eca9b9683	Center -> centre	2019-04-25 18:43:29 +09:00
smoogipoo	b33c0e9a93	Cleanup bottom header container	2019-04-25 18:42:19 +09:00
smoogipoo	1766ed8f9e	Fix warnings/remove obsolete usages	2019-04-25 18:05:46 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
jorolf	ba87136451	add gradient and fix remaining error	2019-04-04 00:57:15 +02:00
jorolf	ccc804a9b2	get everything working again	2019-04-04 00:24:42 +02:00
jorolf	5bc6042309	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-04-03 22:59:27 +02:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	392a0a1d74	Merge branch 'master' into update-framework	2019-03-18 11:34:59 +09:00
Dean Herbert	c496f6e56b	Fix usages of OnLoadComplete	2019-03-17 13:44:20 +09:00
Dean Herbert	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09:00
jorolf	2525f5bcb7	Apply most suggestions	2019-03-09 23:58:14 +01:00
smoogipoo	e3d463a141	Formatting fixes	2019-03-06 19:26:48 +09:00
smoogipoo	3c999d64d4	Fix post-merge errors	2019-03-06 16:09:21 +09:00
smoogipoo	ee1f9d4981	Merge remote-tracking branch 'origin/master' into profile-header-update ... # Conflicts: # osu-resources # osu.Game/Overlays/Profile/Components/GradeBadge.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/Header/RankGraph.cs # osu.Game/Overlays/Profile/Header/SupporterIcon.cs # osu.Game/Overlays/Profile/ProfileHeader.cs	2019-03-06 15:53:30 +09:00
Dan Balasescu	3a1066ff02	Merge branch 'master' into toquantity-1	2019-02-28 15:57:51 +09:00
Joehu	2241e1af9d	Use ToQuantity for words with number prefixes	2019-02-27 21:55:45 -08:00
Dean Herbert	99e2e6cf1c	Align text	2019-02-28 14:46:52 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
smoogipoo	8853f7ad76	Explicitly set exo typeface in a few places	2019-02-21 19:26:02 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
smoogipoo	dbfa95b9e7	Made medium the default font weight	2019-02-20 16:52:36 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
jorolf	648ed0e467	update license headers	2019-01-27 23:45:00 +01:00
jorolf	54d8e4043f	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-01-27 23:32:48 +01:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
jorolf	14d2ed7085	fix codefactor issue that I didn't notice and has been there for 12 days	2019-01-22 19:50:42 +01:00
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
jorolf	6ba7e2b670	split the profile header into several components	2019-01-11 01:12:19 +01:00
jorolf	a33a1458a5	update design and make play styles an enum	2019-01-04 22:52:00 +01:00
FreezyLemon	0047f29ec8	move missing newline to front of "Plays with..."	2018-12-30 22:40:17 +01:00
jorolf	e05fbd4136	address some comments and improve ui	2018-12-25 01:09:49 +01:00
jorolf	360c17e2c7	appease CodeFactor and AppVeyor	2018-12-22 22:50:19 +01:00
jorolf	da99161736	add some missing stuff	2018-12-22 22:34:39 +01:00
jorolf	2fe80d5568	Update ProfileHeader to the new design	2018-12-22 21:50:25 +01:00
jorolf	15ae0cd70a	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2018-12-22 16:54:39 +01:00
jorolf	b4fa2d9049	WIP	2018-12-22 16:51:24 +01:00
Dean Herbert	e3308010c0	Merge pull request #3898 from peppy/leaderboard-modularity ... Leaderboard modularity	2018-12-22 15:36:12 +09:00
smoogipoo	e657f13c15	Separate out Leaderboard into BeatmapLeaderboard	2018-12-22 14:44:36 +09:00
Dean Herbert	870d843fff	Fix username not displaying correctly in overlay	2018-12-22 14:40:55 +09:00
smoogipoo	f47ac35522	Add click to avatar	2018-12-22 14:23:53 +09:00
Dean Herbert	7e35afd178	Fix loading scores on profile pages potentially causing long blocking operations	2018-12-03 18:37:44 +09:00
Dean Herbert	059e9e180b	Apply review	2018-11-30 18:07:15 +09:00
Dean Herbert	3727955911	Refactors/renames	2018-11-30 16:35:45 +09:00
Dean Herbert	831cd3ed59	ScoreInfo scoreInfo -> ScoreInfo score	2018-11-30 15:18:52 +09:00
smoogipoo	219929eb47	Score -> ScoreInfo	2018-11-28 18:33:01 +09:00
smoogipoo	5b409a5ae5	Fix missed renames	2018-11-28 17:27:22 +09:00
smoogipoo	09b79d736b	Remove unused usings	2018-11-28 16:33:42 +09:00
smoogipoo	5fd6e6ca77	Re-namespacing	2018-11-28 16:12:57 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Paul Teng	7720fa10eb	Reduce height of RankChartLineGraph	2018-10-17 20:19:01 -04:00
Dean Herbert	716eee9a5c	Fix last visit not supporting null values ... Can now be null if a user chooses to hide their online status	2018-10-05 00:25:40 +09:00
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
smoogipoo	28f31540c4	Apply changes in-line with framework localisation changes	2018-09-19 14:07:46 +09:00
Dean Herbert	f149a66a4d	Use LargeTextureStore for all online texture retrieval ... Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885.	2018-09-09 02:45:37 +09:00
Dean Herbert	923acfbeaf	Fix some web requests being run after disposal of their owner	2018-09-05 10:26:54 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dan Balasescu	3d136ef0f9	Merge branch 'master' into fix-ugly-line	2018-07-13 18:08:55 +09:00
smoogipoo	bf1ce8cdd8	Fix linking still being broken	2018-07-10 16:02:13 +09:00
smoogipoo	0f649cd231	Merge remote-tracking branch 'origin/master' into fix-beatmap-links	2018-07-10 16:01:56 +09:00
Dean Herbert	7f315d79c2	Fix pixel gap in user profile when scrolling	2018-07-10 13:06:03 +09:00
HoutarouOreki	930667d0f9	Remove unused age display code	2018-07-09 10:12:10 +02:00
Dean Herbert	625b9ead4c	Fix links from profile top scores to beatmaps not working correctly	2018-07-05 21:00:23 +09:00
Dean Herbert	8ba2ac922f	Move to local components namespace	2018-06-28 19:23:56 +09:00
Dean Herbert	98fec94693	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates	2018-06-28 19:14:47 +09:00
Joehu	8518fce4a9	Fix osu!supporter naming	2018-06-27 17:57:55 -07:00
smoogipoo	ab2889da1f	Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays	2018-06-21 13:24:02 +09:00
Dean Herbert	d7f65d62e0	Use vertical/horizontal pair instead	2018-06-20 10:45:35 +09:00
Michael Manis	a0f1143287	Add padding to 'show more' button	2018-06-18 19:14:44 -04:00
HoutarouOreki	faff7feef1	Remove unnecessary white space change	2018-06-15 15:03:09 +02:00
HoutarouOreki	6938adc148	Unify join time text's visual format with the web	2018-06-15 15:00:41 +02:00
HoutarouOreki	d122547c1e	DrawableJoinDate handles "Here since the beginning" text	2018-06-15 14:28:49 +02:00
Dan Balasescu	126678c226	Merge branch 'master' into multiple_previews_different_overlays	2018-06-12 19:26:51 +09:00
Dan Balasescu	0a35a81c2d	Merge branch 'master' into populate-missing-online-ids	2018-06-12 13:11:21 +09:00
Dan Balasescu	7de8e1cfc4	Merge branch 'master' into refactor-api	2018-06-11 18:49:15 +09:00
Roman Kapustin	8702a70524	Resolve merge conflicts in DirectOverlay	2018-06-08 21:03:16 +03:00
Dean Herbert	a880e626d8	Use for loop and SetLayoutPosition	2018-06-08 21:20:15 +09:00
Dean Herbert	1e7bffe5e3	Merge branch 'master' into badge-ordering	2018-06-08 21:13:35 +09:00
Dean Herbert	955a78e76d	Remove OnlineBeatmapSetID from BeatmapInfo ... It should now be retrieved via the linked BeatmapSetInfo	2018-06-08 15:26:27 +09:00
Dean Herbert	8cc31aca54	Reorganise API requests and response classes ... They were previously breaking the two-class-per-file rule.	2018-06-08 11:42:35 +09:00
DrabWeb	bdfb5752cd	Update existing drawables to use UpdateableBeatmapSetCover.	2018-05-28 19:31:20 -03:00
HoutarouOreki	3efb51e464	Create Format(), override TooltipText..	2018-05-25 14:00:32 +02:00
HoutarouOreki	05b0564381	Create DrawableJoinDate somehow and remove dateFormat argument	2018-05-25 13:30:29 +02:00
HoutarouOreki	961702aadf	Apply the format fix to the tooltip text across the board	2018-05-25 13:05:41 +02:00
Dean Herbert	1cb7d50407	Add and use default size (smaller than before)	2018-05-25 18:51:57 +09:00
HoutarouOreki	10bc3917b5	Apply suggested changes	2018-05-23 11:17:13 +02:00
HoutarouOreki	8e9dde97ce	Better match join and last seen texts and tooltips with osu-web	2018-05-23 03:24:37 +02:00
jorolf	b324337fa1	Add icon next to beatmap title/username to open in browser	2018-05-22 15:29:52 +02:00
jorolf	a7bdaf75b0	Ensure badges are ordered correctly	2018-05-22 13:05:15 +02:00
TocoToucan	56c1c2beca	Remove redundant multiple previews handling from PaginatedBeatmapContainer	2018-04-29 15:50:02 +03:00
Dean Herbert	0b993561d8	Fix BadgeContainer being unsable to handle null badges ... This fixes a failing test (hidden becaues the test wasn't being run). - [ ] Merge osu-framework#1530 first.	2018-04-20 16:05:34 +09:00
Dean Herbert	a64ed142f0	Use a more suiting icon for discord for now	2018-04-20 13:51:30 +09:00
Dean Herbert	8649ddc68b	Make forum posts a web link	2018-04-20 13:01:23 +09:00
Dean Herbert	fe644c6909	Merge branch 'master' into profile_web_changes	2018-04-20 12:51:30 +09:00
tgi74000	64709da546	Update profile header to osu-web changes	2018-04-19 14:46:42 +02:00
Dean Herbert	1be2571d33	Make BeatmapSetOverlay accept nulls everywhere	2018-04-18 16:08:45 +09:00
Dean Herbert	a827fb51bc	Simplify child definition	2018-04-18 11:42:55 +09:00
jorolf	de9f15f620	add new test case and fix rotation not working	2018-04-16 19:22:11 +02:00
jorolf	046412f962	make hover lost transition instant (similar to hover transition)	2018-04-16 18:52:09 +02:00
jorolf	2a18b4c3f8	add a DRAWABLE_BADGE_SIZE const and center badges	2018-04-16 18:51:35 +02:00
jorolf	af0c49cca8	badge_size is the actual badge size now ... also fixes rotateBadges bug when hover is lost	2018-04-16 18:27:18 +02:00
jorolf	6ca714d93b	add badges to ProfileHeader	2018-04-15 23:49:45 +02:00
Dean Herbert	fd54ae3c87	Simplify logic	2018-04-15 16:12:42 +09:00
Dean Herbert	069d48ac14	Remove unused variable	2018-04-15 15:29:00 +09:00
TocoToucan	671de4f6c2	Resolve merge conflicts	2018-04-14 15:11:28 +03:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
TocoToucan	6a8f568f66	BeatmapContainer -> beatmapContainer	2018-04-11 16:32:58 +03:00
TocoToucan	6cdfaffcf7	PaginatedBeatmapContainer.BeganPlayingPreview	2018-04-11 16:19:21 +03:00
TocoToucan	640be621ac	Handle multiple song previews playing in different beatmap categories on profile	2018-04-07 13:29:46 +03:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	1d0a44a0bb	Merge branch 'master' into fix-login-failure	2018-03-12 12:41:45 +09:00
Dean Herbert	9233266fe1	Fix login failure for users with no country rank ... Closes #2148.	2018-03-11 00:44:16 +09:00
Dean Herbert	3b56999118	Add drawable to display (and update) relative dates	2018-03-08 12:58:16 +09:00
naoey	983cefbe40	Add VisualTest.	2018-03-07 19:08:26 +05:30
Dean Herbert	f78538fea8	Merge branch 'master' into user-profile-recent	2018-03-07 19:41:52 +09:00
smoogipoo	78d73d4c11	Additional fixes for flow ordering after framework changes	2018-03-06 17:20:58 +09:00
naoey	9669c5aee3	Make locally used things local and rename method.	2018-03-06 09:33:15 +05:30
naoey	2e535afb84	Remove redundant subsection title. ... - Also handle opening UserProfile in LinkFlowContainer similar to how beatmaps and channels are handled	2018-02-28 15:25:29 +05:30
naoey	62913163e0	Fix long recent activity text overlapping timestamp. ... - Also remove unnecessary fallback from absolute URL helper	2018-02-27 21:21:53 +05:30
naoey	a77d1eedae	Fix achievements parsing and add badges to recent activity.	2018-02-26 13:08:12 +05:30
naoey	a20e4bc2c3	Fix typos and missing fields in JSON mappings.	2018-02-26 11:46:16 +05:30
naoey	5724618b2a	Add license headers and sanitise open profile argument.	2018-02-26 09:58:11 +05:30
naoey	1ad45b0941	R# fixes.	2018-02-26 01:21:31 +05:30
naoey	75fdca928e	Handle links correctly and don't re-open profile if the user is same.	2018-02-26 01:21:29 +05:30
naoey	bb40919f9c	Add link handling to recent activities. ... - Add a show user action to link handling	2018-02-26 01:21:27 +05:30
naoey	7e4bd36391	Create drawable and add response to profile. ... - Add missing JSON fields to response model - Add missing enum value	2018-02-26 01:21:24 +05:30
naoey	e3a1b07172	Create API request and reponse model.	2018-02-26 01:21:16 +05:30
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +09:00
Dean Herbert	4c3606f8fb	Handle non-present country rank	2018-02-07 18:34:38 +09:00
Dean Herbert	647cc4bdad	Remove in-between properties	2018-02-07 18:04:32 +09:00
Imnooby	c4f3223e34	Stops non-url text from being hyperlinks ... Fixed crash when you attempted to click one	2018-02-03 18:24:49 -06:00
tgi74000	e08a9350a0	Store and show SSPlus and SPlus statistics	2018-02-01 15:19:49 +01:00
Dean Herbert	783ca40c64	Update with upstream changes	2018-01-17 16:51:47 +09:00
Dean Herbert	54b0f4b912	Merge branch 'master' into url-parsing-support	2018-01-17 16:16:55 +09:00
Dean Herbert	5e1cd8ddc4	Apply conditionals directly rather than using an in-between property	2018-01-16 20:34:40 +09:00
Dean Herbert	9b33499fe7	Merge remote-tracking branch 'upstream/master' into RefactorInputQueues	2018-01-16 20:04:34 +09:00
TocoToucan	3c11978cfa	Use local functions	2018-01-15 21:42:17 +03:00
Dean Herbert	72624aea18	Use a better method of link compilation ... Adds word wrap back, simplifies a lot.	2018-01-09 20:33:20 +09:00
Dean Herbert	b035a92bda	Merge branch 'master' into url-parsing-support	2018-01-09 14:28:20 +09:00
TocoToucan	ae032cbf23	Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties	2018-01-07 23:40:00 +03:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	af86220dcc	Merge remote-tracking branch 'origin/master' into update-branch	2018-01-05 12:08:50 +09:00
smoogipoo	5eb2dc3d64	Cleanup some possible CI errors ... Not sure why these aren't being detected on master right now - they should be...	2018-01-05 01:20:24 +09:00
smoogipoo	36e9232472	Merge master into netstandard	2018-01-05 00:42:48 +09:00
Dean Herbert	faf1181fc3	Merge branch 'master' into url-parsing-support	2018-01-02 17:51:50 +09:00
FreezyLemon	e7721d71f3	Changed chat link implementation according to review	2017-12-31 00:51:47 +01:00
Aergwyn	f7fe083018	add tooltip to country flags	2017-12-30 14:59:35 +01:00
jai_	9660e0885b	correctly name tooltip interface	2017-12-29 19:20:37 +00:00
jai_	6de41ba172	Trim whitespace	2017-12-29 19:16:43 +00:00
jai_	b1dd64983d	Add tooltip text to supporter icon	2017-12-29 19:05:50 +00:00
FreezyLemon	7454633f63	Refactor and general tidying up	2017-12-28 20:11:21 +01:00
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
Dan Balasescu	d089e27cad	Merge branch 'master' into osu-prefixed-text	2017-12-26 15:40:29 +09:00
FreezyLemon	a30448095e	Merge branch 'master' into url-parsing-support	2017-12-25 19:12:23 +01:00
Dean Herbert	3c1654e5e4	Fix many instances of non-osu-prefixed text classes being used ... Results in incorrect default formatting.	2017-12-26 00:44:35 +09:00
Aergwyn	bb4b5bebf9	fix supporter icon in profile missing its background ... also it doesn't show up on profiles without supporter anymore	2017-12-25 15:30:42 +01:00
Dean Herbert	e5faced9ba	Better variable name	2017-12-22 19:25:59 +09:00
Dean Herbert	82909f6585	RankChart -> RankGraph	2017-12-22 19:25:18 +09:00
EVAST9919	8c50fa0b84	Add testcase	2017-12-22 18:57:23 +09:00
EVAST9919	938c5feea4	Simplify interaction condition	2017-12-22 18:45:10 +09:00
EVAST9919	94a974a397	Use bindable for a user	2017-12-22 18:45:10 +09:00
EVAST9919	e48c515d52	CI fixes	2017-12-22 18:45:10 +09:00
EVAST9919	5ffdaf711e	Remove useless array	2017-12-22 18:45:10 +09:00
EVAST9919	f3c93c894b	Rank graph improvements	2017-12-22 18:45:10 +09:00
Dean Herbert	fc0b97065c	Move hover sound/container to base implementation	2017-12-20 15:54:13 +09:00
Dean Herbert	a6496e35ec	Merge branch 'master' into url-parsing-support	2017-12-20 14:41:12 +09:00
Dean Herbert	c8afc553cb	Fix profile header not correctly being masked ... Closes #1592.	2017-12-18 23:55:34 +09:00
FreezyLemon	d0b7c92b46	Removed unnecessary usings.	2017-12-11 13:46:23 +01:00
FreezyLemon	bb0a32b555	Removed private OsuHoverContainer "content" from OsuLinkSpriteText for more customization.	2017-12-11 11:28:16 +01:00
FreezyLemon	f8bc52bbe6	Merged https://github.com/ppy/osu master branch	2017-12-11 09:27:54 +01:00
Dean Herbert	7d8fb12332	DrawableScore -> DrawableProfileScore ... Discern between the other class of the same name	2017-12-11 12:51:02 +09:00
Dean Herbert	0c2158ccbd	Improve display of beatmap thumbnails	2017-12-11 12:47:31 +09:00
Dean Herbert	98ce856de1	Use more sensible names for classes and methods ... Adds xmldoc in places too.	2017-12-11 12:33:34 +09:00
Dean Herbert	9069f1ccba	Merge branch 'master' into most-played-beatmaps-section	2017-12-11 12:12:23 +09:00
Dean Herbert	668299ef84	Merge branch 'master' into fix-userprofile-unranked	2017-12-10 13:02:32 +09:00
FreezyLemon	856b56d79c	Fixed small typo.	2017-12-08 12:54:36 +01:00
FreezyLemon	b1270a84f8	Added handling for rank == 0 (unranked), removed "#0" from country name if that happens, also display "no rank" when hovering over history instead of "#0"	2017-12-08 11:31:32 +01:00
FreezyLemon	e05618a415	Removed unnecessary "using" directives	2017-12-07 19:36:56 +01:00
FreezyLemon	1f1c7dd70f	Moved LinkFlowContainer out of ProfileHeader to make it available for other uses too (e.g. chat) and renamed it to LinkTextFlowContainer bc it can contain both links and text, not only one	2017-12-01 20:26:51 +01:00
smoogipoo	0ec10ba32d	CI fixes	2017-11-30 00:11:00 +09:00
jorolf	7f068c0c68	correct string mistake	2017-11-27 21:13:01 +01:00
jorolf	70b6071898	add license header	2017-11-26 22:13:52 +01:00
jorolf	4c68090e59	separate GetUserBeatmapsRequest and GetUserMostPlayedBeatmapsRequest	2017-11-26 22:06:03 +01:00
jorolf	02fa1f9dd6	move shared stuff between MostPlayedBeatmapDrawable and DrawableScore to DrawableBeatmapRow	2017-11-26 21:52:35 +01:00
jorolf	a1cc18f98c	Merge branch 'master' into most-played-beatmaps-section	2017-11-24 22:51:11 +01:00
Dean Herbert	4986ad73f7	Merge remote-tracking branch 'upstream/master' into load-optimization	2017-11-23 18:44:17 +09:00
Dean Herbert	38f5c55f80	Remove not-accessed field	2017-11-23 18:11:35 +09:00
Dean Herbert	30db2ce18a	Rename KudosuValue to count and remove pointless local storage	2017-11-23 17:37:02 +09:00
Dean Herbert	6d9951d9af	Use FillFlow rather than manually specifying positions	2017-11-23 17:32:41 +09:00
Dean Herbert	2ff21bbc6c	Move descriptions to constructor	2017-11-23 17:29:20 +09:00
Dean Herbert	9d481eba96	Merge branch 'master' into kudosu-section	2017-11-23 17:19:42 +09:00
FreezyLemon	18b0b77f0a	Added requested changes. Mainly changing lambdas to direct function references.	2017-11-22 21:41:50 +01:00
jorolf	22348a3d67	Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section	2017-11-22 21:14:11 +01:00
FreezyLemon	a033eb46d3	Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance.	2017-11-21 16:12:23 +01:00
jorolf	66c51c7b44	cleanup	2017-11-19 14:33:50 +01:00
jorolf	4281d76bcf	historical section now shows the most played beatmaps	2017-11-19 14:19:05 +01:00
jorolf	1f379cab8f	move BeatmapMetadataContainer to a separate class	2017-11-19 14:17:14 +01:00
jorolf	9aaefb5e97	same for PaginatedScoreContainer	2017-11-18 20:09:31 +01:00
jorolf	4264641303	fix missing text appearing when request returns nothing but beatmaps are already there	2017-11-18 18:27:30 +01:00
EVAST9919	2ff88c86ea	CI fixes	2017-11-18 18:53:21 +03:00
EVAST9919	915ccf3c84	Fix some layout issues	2017-11-18 18:41:00 +03:00
EVAST9919	87f1368869	Add KudosuInfo container in the kudosu section	2017-11-18 18:19:35 +03:00
Dean Herbert	f912744acc	Fix sizing of ModIcon	2017-11-16 00:15:27 +09:00
EVAST9919	8688afecde	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores	2017-11-14 20:13:07 +03:00
Dean Herbert	4b9edc4645	Merge branch 'master' into profile_beatmaps	2017-11-14 20:27:17 +09:00
Dean Herbert	44671ad9cb	Move common width definition to base class	2017-11-14 19:03:50 +09:00
Dean Herbert	f96f7e696d	Tidy up variables a bit	2017-11-14 18:53:09 +09:00
Dean Herbert	160b988735	Reduce number of rqeuests to display beatmaps in profile ... Comes at the cost of losing some information which should be loaded. This will be fixed at the osu-web end.	2017-11-14 18:51:41 +09:00
EVAST9919	08ce2705c6	Add pending and graveyarded beatmapsets to profile page	2017-11-14 08:26:44 +03:00
EVAST9919	d157e6baf1	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores	2017-11-13 16:02:44 +03:00
Dean Herbert	0168b7eb88	Merge remote-tracking branch 'upstream/master' into profile-overlay-visual	2017-11-13 21:21:57 +09:00
EVAST9919	5bf756c3c6	Add DrawableTopScore	2017-11-11 06:54:52 +03:00
EVAST9919	3261af5200	Add scores container	2017-11-11 03:46:06 +03:00
EVAST9919	68c4da0810	Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-beatmaps-section	2017-11-09 20:02:47 +03:00
EVAST9919	a9b58a2ad2	Drawable score visual improvements	2017-11-09 17:12:06 +03:00
EVAST9919	edeeefea3b	Fix missing text has been shown before api request has been completed	2017-11-08 20:42:24 +03:00
EVAST9919	13cc1fcc92	Fix wrong index offset	2017-11-07 14:30:44 +03:00
EVAST9919	8e806cd11c	Simplify moving ball behaviour	2017-11-07 13:43:02 +03:00
EVAST9919	5946585a6f	Apply suggested changes	2017-11-07 12:19:23 +03:00
EVAST9919	1b0e7e7145	Undo some useless changes	2017-11-07 03:44:21 +03:00
EVAST9919	60e6177b7f	Use null propagation	2017-11-07 03:26:47 +03:00
EVAST9919	1063e18566	Don't show graph at all if there's no data to use	2017-11-07 03:16:27 +03:00
EVAST9919	461baf3b97	CI fixes	2017-11-07 03:05:12 +03:00
EVAST9919	28167388d6	Remove useless calls	2017-11-07 02:53:07 +03:00
EVAST9919	d10dcd82bc	Rank Line Graph improvements	2017-11-07 02:39:48 +03:00
EVAST9919	a12052ac51	CI fix	2017-11-06 22:18:37 +03:00
EVAST9919	5d846bff7b	Add (temporarily?) subrequest for each item to provide correct beatmap information	2017-11-06 22:05:04 +03:00
EVAST9919	b8b5c67cd2	Apply suggestion concerning the BeatmapSetType enum	2017-11-06 21:46:28 +03:00
EVAST9919	729777a7e0	Remove useless variable	2017-11-04 18:38:02 +03:00
EVAST9919	48c39b1d19	Add "Ranked & Approved Beatmaps" section	2017-11-04 00:53:58 +03:00
EVAST9919	761d885167	Add Favourite Beatmaps section in UserProfileOverlay	2017-11-03 20:25:21 +03:00
Dean Herbert	d871c3fdda	Fix test not working due to null refs	2017-10-30 20:55:23 +09:00
Dean Herbert	1ae0eff6ad	Add some sanity to request/drawable creation logic	2017-10-30 19:40:42 +09:00
Dean Herbert	a51e64b2d1	Remove unnecessary schedule	2017-10-30 19:16:16 +09:00
Dean Herbert	069f4b1fcf	Make DrawableScore abstract and move shared class to own file	2017-10-30 19:15:19 +09:00
Dean Herbert	096998d5f4	Fix user bindable being assigned rather than bound	2017-10-30 19:08:15 +09:00
Dean Herbert	b660366d96	ScoreContainer -> PaginatedScoreContainer	2017-10-30 19:06:40 +09:00
Dean Herbert	dce7d1c910	Move pp score representation to own file	2017-10-30 19:05:13 +09:00
Jorolf	b2c3ba05d7	remove redundant stuff	2017-10-25 20:15:45 +02:00
Jorolf	0449639f41	remove inner classes and make User property a bindable	2017-10-25 20:07:12 +02:00
Jorolf	a2dfef301a	remove unused parameters	2017-10-24 20:56:05 +02:00
Jorolf	f65d4b626e	don't use c# 7 feature	2017-10-24 20:46:15 +02:00
Jorolf	aadc699e73	show recent scores	2017-10-24 20:31:38 +02:00
Huo Yaoyuan	06fe874594	CI fixes.	2017-10-15 16:53:30 +08:00
Huo Yaoyuan	9b3676c562	Use format string for double instead of Math.Round.	2017-10-15 16:44:15 +08:00
Huo Yaoyuan	192ebe776f	Use localisation engine instead of asking current culture directly.	2017-10-15 16:30:52 +08:00
Huo Yaoyuan	bed5a64ee2	Construct DwarableScore using null weight.	2017-10-15 16:15:35 +08:00
Dean Herbert	15373c71b6	Allow scores to open beatmap overlay ... Reshuffles depth of beatmap and profile overlays for now.	2017-10-13 20:09:03 +09:00
Dean Herbert	ead88224c5	Move ModIcon tooltip to base implementation	2017-10-13 19:14:43 +09:00
Dean Herbert	146d800bda	Make weight nullable rather than using weird negative defaults	2017-10-13 19:02:50 +09:00
Dean Herbert	520b806305	Merge remote-tracking branch 'upstream/master' into ranks-section	2017-10-13 18:49:05 +09:00
Dean Herbert	070aceef1e	Move font and text size to class ProfileLink class	2017-10-13 17:03:31 +09:00
EVAST9919	82b333740d	Apply suggestions	2017-10-11 15:20:23 +03:00
EVAST9919	d1f02538cb	Add tooltip to username in the profile overlay	2017-10-09 21:12:04 +03:00
Jorolf	9ee824ee66	some more unused stuff	2017-09-21 22:28:15 +02:00
Jorolf	14b8e9fd77	remove some redundant stuff	2017-09-21 22:15:42 +02:00
Jorolf	72141935e8	make pagination work and remove duplication in RanksSection	2017-09-21 22:07:23 +02:00
Jorolf	5b90f45691	Merge branch 'master' of git://github.com/ppy/osu into ranks-section	2017-09-19 21:26:05 +02:00
Dean Herbert	98b847b025	Add API retrieval support	2017-09-14 20:08:07 +09:00
Dean Herbert	9c4876d135	Merge remote-tracking branch 'upstream/master' into ranks-section	2017-09-14 18:52:44 +09:00
Dean Herbert	7cd6caacaa	Update to support newer return structure from osu-web API	2017-09-14 18:08:12 +09:00
Dean Herbert	7681d97f10	Fix typo in user profile header ... Replays watched, not replay watched.	2017-09-13 15:21:04 +09:00
Jorolf	15e4e487e2	I hope this works	2017-08-09 22:58:06 +02:00