4483 Commits (2f7f6af26a40fb9981c99d131cf021c71f24fb99)

Author	SHA1	Message	Date
ThibG	2f7f6af26a	Hide domain filter in admin page when “local” filter is active (#10074) ... Since the “domain” field is ignored in this case.	6 years ago
ThibG	d1d7d14f77	Fix video player width not being updated to fit container width (#10069)	6 years ago
Eugen Rochko	1a1b8170bb	Fix Announce activities of unknown statuses not fetching those statuses (#10065) ... Regression from #9998	6 years ago
Eugen Rochko	147b4c2c3a	Add logging for rejected ActivityPub payloads and add tests (#10062)	6 years ago
ThibG	041ff5fa9a	Fix crash on public hashtag pages when streaming fails (#10061)	6 years ago
Eugen Rochko	ea7ad59af2	Fix mutes, blocks, domain blocks and follow requests not paginating (#10057) ... Regression from #9581	6 years ago
Eugen Rochko	cc84a407f4	Add vapid_key to the application entity in the REST API (#10058) ... Fix #8785	6 years ago
Eugen Rochko	a006d4afbe	Add registrations attribute to instance entity in REST API (#10060) ... Fix #9350	6 years ago
Eugen Rochko	80388a3ffe	Change error graphic to hover-to-play (#10055) ... Fix #6060	6 years ago
Eugen Rochko	71e28ba399	Change buttons on timeline preview to open the interaction dialog (#10054) ... Fix #9922	6 years ago
Eugen Rochko	c417e8c198	Filter incoming Announce activities by relation to local activity (#10041) ... * Filter incoming Announce activities by relation to local activity Reject if announcer is not followed by local accounts, and is not from an enabled relay, and the object is not a local status Follow-up to #10005 * Fix tests	6 years ago
Eugen Rochko	8ef50706a1	Fix relay enabling/disabling not resetting inbox availability status (#10048) ... Fix #10033	6 years ago
Eugen Rochko	b01f26ffbd	Change conversations to always show names of other participants (#10047) ... Fix #9190	6 years ago
rinsuki	f9a338b473	Fix breaks when opening a reply tree in WebUI (#10046) ... fix #10045	6 years ago
Eugen Rochko	aa83219875	Fix hashtag column not subscribing to stream on mount (#10040) ... Fix #9895	6 years ago
Ben Lubar	309043b158	Improve image description user experience (#10036) ... * Add image descriptions to searchable post content. * Allow multi-line image descriptions. * Request image descriptions in the same query as posts when creating the search index. (see https://github.com/tootsuite/mastodon/pull/10036#discussion_r256551624)	6 years ago
Aditoo17	7750416597	I18n: Update Czech pluralization and fix some language names (#10015) ... * I18n: Update Czech pluralization * I18n: Fix some language names * I18n: Fix some language names	6 years ago
ThibG	188f1c7c89	Add list title editing (#9748) ... * Add list title editing Port changes made by ash for glitch-soc * Code style fixes	6 years ago
Eugen Rochko	dad339da6d	Filter incoming Create activities by relation to local activity (#10005) ... Reject those from accounts with no local followers, from relays that are not enabled, which do not address local accounts and are not replies to accounts that do have local followers	6 years ago
Eugen Rochko	114cdc36aa	Fix style regressions on landing page (#10030)	6 years ago
ThibG	6a5307a573	Alternative handling of private self-boosts (#9998) ... * When self-boosting, embed original toot into Announce serialization * Process unknown self-boosts from Announce object if it is more than an URI * Add some self-boost specs * Only serialize private toots in self-Announces	6 years ago
Eugen Rochko	169b9d4428	Fix hashtags select styling in default and high contrast themes (#10029)	6 years ago
ThibG	98d1a1f117	Disable box shadows for featured hashtags in light theme (#10034) ... Fixes #9990	6 years ago
Eugen Rochko	c6e7b97baa	Fix color of static page links in high contrast theme (#10028)	6 years ago
ThibG	67215692fc	Save IP address used for sign-up, not only sign-in (#10026) ... Fixes #9995	6 years ago
Franck Zoccolo	4f0322dcae	Add support for IPv6 only MXes in Email validation (#10009) ... * Add support for IPv6 only MXes * Fixed email validator tests	6 years ago
ThibG	99c4b5b75a	Move sending account Delete to anyone but the account's followers to the pull̀ queue (#10016)	6 years ago
Hinaloe	0e513ff862	Don't focus spiler input when disabled spoiler (#10017)	6 years ago
ThibG	aee93bfc9c	Fix timeline jumps (#10001) ... * Avoid two-step rendering of statuses as much as possible Cache width shared by Video player, MediaGallery and Cards at the ScrollableList level, pass it down through StatusList and Notifications. * Adjust scroll when new preview cards appear * Adjust scroll when statuses above the current scroll position are deleted	6 years ago
Eugen Rochko	c0a564feaa	Add available locales for lv, ms, sq (#10008)	6 years ago
Eugen Rochko	a3e10f44c6	Weblate translations (2019-02-11) (#10007) ... * Translated using Weblate (Galician) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/gl/ * Translated using Weblate (Basque) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/eu/ * Translated using Weblate (Basque) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/eu/ * Translated using Weblate (Arabic) Currently translated at 94.8% (716 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ar/ * Translated using Weblate (Basque) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/eu/ * Translated using Weblate (Slovak) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (German) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/de/ * Translated using Weblate (Slovenian) Currently translated at 21.7% (164 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Corsican) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/co/ * Translated using Weblate (Welsh) Currently translated at 86.9% (93 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Welsh) Currently translated at 94.6% (714 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Welsh) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cy/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Added translation using Weblate (Irish) * Translated using Weblate (Irish) Currently translated at 0.1% (1 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ga/ * Translated using Weblate (Telugu) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/te/ * Translated using Weblate (Indonesian) Currently translated at 38.4% (290 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/id/ * Translated using Weblate (Welsh) Currently translated at 94.6% (714 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Korean) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Translated using Weblate (Welsh) Currently translated at 93.5% (100 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cy/ * Translated using Weblate (Welsh) Currently translated at 98.0% (349 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cy/ * Translated using Weblate (Serbian) Currently translated at 95.8% (723 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Greek) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Occitan) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/oc/ * Translated using Weblate (Welsh) Currently translated at 98.0% (740 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cy/ * Translated using Weblate (Italian) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/it/ * Translated using Weblate (Italian) Currently translated at 84.0% (634 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/it/ * Translated using Weblate (Slovenian) Currently translated at 29.0% (219 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovenian) Currently translated at 34.4% (260 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Latvian) Currently translated at 40.7% (145 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/ * Translated using Weblate (Japanese) Currently translated at 91.0% (687 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ja/ * Translated using Weblate (Serbian) Currently translated at 95.8% (723 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sr/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Latvian) Currently translated at 48.3% (172 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/lv/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Translated using Weblate (Czech) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/cs/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ * Translated using Weblate (Greek) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/el/ * Translated using Weblate (Greek) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/el/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ Rename "instance" to "server" * Translated using Weblate (Czech) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/cs/ rename from "instance" to "server" * Translated using Weblate (Czech) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/cs/ * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ rename from "instance" to "server" * Translated using Weblate (Czech) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/cs/ * Translated using Weblate (Czech) Currently translated at 99.9% (754 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/cs/ rename from "instance" to "server" * Translated using Weblate (Slovak) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sk/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Korean) Currently translated at 100.0% (755 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/ko/ * Added translation using Weblate (Lithuanian) * Translated using Weblate (Japanese) Currently translated at 99.2% (353 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/ja/ * Translated using Weblate (Lithuanian) Currently translated at 20.1% (152 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/lt/ * Added translation using Weblate (Albanian) * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (356 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sk/ * Translated using Weblate (Slovak) Currently translated at 100.0% (107 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sk/ * Added translation using Weblate (Albanian) * Added translation using Weblate (Albanian) * Added translation using Weblate (Albanian) * Added translation using Weblate (Albanian) * Added translation using Weblate (Albanian) * Translated using Weblate (Albanian) Currently translated at 100.0% (63 of 63 strings) Translation: Mastodon/Devise Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/devise/sq/ * Translated using Weblate (Albanian) Currently translated at 100.0% (2 of 2 strings) Translation: Mastodon/Activerecord Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/activerecord/sq/ * Translated using Weblate (Albanian) Currently translated at 100.0% (98 of 98 strings) Translation: Mastodon/Doorkeeper Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/doorkeeper/sq/ * Translated using Weblate (Albanian) Currently translated at 64.5% (487 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sq/ * Translated using Weblate (Slovak) Currently translated at 99.7% (753 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sk/ * Translated using Weblate (Slovenian) Currently translated at 40.0% (302 of 755 strings) Translation: Mastodon/Backend Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/backend/sl/ * Translated using Weblate (Slovenian) Currently translated at 74.8% (80 of 107 strings) Translation: Mastodon/Preferences Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/simple_form/sl/ * Translated using Weblate (Slovenian) Currently translated at 45.2% (161 of 356 strings) Translation: Mastodon/React Translate-URL: https://weblate.joinmastodon.org/projects/mastodon/frontend/sl/ * i18n-tasks normalize * yarn manage:translations * Fix inconsistent interpolations and unused keys * Fix missing plural forms	6 years ago
Eugen Rochko	3cfadd875c	Add "copy link" item to status action bars (#9983) ... Fix #6848	6 years ago
mayaeh	fb90ec894e	i18n: add Japanese translations (#10000) ... * Add Japanese translations. * Probably change to more general "統合" than "マージ" .	6 years ago
Eugen Rochko	016ad37bc8	Fix URL linkifier grabbing full-width spaces and quotations (#9997) ... Fix #9993 Fix #5654	6 years ago
Hinaloe	157d3af46c	Only URLs extract with pre-escaped text (#9991) ... * [test] add japanese hashtag testcase * Only URLs extract with pre-escaped text ( https://github.com/tootsuite/mastodon/issues/9989 )	6 years ago
ThibG	d09ce6d81b	Fix IntersectionObserverArticle not hiding some out-of-view items (#9982) ... IntersectionObserverArticle is made to save on RAM by avoiding fully rendering items that are far out of view. However, it did not work for items spawned outside the intersection observer.	6 years ago
abcang	e186bd2fb0	Fix Tombstone.delete_all ArgumentError (#9978)	6 years ago
mayaeh	46e806cd2f	Rename from instance to server. (#9938)	6 years ago
marcin mikołajczak	3eb17a3bea	i18n: Update Polish translation 🇵 (#9974) ... Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	6 years ago
ThibG	1ac9a3f4bb	Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973) ... Thanks @wryk for noticing this issue.	6 years ago
Takeshi Umeda	5bffb53a76	Fix it as tagged_request of accounts_controller is not addressable_uri (#9976)	6 years ago
trwnh	76d41475a8	[UI] Fix whitespace being applied to div instead of p (#9968) ... * fix large line breaks * fix ascii art posts	6 years ago
Eugen Rochko	2557cb2f95	Fix pinned statuses being shown in a featured hashtag (#9971)	6 years ago
rinsuki	e02a13f64e	Fix not showing custom emojis in share page emoji picker (#9970)	6 years ago
rinsuki	88f35f339d	Fix authorized applications list page design (#9969)	6 years ago
rinsuki	c78d64d9c3	Use video filesize limit with gifv (#9924)	6 years ago
mike castleman	f86413fce2	change "finish tutorial" text to "finish toot-orial" (#9905)	6 years ago
Eugen Rochko	364f2ff9aa	Add featured hashtags to profiles (#9755) ... * Add hashtag filter to profiles GET /@:username/tagged/:hashtag GET /api/v1/accounts/:id/statuses?tagged=:hashtag * Display featured hashtags on public profile * Use separate model for featured tags * Update featured hashtag counters on-write * Limit featured tags to 10	6 years ago
Eugen Rochko	d14c276e58	Add option to overwrite imported data (#9962) ... * Add option to overwrite imported data Fix #7465 * Add import for domain blocks	6 years ago
tmm576	750c67660d	Allow multiple files upload through web UI, including drag & drop (#9856) ... * Allow drag and drop uploads of multiple files to compose * Calculate aggregate upload progress for single action * Allow multiple uploads to compose through traditional input, consolidate update file limit logic, provide file limit feedback	6 years ago