1457 Commits (399af266e57f68377194922d1141ad675d2f4b0e)

Author SHA1 Message Date
Yamagishi Kazutoshi 238de58e65 Change belongs_to_required_by_default to true (#5888)
7 years ago
Marcin Mikołajczak 852b48295f i18n: Update Polish translation (#6297)
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira 59797ee233 Weblate translations (#6284)
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC fb16c37d2a Update Simplified Chinese translations (#6280)
7 years ago
Jeong Arm acb982fc66 Korean translate (#6277)
7 years ago
mayaeh eed7484cd6 Change mailer image url (#6279)
7 years ago
Eugen Rochko 02194838dd
HTML e-mails for NotificationMailer (#6263)
7 years ago
SerCom_KC 3323b4173e Change disclaimer in email according to #5817 (#6266)
7 years ago
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
7 years ago
Jenkins 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 537d2939b1 Suppress CSRF token warnings (#6240)
7 years ago
Jeong Arm dcc614f869 Add some browsers (#6246)
7 years ago
Eugen Rochko ed867eca9d
Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
7 years ago
Marcin Mikołajczak ee7217bc94 i18n: Update Polish translation
7 years ago
David Yip 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 921b781909
Increase rate limit on protected paths (#6229)
7 years ago
Evgeny Petrov eec6095e02 Russian language update (#6227)
7 years ago
Jenkins e780d5951b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 9f04b0d4b1 Weblate translations (#6228)
7 years ago
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC c4d36d024c Update Simplified Chinese translations (#6215)
7 years ago
beatrix-bitrot b75a1ce326 tighten csp
7 years ago
Jenkins f6adb409fd Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Naoki Kosaka 8d51ce4290 Fix enforce HTTPS in production. (#6180)
7 years ago
beatrix f41b33eb01
Merge pull request #243 from m4sk1n/glitch-pl
7 years ago
Yamagishi Kazutoshi 9a61b0ef22 Fix RFC 5646 Regular Expression (#6190)
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic d872902997 Small translation fixes for Serbian (and sr@Latn too) (#6188)
7 years ago
Marcin Mikołajczak c61dd918a2 i18n: Update Polish translation (#6176)
7 years ago
Marcin Mikołajczak 0f69a90588 i18n: Update Polish translation
7 years ago
muan 89daeb43a8 Improve Traditional Chinese translation (#6166)
7 years ago
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 d907d4352e l10n OC language (#6169)
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Marcin Mikołajczak 53d99ebf4f i18n: Update Polish translation (#6168)
7 years ago
Yamagishi Kazutoshi 1001922156
Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 04ecf44c2f Add confirmation step for email changes (#6071)
7 years ago
Branko Kokanovic 21b9da6418 Adding Serbian latin translations (#6146)
7 years ago
Jenkins fa9b7ece2e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 7d376e41be Adding Serbian translation (#6133)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Jeong Arm f4b80e6511 Translate Korean (#6131)
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
Jenkins 6d00ca1c71 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool 9592b5e31e enforce LOCAL_HTTPS=true in production (#6061)
7 years ago
beatrix 4d34b3495d
Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages
7 years ago
David Yip 00d1f8eea1
Remove themes.default from i18n-tasks unused check
7 years ago
David Yip a1ddc89da6
Remove unused themes.default key in ko locale.
7 years ago
Jenkins 6f11aa8383 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm e52293482e Update Korean translation (#6050)
7 years ago
Jenkins e7fa7fce25 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Peter f38e6a14f2 Add Slovak translation (#6052)
7 years ago
Jenkins 37254c4f5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 573414f728 Improve Chinese (Simplified) Translations (#6024)
7 years ago
Jeroen aa273a2718 Last minute Dutch string updates (#6025)
7 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 72314d26ae l10n OC and FR updates (#6017)
7 years ago
Olivier Humbert ad941f5a21 Update FR translation (#6012)
7 years ago
Eugen Rochko fef6625496
Weblate translations (#6011)
7 years ago
SerCom_KC 775c3056b6 Update Chinese (Simplified) translations (#6005)
7 years ago
Eugen Rochko ad75ec8b5b
Add filters to admin UI for custom emojis (#6003)
7 years ago
Yamagishi Kazutoshi 6855baa0c5 Change streaming API URL when remote development (#5942)
7 years ago
Eugen Rochko 20a6584d2d
Clean up admin UI for accounts (#6004)
7 years ago
Eugen Rochko 81923f88ba Shorten English title for 2FA to avoid line-break (#6001)
7 years ago
Quenty31 0370ba7b0a Update: #5985 and #5817 (#5996)
7 years ago
SerCom_KC 2a61b9f000 Update Chinese (Simplified) translations (#5991)
7 years ago
beatrix 504c3d650f
Merge pull request #264 from KnzkDev/add-ja
7 years ago
David Yip be33247235
Remove themes.default from nl and pt-BR locales.
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
ncls7615 c0c4526283 add ja for fav conf
7 years ago
Eugen Rochko 30d2ea03b0
Improve public status page title (#5985)
7 years ago
Eugen Rochko 1356ed72cd
Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Quenty31 c588fcf4bc Tiny little change (#5981)
7 years ago
kibigo! 8aa527434c Fixed index in webpack config
7 years ago
ncls7615 d8206d1931 add ja
7 years ago
Eugen Rochko feed07227b
Apply a 25x rate limit by IP even to authenticated requests (#5948)
7 years ago
kibigo! dabf66e676 Moved flavour UI into own prefs tab
7 years ago
Sylvhem 84d5bfb35e Change the disclaimer under the sign up form (#5817)
7 years ago
cwm 072ab191cc pulled master, moved locale entry to new location
7 years ago
kibigo! 64b839b769 Removed MORE theme localizns
7 years ago
kibigo! 6b7085a33e Linting fixes
7 years ago
kibigo! b28cd6769c Javascript intl8n flavour support
7 years ago
kibigo! 8394430081 Removed unused theme localization key
7 years ago
kibigo! d08d0f9f33 Ruby intl8n for themes
7 years ago
goofy-bz 2950de86c6 Update devise.fr.yml (#5963)
7 years ago
Quenty31 7d4ebeecbd l10n i18n OC: corrections (#5962)
7 years ago
Yamagishi Kazutoshi 6e3f176b8e Add Galician language support (#5955)
7 years ago
ButterflyOfFire 0f8140d26a Create activerecord.ar.yml (#5951)
7 years ago
cwm fbd2a0127c ran i18n-tasks normalize for simple_form.en.yml
7 years ago
cwm abe95b614b add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko a72d03f43c
Weblate translations (#5946)
7 years ago
Naoki Kosaka 4bce376fdc Missing require 'authorization_decorator'. (#5947)
7 years ago
Eugen Rochko a865b62efc
Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
SerCom_KC 84cebad49d Update Chinese (Simplified) translations (#5937)
7 years ago
Quenty31 3a52c90de1 l10n i18n OC update (#5939)
7 years ago
THE BOSS ♨ 17e26f8afe Fix typo in paperclip.rb (#5936)
7 years ago
Eugen Rochko 2f4c5f504f
Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Yamagishi Kazutoshi b0db4dad79 Revert fog-aws (ref #5604) (#5934)
7 years ago
Jenkins 776867ea73 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko bca9e2e57a
Weblate translations (#5922)
7 years ago
kibigo! 753535c3c7 Fixed webpack skin folder globbing
7 years ago
SerCom_KC 7fcf15adf3 Improve Chinese (Simplified) translations (#5911)
7 years ago
Quenty31 7445f17571 OC language update (#5905)
7 years ago
Jenkins c63e6c9a2c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
beatrix 81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
nightpool 9302369aa5 fix weblate for ja (#5906)
7 years ago
David Yip f1cbea77a4
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
NCLS fde91988ab
Update ja.yml
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak a0047fdca0 i18n: 🇵🇱 (#5903)
7 years ago
Eugen Rochko 42bcbd36b7 Remove rabl dependency (#5894)
7 years ago
SerCom_KC 12cea76634 Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849)
7 years ago
kibigo! 5bed0f10ed Various fixes
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 1c74ede69e Fixed a name + localizations
7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
Jenkins 933eafdcd3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh 51f2eca887 Add Japanese translations for invite filter. (#5869)
7 years ago
Marcin Mikołajczak b15482ce71 i18n: 🇵🇱 (#5865)
7 years ago
Yamagishi Kazutoshi 74320971e2 Add invite filter (#5862)
7 years ago
kibigo! 541fe9b110 Skins support
7 years ago
Jenkins d020ed1e05 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak 82ab9736d5 i18n: 🇵🇱 (#5851)
7 years ago
mayaeh a62039df27 Update Japanese translations. (#5844)
7 years ago
David Yip 3614912be2
Normalize pl translation.
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 15fab79cfa Show "expired" in invite index (#5838)
7 years ago
nullkal 1b57d4dd3a Fix account migration feature (#5837)
7 years ago
Marcin Mikołajczak d937a59997 i18n: 🇵🇱 (#5841)
7 years ago
David Yip 7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
David Yip 8bad6bdd00
Normalize config/locales/en.yml.
7 years ago
Eugen Rochko 706e534455
Add UI for setting up account migration (#5832)
7 years ago
Jenkins 63d47e04c4 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh c6b7c77229 i18n: Update ja translation for consumable invites. (#5829)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 5de42665d7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
spla d07983b56d Updated Catalan strings (#5801)
7 years ago
Jenkins 86f4f8e158 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 662b8eefe8 Change navigation link for moderators (#5812)
7 years ago
mayaeh 7a45d382ea i18n: Update ja translations (#5804)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
Jenkins 41c71565c2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC bc4a726c24 i18n: (zh-CN) Add translations for #5746 & #5735 (#5764)
7 years ago
kibigo! 8812bab687 Minor fixes
7 years ago
Jenkins 2a5af9c10c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh fc2155019b Add Japanese translations. (#5769)
7 years ago
Marcin Mikołajczak 1a07b83c69 i18n: Update Polish translation - back-end (#230)
7 years ago
Joan Montané 53b7b81b43 Update and fix Catalan translation (#5773)
7 years ago
kibigo! bdbbd06dad Finalized theme loading and stuff
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
mayaeh 08deec4c84 i18n: Update ja translation for moderator badge. (#5731)
7 years ago
Lynx Kotoura 3d1d3d9a20 Remove translations of default theme (#5741)
7 years ago
Yamagishi Kazutoshi bfdcf76a64 Add “staff” badge to admin user pages (#5735)
7 years ago
beatrix bcda3f85ce
Merge pull request #226 from glitch-soc/glitch-theme
7 years ago
Marcin Mikołajczak b380e9d2cb i18n: Update Polish translation (#5749)
7 years ago
Eugen Rochko 58cede4808
Profile redirect notes (#5746)
7 years ago
Jenkins eed50514be Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 6be72a3ec6 Updating Chinese (Simplified) translations (#5725)
7 years ago
kibigo! a618df7998 Sets default theme to glitch
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
kibigo! 585758a373 Themed prefetching
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi dc6e031364 Redirect to reports when moderator (#5733)
7 years ago
Eugen Rochko 2151fd3150
Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
mayaeh f6bc6399e2 Add Japanese translation for DM block option. (#5704)
7 years ago
Eugen Rochko 546257bc7f Allow specifying STATSD_NAMESPACE (#5700)
7 years ago
Eugen Rochko fbef909c2a
Add option to block direct messages from people you don't follow (#5669)
7 years ago
SerCom_KC c3ec1e87b8 Updating Chinese (Simplified) translations (#5643)
7 years ago
Marcin Mikołajczak 8087aa83d4 i18n: Update Polish translation (#5699)
7 years ago
mayaeh 249b0fe107 Add Japanese translations for moderator roles and its own admin actions. (#5689)
7 years ago
Marcin Mikołajczak a6682a3000 i18n: fix typo in Polish translation (#5688)
7 years ago
Anna e só 0e6c4cb796 l10n: PT-BR translation updated (#5681)
7 years ago
KEINOS 252d0fe020 Fix #5652 - Notify too short when abbrev in JA (#5664)
7 years ago
Marcin Mikołajczak fcb9533549 i18n: Update Polish translation (for #5635) (#5661)
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Matt e5aa4128f6 Update en.yml (#5648)
7 years ago
Marcin Mikołajczak cfd7b7a0b7 i18n: Update Polish translation (#5639)
7 years ago
nullkal 36376b5e23 Translate ja (#5637)
7 years ago
Quenty31 eb97bd8af6 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
MitarashiDango cbbeec05be Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)
7 years ago
nullkal b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
Yamagishi Kazutoshi 47b0c61853 Unify file upload to using fog (#5604)
7 years ago
Marcin Mikołajczak d48779cf7b i18n: Improve Polish translation (#5596)
7 years ago
Yamagishi Kazutoshi 8a588145d5 Update extract-text-webpack-plugin to version 3.0.2 (#5584)
7 years ago
beatrix 254b74c71f
add memorial to production.rb
7 years ago
Quenty31 da3adc0a73 l10n Occitan (#5586)
7 years ago
MitarashiDango 38d072446b add account search condition (instance domain) (#5577)
7 years ago
Yamagishi Kazutoshi 8ae9bd0eea Upgrade compression-webpack-plugin to version 1.0.1 (#5581)
7 years ago
Nolan Lawson 0692991b54 Add ServiceWorker caching for static assets (#5524)
7 years ago
Yamagishi Kazutoshi a2a4bf4e78 Update dependencies for Ruby (2017-10-30) (#5566)
7 years ago
SerCom_KC 29609fbb6a Updating Chinese (Simplified) translations (#5508)
7 years ago
Alda Marteau-Hardi 4080569c2d Fix a grammatical error in the notifications. (#5555)
7 years ago
Marcin Mikołajczak 2cbb8e8cd1 i18n: Update Polish translation (#5547)
7 years ago
Akihiko Odaki e4080772b5 Use contenthash for ExtractTextWebpackPlugin (#5462)
7 years ago
David Yip 870d71b78b Merge branch 'master' into gs-master
7 years ago
nullkal 781105293c Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Jenkins 5f0268ab84 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Ratmir Karabut 20fee786b1 Update Russian translation (#5517)
7 years ago
Anna e só 74777599cf l10n: PT-BR translation updated (#5530)
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip 1a60445a5f Address unused translation errors.
7 years ago
David Yip cd04e3df58 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 2e03a10059 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip 4fa2f7e82d Set up /settings/keyword_mutes. #164.
7 years ago
David Yip 42e8c8eb0e Merge tag 'v2.0.0' into gs-master
7 years ago
Håkan Eriksson c710069c12 Some typos and supplementation in sentence structures (#5441)
7 years ago
Jeroen 363d0d3a44 Dutch: A few strings I found last minute (#5440)
7 years ago
JeanGauthier 33ea042dec i18n better wording (OC/CA/FR) + string added in FR (#5438)
7 years ago
Jakob Kramer e6c9756fa9 Update German translation (#5425)
7 years ago
Yamagishi Kazutoshi 5050719fac Add Japanese translations (#5427)
7 years ago
Yamagishi Kazutoshi 989553c69a Normalize locale files (#5429)
7 years ago
masarakki 0e0c6b1b4b use-DB_NAME-in-development (#5430)
7 years ago
Håkan Eriksson a2b600428c Swedish translation (#5406)
7 years ago
Jeroen df1a9c5ab5 Small update Dutch (nl) strings (#5424)
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Marcin Mikołajczak 3c530d95f6 i18n: Update Polish translation (#5416)
7 years ago
JeanGauthier 1e7b3bf625 i18n ultim hour «More» dropdown title + reduce motion (#5415)
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
voidSatisfaction 3e2f793948 Add up-to-date korean translation on serverside (#5400)
7 years ago
JeanGauthier 8eb7d30a6c l10n Occitan: finishing touches (#5404)
7 years ago
Yannick A 7fe1428cc4 Update French translation (#5401)
7 years ago
spla f63a40e7c2 Updated Catalan strings (#5323)
7 years ago
Yannick A c6f76db2e1 Update French translation (#5384)
7 years ago
Masoud Abkenar 2c704ca9c6 l10n: update Persian translation for 2.0 (#5391)
7 years ago
Mathias B c1a2707ecf Correct some misspellings (#5381)
7 years ago
Anna e só ad917cda10 l10n: PT-BR translation updated (#5362)
7 years ago
Jeroen f398ad1994 Updating more Dutch strings for 2.0 (#5359)
7 years ago
Alda Marteau-Hardi 3cfcc7a50e Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)
7 years ago
JohnD28 691e9112f3 Update fr.yml (#5330)
7 years ago
David Yip 13e05fece2 Merge tag 'v2.0.0rc2' into gs-master
7 years ago
Marcin Mikołajczak 9d84b6e606 i18n: Update Polish translation (#5346)
7 years ago
JeanGauthier bf0f7e8846 Moderation notes (#5344)
7 years ago
nullkal 4817744b87 Update ja.yml (#5342)
7 years ago
Sylvhem 3ebe03b729 Fixes and updates for the French translation (#5340)
7 years ago
kibigo! 8d6b9ba494 Merge upstream 2.0ish #165
7 years ago