1561 Commits (bf1d3ae3b83726816c78ca6cb40af24d48390bd9)

Author SHA1 Message Date
luzi82 24611d8deb i18n: update zh-HK translation (#7004)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
luzi82 993ce0e5a7 improve zh-HK localization by referring zh-TW and zh-CN (#6988)
7 years ago
David Yip d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Akihiko Odaki ca42f9b0eb Cache media (#6902)
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak 85a395fab6 i18n: Update Polish translation (#6903)
7 years ago
Yamagishi Kazutoshi 28384c1771 Revert "Revert "Upgrade Paperclip to version 6.0.0" (#6807)" (#6808)
7 years ago
Akihiko Odaki fa310695fa Note if the user is already following the target when authorizing follow (#6325)
7 years ago
Jeroen 580835ab69 Invites: Add '1 week' as expire option (#6872)
7 years ago
Yamagishi Kazutoshi 65c10c0bc8 Weblate translations (2018-03-23) (#6874)
7 years ago
Jenkins 03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quentí ecdc5957a3 [i18n] Occitan update (#6869)
7 years ago
Jenkins e8aeec4fea Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ac49c7932d
Add LDAP_TLS_NO_VERIFY option, don't require LDAP_ENABLED outside .env (#6845)
7 years ago
Akihiko Odaki 61dcb686a8 Fix i18n fallback configuration conflicts with environment configurations (#6843)
7 years ago
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 33ee347c99 rename pam email environment variable to something more understandable and default to LOCAL_DOMAIN (better fallback) (#6833)
7 years ago
Alexander 0306e3e9be bugfixes and gem update (#6831)
7 years ago
Renato "Lond" Cerqueira f7c46fc113 Weblate translations 20180319 (#6827)
7 years ago
David Yip ab04be2f84
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko a568e3ca8e
Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)
7 years ago
Eugen Rochko 40871caa4b
Revert "Upgrade Paperclip to version 6.0.0" (#6807)
7 years ago
Yamagishi Kazutoshi b88fcd53f7 Upgrade Paperclip to version 6.0.0 (#6754)
7 years ago
Jenkins d75a6054a0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 03119c857b Weblate translations (2018-03-13) (#6777)
7 years ago
David Yip f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 8b14726f5b Weblate translations (2018-03-11) (#6742)
7 years ago
Jenkins e553905ba7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 4c16ddf588 Change avatar size on form hints (#6707)
7 years ago
Renato "Lond" Cerqueira 5ba4c36f95 Weblate translations (2018-03-09) (#6708)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 5acd5315f2
Improve styling of closed registrations message, rename button (#6695)
7 years ago
Yamagishi Kazutoshi 1085ef3836 Weblate translations (2018-03-08) (#6690)
7 years ago
Effy Elden dd9d00d293 Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)
7 years ago
Sylvhem cb74c0cfe4 Add headings to the security settings page (#6661)
7 years ago
Renato "Lond" Cerqueira bd40574476 Weblate translations (05-03-2018) (#6640)
7 years ago
Marcin Mikołajczak 3b2e783c1f i18n: Update Polish translation (#6632)
7 years ago
Akihiko Odaki c110fa62ac Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Akihiko Odaki 51d760960c Set the default locale in config (#6580)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
Jeong Arm c82a2358bd Translate Korean (#6608)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi ecf06d7e82 Change "or" translatable (#6597)
7 years ago
Alexander 42fe05dea1 fix logic for pam_controlled_service (#6599)
7 years ago
Yamagishi Kazutoshi 0963b6fd22 Weblate translations (2018-03-02) (#6588)
7 years ago
mayaeh e7d741ece3 i18n: Update Japanese translations (#6581)
7 years ago
Marcin Mikołajczak 51b7a22ea7 i18n: Update Polish translation (#6578)
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
beatrix 4072b68686 remove Uglifier call from production.rb (#6568)
7 years ago
imncls 041df1a5a7
i18n normalize data
7 years ago
Ian McCowan c33931b613 Fix prev/next links on public profile page (#6497)
7 years ago
imncls e591b3fe38
Add missing Japanese translate
7 years ago
Akihiko Odaki 2e8a492e88 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
mayaeh 4d8c0d9959 i18n: Update Japanese translations (#6550)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec e668180044 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Marcin Mikołajczak 3e46f12340 i18n: Update Polish translation (#6539)
7 years ago
Ghislain Loaec 3084fe4959 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Eugen Rochko a7171af0a3
Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Eugen Rochko 02856073f7
Fix #6509: Use pull queue for chewy jobs (#6513)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 9b8a448477 Isolate each specs for cache store (#6450)
7 years ago
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Simó Albert i Beltran c770b503c0 Fix Spanish translation of remote_follow acct (#6475)
7 years ago
Simó Albert i Beltran ffdf0f2ff6 Fix Catalan translation of remote_follow acct (#6476)
7 years ago
Eugen Rochko 9dbae6e8a1
Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Marcin Mikołajczak ba8ec4eed6 i18n: Update Polish translation (#6470)
7 years ago
Jenkins e9052ceaaf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 6ef3874b2e Fix URLs incorrectly having trailing hyphen removed (#6465)
7 years ago
Eugen Rochko e20700fe8f
Fix Chewy trying to update index with the wrong strategy (#6464)
7 years ago
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
7 years ago
David Yip b8efc3fc0b
Normalize simple_form.en.yml.
7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 76f3d5d16b
Add preference to always display sensitive media (#6448)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 38e0133e1b
Make PAM gem optional, allow configuration over environment (#6415)
7 years ago
Renato "Lond" Cerqueira 4e4f1b0dcb Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
7 years ago
beatrix fa361ccc5e
change referrer policy to same-origin
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 04fef7b888 pam authentication (#5303)
7 years ago
Jenkins ad3a2dfb66 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Evgeny Petrov 3ed194b67d Russian language updated (#6397)
7 years ago
David Yip f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 97dcfb0f50
ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)
7 years ago
Renato "Lond" Cerqueira 106efba800 Weblate translations (#6370)
7 years ago
Quenty31 bd8d8ad894 l10n Occitan update (#6367)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 7650506b39 l10n Occitan language update (#6346)
7 years ago
Eugen Rochko b1daa71da5
Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)
7 years ago
Renato "Lond" Cerqueira b7f6ddeaf1 Weblate translations (#6323)
7 years ago
Jeong Arm 143fb54ab9 Korean translation (#6322)
7 years ago
David Yip 48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
Norayr Chilingarian 48cd6dc6ca armenian translations initial commit (#6320)
7 years ago
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
ThibG d613dda91d Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
SerCom_KC 80b3ca0f6f Update Simplified Chinese translations (#6306)
7 years ago
Eugen Rochko 872a0d5bd8
Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
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