1305 Commits (ed5d06c7e79b0077da55722bdd5748d390864e30)

Author SHA1 Message Date
Lynx Kotoura d3d52615ab Fix list editor modal on narrow devices (#5904)
7 years ago
Lynx Kotoura 1696fe1c84 Fix extra space between status text and username (#5902)
7 years ago
aschmitz cbaddc6447 Break out nested relationship API keys (#5887)
7 years ago
Yamagishi Kazutoshi eeb17ff02d Fix emoji picker scrollbar (regression from #5046) (#5901)
7 years ago
Yamagishi Kazutoshi f6b7869a2c Handle submit event of new list form (#5895)
7 years ago
mayaeh e1cabf86d5 Update Japanese translations. (#5893)
7 years ago
Eugen Rochko 1e7f022fa2 Add list of lists component to web UI (#5811)
7 years ago
SerCom_KC 125ad3e931 Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849)
7 years ago
Neetshin 52f1c89aef Add aria-autocomplete='list' in Textaria (#5889)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
Jenkins da7ccfeca2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Neetshin 2a3097b4cf Update mutes.js (#5882)
7 years ago
kibigo! 3760da1321 Fixed image require
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
Jenkins 92b6ca9028 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Lynx Kotoura 16ff931a56 Add keyboard shortcuts link to getting-started navigation (#5874)
7 years ago
Lynx Kotoura 2d6f2dac11 Add back button to keyboard shortcuts legend column (#5872)
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
cormo 0bd728a690 Remove redundant import statement in SCSS (#5864)
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
mayaeh 9cb7c90412 Update Japanese translations for KeyboardShortcuts. (#5858)
7 years ago
Jenkins e8446e3724 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Mayu Laierlence a9413c2bb9 Fix Korean translation (#5853)
7 years ago
Marcin Mikołajczak b95f1b130a i18n: 🇵🇱 (#5851)
7 years ago
David Yip 4a4c6304c1 Merge pull request #232 from glitch-soc/hotkeys-glitch
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
aschmitz ce341c7cf6 Allow hiding of reblogs from followed users (#5762)
7 years ago
Yamagishi Kazutoshi a132f4576d Refactor KeyboardShortcuts component (#5835)
7 years ago
Marcin Mikołajczak 5f51992e16 i18n: 🇵🇱 (#5841)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
kibigo! 4497b83982 Adds spoiler hotkey support to detailed statuses
7 years ago
kibigo! fac7e31101 Implement status hotkeys + spoiler expanding
7 years ago
Joshua Wood 0b045ba7ab Add Keyboard Shortcuts Legend (#5823)
7 years ago
David Yip c9dd67a733 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko bc8c951083 Add consumable invites (#5814)
7 years ago
Jenkins f504ac4ff6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ce0d30feb7 Do not filter the status collection after muting and blocking (#5815)
7 years ago
SerCom_KC 7cdf02f2d4 i18n: (zh-CN) Add translations for #5746 & #5750 (#5816)
7 years ago
Akihiko Odaki 16a49799cf Allow to open a modal for embedded photo (#5777)
7 years ago
Akihiko Odaki 7df80c9e83 Rename ariaLabel property of Dropdown to title (#5813)
7 years ago
spla eddbf2e485 Updated Catalan strings (#5801)
7 years ago
Jenkins 7fcbe5faee Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 8fde0aed51 Add Japanese translations (#5810)
7 years ago
Eugen Rochko bf8eab12ba Display list column (#5750)
7 years ago
sdukhovni 019c39bf1d Don't remove originals of boosted toots from timeline (#5479)
7 years ago
Akihiko Odaki 0319b92979 Do not require onClose property in NavigationBar (#5802)
7 years ago
Jenkins 359ba16721 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko efc97d404c Add logging of admin actions (#5757)
7 years ago
kibigo! 3860750d5d Styling fixes
7 years ago
kibigo! ea77b60648 Update statuses on hidden toggle (Fixes #227)
7 years ago
kibigo! eadf1c38a5 Minor fixes
7 years ago
Jenkins a2e4d79b1c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak c75bc101ba i18n: Update Polish translation - front-end added (#231)
7 years ago
Joan Montané daec402a58 Update and fix Catalan translation (#5773)
7 years ago
kibigo! 8aeda4f064 Finalized theme loading and stuff
7 years ago
David Yip 1dc24ece41 Merge remote-tracking branch 'tootsuite/master'
7 years ago
beatrix 34ba45e47c Merge pull request #226 from glitch-soc/glitch-theme
7 years ago
kibigo! 2b05c3aaa1 Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme
7 years ago
kibigo! e56a32a46b WIP static themeing
7 years ago
kibigo! 25361848e3 Enabled vanilla thmee
7 years ago
kibigo! f0aedba604 Public pack fix
7 years ago
kibigo! a8c0c7a2c1 Media styling
7 years ago
kibigo! 0c90d1ab38 Font styles are now packagified
7 years ago
Eugen Rochko b89f614bd7 Profile redirect notes (#5746)
7 years ago
Jenkins cea7dec340 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC e618b6c136 Updating Chinese (Simplified) translations (#5725)
7 years ago
kibigo! 5466150ea4 Removed glitch tests
7 years ago
kibigo! 7c5614c667 Restore vanilla components
7 years ago
kibigo! 68304a6ce5 Forking glitch theme
7 years ago
beatrix 61585f2c42 Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
7 years ago
David Yip e5a2158e2a Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
7 years ago
Jenkins 065e2388ba Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 87c1f91505 Merge pull request #218 from glitch-soc/themed-prefetching
7 years ago
Lynx Kotoura 731c859097 Increase contrast of Admin badges (#5740)
7 years ago
David Yip ff4e474bcd Add trailing comma in mapStateToProps
7 years ago
David Yip c687853d80 Merge pull request #219 from glitch-soc/no-spin
7 years ago
David Yip 801ecbfa5a Throw layout, isWide, navbarUnder back into mapStateToProps.
7 years ago
kibigo! bbef750b04 Removes spin theme
7 years ago
kibigo! 5845057adb Themed prefetching
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
beatrix ed1cf698a2 Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
masarakki 7d3b67e1c8 reusable-streaming (#5709)
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
SerCom_KC 66a0141691 Updating Chinese (Simplified) translations (#5643)
7 years ago
Marcin Mikołajczak fa89e5d911 i18n: Update Polish translation (#5699)
7 years ago
Lain Iwakura a77e03ede4 Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.
7 years ago
Lain Iwakura f517cbae22 Code style fixes.
7 years ago
Lain Iwakura 3de2814a5a Handle character limit in initial state in frontend.
7 years ago
Andrew 1d0a72c00b Updates and fixes to win95 theme
7 years ago
Anna e só c4c9003f84 l10n: PT-BR translation updated (#5681)
7 years ago
Eugen Rochko 9caf162432 Fix #5632 - Reset column loading status after fetch fail (#5659)
7 years ago
aschmitz 869cfdfda6 Don't update follower counts on reblog toggle
7 years ago
Lynx Kotoura 37992a1012 Fix focused background color of direct toots (#5642)
7 years ago
aschmitz 2aedd8eaad "Show reblogs" per-follower UI/database changes
7 years ago
unarist 1cb6606055 Show confirmation dialog on leaving WebUI while composing (#5616)
7 years ago
nullkal 863958ce09 Eliminate space around emoji (#5474)
7 years ago
ThibG 4912f539c3 Twidere mention workaround (#5552)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
voidSatisfaction dc63306620 fix: slang to adequate word (#5453)
7 years ago
MIYAGI Hikaru 3506668438 Avoid emojifying on invisible text (#5558)
7 years ago
nullkal 64fbf1d6e5 Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160) (#5611)
7 years ago
kibigo! f9e8e1357e Mastodon GO! -> v0.1.1
7 years ago
kibigo! b0f88fbdc1 Autocollapse boosts option
7 years ago
MIYAGI Hikaru 70726e0f72 don't display any descendants of .invisible (#5567)
7 years ago
beatrix 0f6d6186b6 Merge pull request #204 from glitch-soc/with-mastodon-go
7 years ago
kibigo! 23a15bd315 Introducing: Mastodon GO!
7 years ago
Quenty31 b6f057365d l10n Occitan (#5586)
7 years ago
Sorin Davidoi 2c6bb251c5 refactor(features/ui): Avoid useless renders in WrappedSwitch (#5580)
7 years ago
Yamagishi Kazutoshi c858c1a2b8 Replace react-router-scroll to react-router-scroll-4 (#5568)
7 years ago
Nolan Lawson 4a7046e607 Refactor initial state: auto_play_gif (#5576)
7 years ago
Nolan Lawson b89628424d Refactor initial state: "me" (#5563)
7 years ago
SerCom_KC 282f0d7479 Updating Chinese (Simplified) translations (#5508)
7 years ago
Nolan Lawson aa85f4cf73 Avoid modifying emoji data inline (#5548)
7 years ago
Nolan Lawson 6c6c67b52b Add margin to account for Edge disappearing scrollbar (#5522)
7 years ago
Nolan Lawson fc075b16d9 Reactor unfollow_modal, boost_modal, delete_modal (#5505)
7 years ago
Herbert Kagumba c652eefd3c Separate Follow/Unfollow and back buttons (#5496)
7 years ago
Nolan Lawson 6a7deb8fc8 Avoid unnecessary Motion components in icon_button.js (#5544)
7 years ago
Nolan Lawson 7286e6dcf0 Directly use <Motion/> if not reducing motion (#5546)
7 years ago
Nolan Lawson 2085c1fa33 Refactor initial state: reduce_motion and auto_play_gif (#5501)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
7 years ago
Andrew 120fc4ef61 Theme: Windows 95
7 years ago
David Yip d3db08b69f Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
りんすき e6f7ccb786 Fix column design broken with very long title (#5493)
7 years ago
Nolan Lawson afe5176ee8 Remove translateZ(0) on modal overlay (#5478)
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Jenkins cfc46d7334 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Ratmir Karabut 51d4add08d Update Russian translation (#5517)
7 years ago
Olivier Nicole fe8646f078 Complete Esperanto translation (#5520)
7 years ago
Ondřej Hruška 77cad0daf0 option to add title to <Button>, use for toot buttons (#197)
7 years ago
David Yip 2b753ac54f Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Matthew Walsh 897931099c Changes to match other timelines in 2.0
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
Marcin Mikołajczak 67992e1b7e i18n: Update Polish Translation (#5494)
7 years ago
Ondřej Hruška 067e4e2404 Compose buttons bar redesign + generalize dropdown (#194)
7 years ago
kibigo! 9e2b6657c0 Updates to bio metadata script
7 years ago
Nolan Lawson 1a8b2157d0 Remove unnecessary translateZ(0) when doing scale() (#5473)
7 years ago
David Yip 8b8eeb0fbf Make the compose area optionally scrollable.
7 years ago
David Yip 2325bf7423 Merge pull request #185 from glitch-soc/fix-null-status
7 years ago
Ondřej Hruška 0a9b3b1415 formatting fix for eslint
7 years ago
David Yip 722fe5fda8 Remove unused filesAttached property.
7 years ago
David Yip c17395266c Update stylesheet imports in glitch components.
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Sho Kusano 85e47a4423 Suppress type error(not a function) on calling fastSeek (#5452)
7 years ago
Renato "Lond" Cerqueira a761e02bd1 Fix pt-BR translation strings related to advanced search. (#5449)
7 years ago
Technowix 8eea3bd6d8 Revert #5438 for FR (#5450)
7 years ago
Håkan Eriksson ecef91e5ca Some typos and supplementation in sentence structures (#5441)
7 years ago
JohnD28 8e386ca547 fr.json typo (realtive time) (#5447)
7 years ago
YaQ cd59b66680 Make theme directory and Rename application.scss (#5336)
7 years ago
Eugen Rochko 8eee4b3d35 When unreblog arrives over streaming API, just delete in UI (#5439)
7 years ago
JeanGauthier a18201f690 i18n better wording (OC/CA/FR) + string added in FR (#5438)
7 years ago
Nolan Lawson 845b2f4ad9 Fix scrolling of dropdown when offscreen (#5434)
7 years ago
Eugen Rochko 24155c5890 Fix unwanted content warning gap in CSS (#5436)
7 years ago
JeanGauthier e1efabf979 i18n update (#5427) in OC/CA/FR/ES (#5431)
7 years ago
unarist 90fb04f1bb Fix React warning about tabIndex on status with CW (#5432)
7 years ago
Jakob Kramer 15ae7fe6b2 Update German translation (#5425)
7 years ago
Yamagishi Kazutoshi d7063885bc Add Japanese translations (#5427)
7 years ago
Håkan Eriksson c06052b7cf Swedish translation (#5406)
7 years ago
Jeroen 289723dd1c Small update Dutch (nl) strings (#5424)
7 years ago
Ondřej Hruška 26b5013865 Fix dual toot button wrong behavior after compose re-design
7 years ago
Ondřej Hruška 57555bf432 workaround for null status
7 years ago
beatrix cda8575ae3 Merge pull request #184 from tootsuite/master
7 years ago
David Yip 02887e0953 Merge pull request #182 from glitch-soc/wide-tootbox-panel
7 years ago
Ondřej Hruška adec2b6716 satisfy eslint and jest
7 years ago
Ondřej Hruška c3ded60ec9 rem a comment
7 years ago
Ondřej Hruška f1d386a3ad double-decker tootbox
7 years ago
Ondřej Hruška 26e7e5f0ef fix some lint errors
7 years ago
Nolan Lawson d7b8208a37 Fix reduced motion breaking public galleries (#5423)
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Eugen Rochko 55642feb4b Filter out duplicate IDs in timelines reducer (#5417)
7 years ago
voidSatisfaction 7ae6d55b8a Add up-to-date korean translation on client (#5402)
7 years ago
KY e1357265ed Fix #5082 - disable retweet link for followers only toot (#5397)
7 years ago
Marcin Mikołajczak 8953c2a918 i18n: Update Polish translation (#5416)
7 years ago
JeanGauthier c102025e2c i18n ultim hour «More» dropdown title + reduce motion (#5415)
7 years ago
Yamagishi Kazutoshi dd505c5d8c Enable ESLint rules import/* (#5414)
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
Nolan Lawson a5d60195fc Fix offline-plugin warning in dev mode (#5411)
7 years ago
Yamagishi Kazutoshi fb5040885c Replace JavaScript Testing Framework from Mocha to Jest (#5412)
7 years ago
Nolan Lawson cb0c479fd4 i18n "More" dropdown title (#5410)
7 years ago
Nolan Lawson 0e9e72f228 Refactor and simplify icon_button.js (#5413)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip d199a8c612 Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
7 years ago
Matthew Walsh 078319992b 1.6 changed files for unified avatar styling -- updated to restore unity
7 years ago
David Yip b015ab4e94 Merge pull request #173 from glitch-soc/zerowidthmoji
7 years ago
Eugen Rochko 4a0367d04a Clear timer when unmounting RelativeTimestamp components (#5408)
7 years ago
JeanGauthier 2b099f9f2e l10n Occitan: finishing touches (#5404)
7 years ago
Yannick A c03e2d7c51 Update French translation (#5401)
7 years ago
Lynx Kotoura 9aacf21af7 Adjust public hashtag pages (#5357)
7 years ago
Ondřej Hruška b88cae6c6b replace newlines in desktop notif with spaces instead of removing them (#5361)
7 years ago
spla 9fc9d3554d Updated Catalan strings (#5323)
7 years ago
Yannick A 7b717319f6 Update French translation (#5384)
7 years ago
Masoud Abkenar 5c26c3062d l10n: update Persian translation for 2.0 (#5391)
7 years ago
Ondřej Hruška f92d0bbda4 Doodle improvements 2 (#176)
7 years ago
Jakob Kramer 2425ba45ae Update German translation (#5389)
7 years ago
Ondřej Hruška a438c1dc83 Doodle palette, options, fill tool (#172)
7 years ago
Ondřej Hruška 4eb270dd19 use zerowidth spaces for emojis
7 years ago
Ondřej Hruška 0cca5ac567 Fixed a bug where the canvas would get transparent bg upon erase
7 years ago
Ondřej Hruška f1f6d8220a Initial doodle support
7 years ago
Jeroen c07034708c Dutch strings: small change (#5375)
7 years ago
Eugen Rochko 284b078741 Do not try to guess why home timeline is empty in web UI (#5370)
7 years ago
Eugen Rochko bfc6479a96 When unfollowing, remove from home in web UI immediately (#5369)
7 years ago
ThibG 2e88988fce Reduce discrepancies between server and client-side character count (#5360)
7 years ago
Anna e só 02d14fd373 l10n: PT-BR translation updated (#5362)
7 years ago
Ondřej Hruška e960e2c1d2 Fix the notification bug with newlines
7 years ago
David Yip 227824429b Another tabs-vs-spaces fix, but with ~feeling~
7 years ago
Alda Marteau-Hardi dfde574160 Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)
7 years ago
David Yip 3cc091d374 Fix tabs-vs-spaces issue pointed out by eslint.
7 years ago
JeanGauthier 7c06e0af86 Update oc.json (#5343)
7 years ago
David Yip 7d0cf5a6a1 Merge tag 'v2.0.0rc2' into gs-master
7 years ago
Sylvhem ad4d5aaf96 Fixes and updates for the French translation (#5340)
7 years ago
Ondřej Hruška d08756cfc3 Fix our media gallery not having alt text and tooltips
7 years ago
Ondřej Hruška f8749b268c workaround for scrollIntoView bug ???
7 years ago
Ondřej Hruška 132a22ace5 Merge remote-tracking branch 'upstream/master'
7 years ago
Jeroen e3717ffadc Updating Dutch strings for 2.0 (#5334)
7 years ago
Alda Marteau-Hardi ae4345e6d4 Use gender neutral language as in the rest of the french translation (#5331)
7 years ago
Lynx Kotoura 75e036b493 Fix styles of error pages (#5335)
7 years ago
kibigo! 037d7478af Removed length check which now happens in reducer
7 years ago
kibigo! 215da1a03c Fixed header emojification
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
Eugen Rochko 794e015ea2 In thread view, only scroll first update, scroll to replied-to post (#5322)
7 years ago
Eugen Rochko 6e729f42c3 Fully disable hotkeys when input element is focused (#5324)
7 years ago
JohnD28 eacf9b9039 Update french translation : mastodon/locales/fr.json (#5318)
7 years ago
ButterflyOfFire ffe158fc96 Update ar.json (#5316)
7 years ago
unarist 2b29f5b5f1 Fix an error when ancestors get loaded before the status itself (#5312)
7 years ago
Eugen Rochko 6fc71ff7f2 Fix #5306: Stop hotkeys in input fields even when shift is pressed (#5309)
7 years ago
Eugen Rochko af93f234ab Fix #5293 - Pre-fill frequently used emojis to avoid bugs (#5305)
7 years ago
Eugen Rochko 4c6adaf4f4 Fix #5295 - Order custom emoji lexicographically (#5297)
7 years ago
unarist 9c448a0280 Fix an error when video playback buffer is empty (#5300)
7 years ago
Eugen Rochko 4a09a62f98 Center error layout (#5289)
7 years ago
Eugen Rochko f8ec132261 Track frequently used emojis in web UI (#5275)
7 years ago
Ondřej Hruška 2f8dc023a5 improve static page metadata look
7 years ago
JeanGauthier 5bff1ad44e i18n update Occitan (#5263)
7 years ago
Nolan Lawson 7a66400670 Video preload should be a string (#5267)
7 years ago
Nolan Lawson 7bde8dcc08 Use ES module build of react-router-dom (#5264)
7 years ago
Eugen Rochko 8279ea2f54 Dynamically calculate card height for embeds instead of padding (#5265)
7 years ago
Eugen Rochko 1e7e6413fc Show buffering in video player (#5261)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 519c4c446a Fix custom emoji in emoji picker, persist skin tone (#5258)
7 years ago
MitarashiDango b5aeaa395a Japanese translation (relative time) (#5251)
7 years ago
Nolan Lawson 14db4829dc Update emoji-mart to v2.1.1 (#5256)
7 years ago
Eugen Rochko b68aa42383 Fix regression from #5206 - deduplicate descendants (#5253)
7 years ago
kibigo! fb05013855 Basic static metadata styling
7 years ago
Eugen Rochko 11ceec2756 Make auto-play GIFs preference affect custom emojis in web UI (#5254)
7 years ago
Lynx Kotoura d33bc0c04f Fix overflowing in web UI (#5246)
7 years ago
K.SHIRAKASHI 31501f47c5 Fix error on reloading status detail column (#5248)
7 years ago
MIYAGI Hikaru a22adce069 Fix error at emoji_compressed in Firefox ESR (#5241)
7 years ago
Nolan Lawson 651aba0e12 Fix thinking_face emoji autocomplete (#5238)
7 years ago