349 Commits

Author	SHA1	Message	Date
Andrei Zavatski	daeefc449c	Use another link format to avoid representation issues	2019-08-19 17:49:53 +03:00
Andrei Zavatski	fd21e06389	Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info	2019-08-19 17:16:50 +03:00
Dean Herbert	be51fde292	Centre beatmap panels in profile overlay	2019-08-19 13:22:32 +09:00
Andrei Zavatski	be97804180	Implement text formatting	2019-08-18 21:28:07 +03:00
Andrei Zavatski	cf2a9db8e0	Implement basic layout for kudosu history	2019-08-09 11:14:38 +03:00
Andrei Zavatski	0f36088ef8	Add loved section	2019-08-01 11:06:29 +03: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
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
Roman Kapustin	0c95dff3d6	Make FlowContainer insertion cleaner	2019-07-01 18:41:08 +03:00
KingLuigi4932	794ba17a2f	Seperate UpdateableRank from DrawableRank and use it	2019-06-17 20:04:09 +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
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
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
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
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	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09: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	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
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
smoogipoo	e657f13c15	Separate out Leaderboard into BeatmapLeaderboard	2018-12-22 14:44:36 +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
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
smoogipoo	bf1ce8cdd8	Fix linking still being broken	2018-07-10 16:02:13 +09:00
Dean Herbert	625b9ead4c	Fix links from profile top scores to beatmaps not working correctly	2018-07-05 21:00:23 +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
Dan Balasescu	126678c226	Merge branch 'master' into multiple_previews_different_overlays	2018-06-12 19:26:51 +09:00
Roman Kapustin	8702a70524	Resolve merge conflicts in DirectOverlay	2018-06-08 21:03:16 +03: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
TocoToucan	56c1c2beca	Remove redundant multiple previews handling from PaginatedBeatmapContainer	2018-04-29 15:50:02 +03:00
Dean Herbert	1be2571d33	Make BeatmapSetOverlay accept nulls everywhere	2018-04-18 16:08:45 +09: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	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	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	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09: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
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
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	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
jorolf	22348a3d67	Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section	2017-11-22 21:14:11 +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	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	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
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
Dean Herbert	98b847b025	Add API retrieval support	2017-09-14 20:08:07 +09:00
Jorolf	15e4e487e2	I hope this works	2017-08-09 22:58:06 +02:00
Jorolf	acc9b20b0f	move another thing to LoadComplete instead of the constructor	2017-08-09 22:37:05 +02:00
Jorolf	c877a5a8b7	update TestCase	2017-08-09 19:26:27 +02:00
Jorolf	c2c9095b02	fix CI issues	2017-08-09 18:57:55 +02:00
Jorolf	274ebbd1f7	remove duplicated code and "simplify" ShowMore logic	2017-08-09 18:45:37 +02:00
Jorolf	9f005488f7	make it work again after merge	2017-08-09 17:32:09 +02:00
Jorolf	02a22e3f77	remove empty argument list	2017-07-29 15:16:31 +02:00
Jorolf	cca49d6ed5	some renaming, a show more button and a placeholder if no scores exist	2017-07-29 15:06:46 +02:00
Jorolf	88f206cfe4	rename file	2017-07-29 00:39:47 +02:00
Jorolf	0fc36065f4	replace Play with Score	2017-07-29 00:31:52 +02:00
Jorolf	7b8997cfc2	CI stuff	2017-07-26 19:42:34 +02:00
Jorolf	8e685a98d4	add RanksSection	2017-07-26 19:21:45 +02:00
Dean Herbert	c7a13740f9	Move sections to own namespace	2017-07-13 13:53:45 +09:00