1932 Commits (619d55358f5e6ee98760cdbdc8f9452209c55139)

Author SHA1 Message Date
Yamagishi Kazutoshi aff19f5f10 Change avatar size on form hints (#6707)
7 years ago
Renato "Lond" Cerqueira 48b2a6f08d Weblate translations (2018-03-09) (#6708)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f67fe3ebe8 Improve styling of closed registrations message, rename button (#6695)
7 years ago
Yamagishi Kazutoshi b2b7333b26 Weblate translations (2018-03-08) (#6690)
7 years ago
Effy Elden 4a8046df66 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 18d4e03e6b Add headings to the security settings page (#6661)
7 years ago
Renato "Lond" Cerqueira 1f328e22a0 Weblate translations (05-03-2018) (#6640)
7 years ago
Marcin Mikołajczak 6fee779fa6 i18n: Update Polish translation (#6632)
7 years ago
Akihiko Odaki 649565e005 Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Akihiko Odaki 008bc9f47d Set the default locale in config (#6580)
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
Jeong Arm 58d54489c6 Translate Korean (#6608)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 1fad0489eb Change "or" translatable (#6597)
7 years ago
Alexander 988f6505e4 fix logic for pam_controlled_service (#6599)
7 years ago
Yamagishi Kazutoshi 38f0d2f88b Weblate translations (2018-03-02) (#6588)
7 years ago
mayaeh 6b751679b5 i18n: Update Japanese translations (#6581)
7 years ago
Marcin Mikołajczak a6d10b05f6 i18n: Update Polish translation (#6578)
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
beatrix caa0e2e2f8 remove Uglifier call from production.rb (#6568)
7 years ago
imncls 76aef54e8e i18n normalize data
7 years ago
Ian McCowan 88461c1abe Fix prev/next links on public profile page (#6497)
7 years ago
imncls 76e0b69e02 Add missing Japanese translate
7 years ago
Akihiko Odaki a5a434a8f6 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
mayaeh 8995e9238a i18n: Update Japanese translations (#6550)
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec d1806f5dc4 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Marcin Mikołajczak 21da2f420e i18n: Update Polish translation (#6539)
7 years ago
Ghislain Loaec deea524052 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Eugen Rochko c34ff9fb82 Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Eugen Rochko 2815ef6d7f Fix #6509: Use pull queue for chewy jobs (#6513)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki ca6c8b92d9 Isolate each specs for cache store (#6450)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Simó Albert i Beltran 056f153077 Fix Spanish translation of remote_follow acct (#6475)
7 years ago
Simó Albert i Beltran 23089a38ee Fix Catalan translation of remote_follow acct (#6476)
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Marcin Mikołajczak 0ce908b3e0 i18n: Update Polish translation (#6470)
7 years ago
Jenkins bcd435effe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 845ea13622 Fix URLs incorrectly having trailing hyphen removed (#6465)
7 years ago
Eugen Rochko cd925c11e3 Fix Chewy trying to update index with the wrong strategy (#6464)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip 7d67b36ba0 Normalize simple_form.en.yml.
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 555e7205da Make PAM gem optional, allow configuration over environment (#6415)
7 years ago
Renato "Lond" Cerqueira 6528c0c101 Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
beatrix d3e325e047 change referrer policy to same-origin
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
Jenkins 52d4b56065 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Evgeny Petrov 950689c381 Russian language updated (#6397)
7 years ago
David Yip 87517e2dd8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9c212f0f28 ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372)
7 years ago
Renato "Lond" Cerqueira f9708e4cb4 Weblate translations (#6370)
7 years ago
Quenty31 1eaa2ead85 l10n Occitan update (#6367)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 cd18b23226 l10n Occitan language update (#6346)
7 years ago
Eugen Rochko 8f60c22ba4 Fix #6311: Replace relative URLs in CSS only for Premailer (#6335)
7 years ago
Renato "Lond" Cerqueira 11f970da4d Weblate translations (#6323)
7 years ago
Jeong Arm e96b90c274 Korean translation (#6322)
7 years ago
David Yip db052e79ad Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
Norayr Chilingarian 62e47f7041 armenian translations initial commit (#6320)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
ThibG 55567d05b2 Fix assets loading when WEB_DOMAIN ≠ LOCAL_DOMAIN (#6319)
7 years ago
David Yip 03f157f6da Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
SerCom_KC d26ae4a147 Update Simplified Chinese translations (#6306)
7 years ago
Eugen Rochko 896cadceed Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
7 years ago
Marcin Mikołajczak a34f6ba630 i18n: Update Polish translation (#6297)
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Renato "Lond" Cerqueira 4f86722a65 Weblate translations (#6284)
7 years ago
Jenkins 8c41fb4acc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 350f65a6ef Update Simplified Chinese translations (#6280)
7 years ago
Jeong Arm 6892cca838 Korean translate (#6277)
7 years ago
mayaeh ef20e5d3fd Change mailer image url (#6279)
7 years ago
Eugen Rochko 000b0baac2 HTML e-mails for NotificationMailer (#6263)
7 years ago
SerCom_KC 172a88c444 Change disclaimer in email according to #5817 (#6266)
7 years ago
David Yip de7283a318 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 9613c3238c HTML e-mails for UserMailer (#6256)
7 years ago
Jenkins 6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 2a27afc656 Suppress CSRF token warnings (#6240)
7 years ago
Jeong Arm a12834a2c0 Add some browsers (#6246)
7 years ago
Eugen Rochko 67ee638c28 Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
7 years ago
Marcin Mikołajczak 6be6f6f5bd i18n: Update Polish translation
7 years ago
David Yip 1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko b7b0f630a0 Increase rate limit on protected paths (#6229)
7 years ago
Evgeny Petrov 223be1e1b2 Russian language update (#6227)
7 years ago
Jenkins a6ef3cde8e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 164ec8297f Weblate translations (#6228)
7 years ago
Jenkins 1f469edac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko c8f0be1d6d Revert #5772 (#6221)
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 154bd8db56 Update Simplified Chinese translations (#6215)
7 years ago
beatrix-bitrot 6a5b778bb8 tighten csp
7 years ago
Jenkins 86007e913d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Naoki Kosaka 3bc13de62f Fix enforce HTTPS in production. (#6180)
7 years ago
beatrix 06a32b2621 Merge pull request #243 from m4sk1n/glitch-pl
7 years ago
Yamagishi Kazutoshi 0fa691d2a9 Fix RFC 5646 Regular Expression (#6190)
7 years ago
Jenkins 796a39a283 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic fb3a2ddd24 Small translation fixes for Serbian (and sr@Latn too) (#6188)
7 years ago
Marcin Mikołajczak 1f2034932b i18n: Update Polish translation (#6176)
7 years ago
Marcin Mikołajczak 1ba0732b82 i18n: Update Polish translation
7 years ago
muan 22e3acfd56 Improve Traditional Chinese translation (#6166)
7 years ago
Jenkins a7b8cb9493 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 bd82de325e l10n OC language (#6169)
7 years ago
Akihiko Odaki 7a0479c830 Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Marcin Mikołajczak b83fb8b107 i18n: Update Polish translation (#6168)
7 years ago
Yamagishi Kazutoshi d50d61a90c Add Japanese translations #5997, #6003, #6004, #6071, #6099, #6125 and #6132 (#6167)
7 years ago
Jenkins b42e6973a1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 3c20cfd734 Add confirmation step for email changes (#6071)
7 years ago
Branko Kokanovic 1c4142da5b Adding Serbian latin translations (#6146)
7 years ago
Jenkins 5975446002 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Branko Kokanovic 34a90dc266 Adding Serbian translation (#6133)
7 years ago
David Yip 01f91695f5 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Jeong Arm fc8c2c9b4a Translate Korean (#6131)
7 years ago
Eugen Rochko 9427823d5c Add more instance stats APIs (#6125)
7 years ago
Jenkins 9ccad78647 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool e921778dd3 enforce LOCAL_HTTPS=true in production (#6061)
7 years ago
beatrix 894e9747b7 Merge pull request #274 from glitch-soc/fix-packs-on-2fa-pages
7 years ago
David Yip 136bc872b3 Remove themes.default from i18n-tasks unused check
7 years ago
David Yip df1478e313 Remove unused themes.default key in ko locale.
7 years ago
Jenkins 034617cac1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 7df9864429 Update Korean translation (#6050)
7 years ago
Jenkins 9dd76b5b41 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Peter c9c63c2232 Add Slovak translation (#6052)
7 years ago
Jenkins 601f0fe4a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 19a2ed9a04 Improve Chinese (Simplified) Translations (#6024)
7 years ago
Jeroen 0cadfd35a5 Last minute Dutch string updates (#6025)
7 years ago
Jenkins 1366e96a02 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quenty31 10c0745c8f l10n OC and FR updates (#6017)
7 years ago
Olivier Humbert 9b24e2ef34 Update FR translation (#6012)
7 years ago
Eugen Rochko d4d0befb4b Weblate translations (#6011)
7 years ago
SerCom_KC 9bef4eb4c0 Update Chinese (Simplified) translations (#6005)
7 years ago
Eugen Rochko d6088c5308 Add filters to admin UI for custom emojis (#6003)
7 years ago
Yamagishi Kazutoshi 9dcead778c Change streaming API URL when remote development (#5942)
7 years ago
Eugen Rochko aea3d0814b Clean up admin UI for accounts (#6004)
7 years ago
Eugen Rochko 4e780addd3 Shorten English title for 2FA to avoid line-break (#6001)
7 years ago
Quenty31 84de19e1fd Update: #5985 and #5817 (#5996)
7 years ago
SerCom_KC e6bed2dd1e Update Chinese (Simplified) translations (#5991)
7 years ago
beatrix 82ec368680 Merge pull request #264 from KnzkDev/add-ja
7 years ago
David Yip ec9670a306 Remove themes.default from nl and pt-BR locales.
7 years ago
David Yip a56c9ac5dc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
ncls7615 a559a2cc9d add ja for fav conf
7 years ago
Eugen Rochko d5f4baf720 Improve public status page title (#5985)
7 years ago
Eugen Rochko 7f286d1af0 Fix #5953 - Add GET /api/v1/accounts/:id/lists (#5983)
7 years ago
Quenty31 f75a91716b Tiny little change (#5981)
7 years ago
kibigo! 1d7b78817a Fixed index in webpack config
7 years ago
ncls7615 96a7247e9c add ja
7 years ago
Eugen Rochko 31fe0d067b Apply a 25x rate limit by IP even to authenticated requests (#5948)
7 years ago
kibigo! 901c08a999 Moved flavour UI into own prefs tab
7 years ago
Sylvhem e38b8c980f Change the disclaimer under the sign up form (#5817)
7 years ago
cwm 34630e00cb pulled master, moved locale entry to new location
7 years ago
kibigo! ea3154176e Removed MORE theme localizns
7 years ago
kibigo! b27126f1d6 Linting fixes
7 years ago
kibigo! 99e8710095 Javascript intl8n flavour support
7 years ago
kibigo! f0c12b28fd Removed unused theme localization key
7 years ago
kibigo! f4c233f59f Ruby intl8n for themes
7 years ago
goofy-bz 9becc9b0fe Update devise.fr.yml (#5963)
7 years ago
Quenty31 7f56924d71 l10n i18n OC: corrections (#5962)
7 years ago
Yamagishi Kazutoshi 07030db7ad Add Galician language support (#5955)
7 years ago
ButterflyOfFire d095955705 Create activerecord.ar.yml (#5951)
7 years ago
cwm 38a5aa6c9e ran i18n-tasks normalize for simple_form.en.yml
7 years ago
cwm 41bbfeec7c add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko 2a8ab39a06 Weblate translations (#5946)
7 years ago
Naoki Kosaka 77660c4624 Missing require 'authorization_decorator'. (#5947)
7 years ago
Eugen Rochko 87af0bf6cf Rate limit by user instead of IP when API user is authenticated (#5923)
7 years ago
SerCom_KC b14983a2a4 Update Chinese (Simplified) translations (#5937)
7 years ago
Quenty31 5c12b555b4 l10n i18n OC update (#5939)
7 years ago
THE BOSS ♨ 33b40397f8 Fix typo in paperclip.rb (#5936)
7 years ago
Eugen Rochko f16141ebac Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Yamagishi Kazutoshi f76681ebd6 Revert fog-aws (ref #5604) (#5934)
7 years ago
Jenkins c6572ed6c8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko bcba7bba2d Weblate translations (#5922)
7 years ago
kibigo! e614dc144e Fixed webpack skin folder globbing
7 years ago
SerCom_KC d0875b6a93 Improve Chinese (Simplified) translations (#5911)
7 years ago
Quenty31 57e0d88c19 OC language update (#5905)
7 years ago
Jenkins 33fc1fbe2a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
beatrix f0b37f92a9 Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
nightpool df636e03c8 fix weblate for ja (#5906)
7 years ago
David Yip bb1b4b2967 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
NCLS 1ad81d38a6 Update ja.yml
7 years ago
Jenkins a3a7b6a848 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak e3422e363b i18n: 🇵🇱 (#5903)
7 years ago
Eugen Rochko b037fbf9f4 Remove rabl dependency (#5894)
7 years ago
SerCom_KC 125ad3e931 Update Chinese (Simplified) translations for version 2.1.0rc1 (#5849)
7 years ago
kibigo! fd7be49523 Various fixes
7 years ago
David Yip 1221e3075d Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! 935946020f Fixed a name + localizations
7 years ago
kibigo! 882055afd0 Rename themes -> flavours ? ?
7 years ago
Jenkins 822dea26c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh ce44b3b17a Add Japanese translations for invite filter. (#5869)
7 years ago
Marcin Mikołajczak c2f8e326cc i18n: 🇵🇱 (#5865)
7 years ago
Yamagishi Kazutoshi 1447ef1d44 Add invite filter (#5862)
7 years ago
kibigo! 36b9f4df56 Skins support
7 years ago
Jenkins e8446e3724 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak b95f1b130a i18n: 🇵🇱 (#5851)
7 years ago
mayaeh 598be148e7 Update Japanese translations. (#5844)
7 years ago
David Yip cad2e7773c Normalize pl translation.
7 years ago
David Yip a1d9c68198 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi d6846dce20 Show "expired" in invite index (#5838)
7 years ago
nullkal 35e3791ba4 Fix account migration feature (#5837)
7 years ago
Marcin Mikołajczak 5f51992e16 i18n: 🇵🇱 (#5841)
7 years ago
David Yip bc10a0dced Merge remote-tracking branch 'tootsuite/master'
7 years ago
David Yip bc9fd8e05a Normalize config/locales/en.yml.
7 years ago
Eugen Rochko 55d9abcceb Add UI for setting up account migration (#5832)
7 years ago
Jenkins 36452d6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh 37f152b347 i18n: Update ja translation for consumable invites. (#5829)
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
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 6a6e49d032 Change navigation link for moderators (#5812)
7 years ago
mayaeh 9a930c0623 i18n: Update ja translations (#5804)
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
Jenkins 96302f7fd4 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC 97bb620b48 i18n: (zh-CN) Add translations for #5746 & #5735 (#5764)
7 years ago
kibigo! eadf1c38a5 Minor fixes
7 years ago
Jenkins a2e4d79b1c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
mayaeh 9841d20c97 Add Japanese translations. (#5769)
7 years ago
Marcin Mikołajczak 00be86c25d i18n: Update Polish translation - back-end (#230)
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
mayaeh 52111769d0 i18n: Update ja translation for moderator badge. (#5731)
7 years ago
Lynx Kotoura 8a8bea2e53 Remove translations of default theme (#5741)
7 years ago
Yamagishi Kazutoshi bffc1b880b Add “staff” badge to admin user pages (#5735)
7 years ago
beatrix 34ba45e47c Merge pull request #226 from glitch-soc/glitch-theme
7 years ago
Marcin Mikołajczak 1f5f446f08 i18n: Update Polish translation (#5749)
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! b8fdcfd55e Sets default theme to glitch
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
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
Yamagishi Kazutoshi b80a35092e Redirect to reports when moderator (#5733)
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
mayaeh 7ffee9cc9d Add Japanese translation for DM block option. (#5704)
7 years ago
Eugen Rochko a71791e3f1 Allow specifying STATSD_NAMESPACE (#5700)
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
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
mayaeh 5aca968bb7 Add Japanese translations for moderator roles and its own admin actions. (#5689)
7 years ago
Marcin Mikołajczak 57ea54ba00 i18n: fix typo in Polish translation (#5688)
7 years ago
Anna e só c4c9003f84 l10n: PT-BR translation updated (#5681)
7 years ago
KEINOS e6285715d1 Fix #5652 - Notify too short when abbrev in JA (#5664)
7 years ago
Marcin Mikołajczak df48eaec32 i18n: Update Polish translation (for #5635) (#5661)
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
Matt 826dc9ee46 Update en.yml (#5648)
7 years ago
Marcin Mikołajczak 5e43ce1fcb i18n: Update Polish translation (#5639)
7 years ago
nullkal a12cc41dd4 Translate ja (#5637)
7 years ago
Quenty31 a7db7bdd96 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
MitarashiDango 7a5fb781ce Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
Yamagishi Kazutoshi a624688ebd Unify file upload to using fog (#5604)
7 years ago
Marcin Mikołajczak a0e1e14a90 i18n: Improve Polish translation (#5596)
7 years ago
Yamagishi Kazutoshi f0d800d9a9 Update extract-text-webpack-plugin to version 3.0.2 (#5584)
7 years ago
beatrix 0daa95befb add memorial to production.rb
7 years ago
Quenty31 b6f057365d l10n Occitan (#5586)
7 years ago
MitarashiDango 3068add21d add account search condition (instance domain) (#5577)
7 years ago
Yamagishi Kazutoshi 395a88eb5d Upgrade compression-webpack-plugin to version 1.0.1 (#5581)
7 years ago
Nolan Lawson ba22580c06 Add ServiceWorker caching for static assets (#5524)
7 years ago
Yamagishi Kazutoshi 10b30bd94e Update dependencies for Ruby (2017-10-30) (#5566)
7 years ago
SerCom_KC 282f0d7479 Updating Chinese (Simplified) translations (#5508)
7 years ago
Alda Marteau-Hardi 29559b2e7a Fix a grammatical error in the notifications. (#5555)
7 years ago
Marcin Mikołajczak dc5053109b i18n: Update Polish translation (#5547)
7 years ago
Akihiko Odaki 38d5aa3073 Use contenthash for ExtractTextWebpackPlugin (#5462)
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
beatrix ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute
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
Anna e só 93255b003f l10n: PT-BR translation updated (#5530)
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip 4ab1534f6c Address unused translation errors.
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 018657a0e0 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Håkan Eriksson ecef91e5ca Some typos and supplementation in sentence structures (#5441)
7 years ago
Jeroen 6235b8a8b1 Dutch: A few strings I found last minute (#5440)
7 years ago
JeanGauthier a18201f690 i18n better wording (OC/CA/FR) + string added in FR (#5438)
7 years ago
Jakob Kramer 15ae7fe6b2 Update German translation (#5425)
7 years ago
Yamagishi Kazutoshi d7063885bc Add Japanese translations (#5427)
7 years ago
Yamagishi Kazutoshi 5e6b51e2c9 Normalize locale files (#5429)
7 years ago
masarakki f76a224328 use-DB_NAME-in-development (#5430)
7 years ago
Håkan Eriksson c06052b7cf Swedish translation (#5406)
7 years ago
Jeroen 289723dd1c Small update Dutch (nl) strings (#5424)
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
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
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
voidSatisfaction 23dad325da Add up-to-date korean translation on serverside (#5400)
7 years ago
JeanGauthier 2b099f9f2e l10n Occitan: finishing touches (#5404)
7 years ago
Yannick A c03e2d7c51 Update French translation (#5401)
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
Mathias B 1df10e26a8 Correct some misspellings (#5381)
7 years ago
Anna e só 02d14fd373 l10n: PT-BR translation updated (#5362)
7 years ago
Jeroen 682bf2d624 Updating more Dutch strings for 2.0 (#5359)
7 years ago
Alda Marteau-Hardi dfde574160 Fix some consistance errors in gender neutral formulations. Add some missing ones. (#5350)
7 years ago
JohnD28 77cd62882b Update fr.yml (#5330)
7 years ago
David Yip 7d0cf5a6a1 Merge tag 'v2.0.0rc2' into gs-master
7 years ago
Marcin Mikołajczak b9eb3c264b i18n: Update Polish translation (#5346)
7 years ago
JeanGauthier 60152a421a Moderation notes (#5344)
7 years ago
nullkal 38e5d51b42 Update ja.yml (#5342)
7 years ago
Sylvhem ad4d5aaf96 Fixes and updates for the French translation (#5340)
7 years ago
kibigo! 02827345ae Merge upstream 2.0ish #165
7 years ago
JohnD28 c66403114c Update doorkeeper.fr.yml (#5317)
7 years ago
Nolan Lawson 82ff80dbad Remove prop types from external libraries (#5304)
7 years ago
Jakob Kramer d24ea1df74 Update German translation (#5302)
7 years ago
Jeong Arm a5582bf9f5 Remove timestamps on any option (#5282)
7 years ago
unarist 12bdbf38ba Fix migration failure due to StrongMigrations on production env (#5283)
7 years ago
Eugen Rochko 007fce8c10 Set snowflake IDs for backdated statuses (#5260)
7 years ago
m4sk1n d9e51960a2 i18n: Update Polish translation (#5270)
7 years ago
Jeong Arm 094616ad3f Translate some Esperanto (#5252)
7 years ago
JeanGauthier 5bff1ad44e i18n update Occitan (#5263)
7 years ago
Nolan Lawson 7bde8dcc08 Use ES module build of react-router-dom (#5264)
7 years ago
DJ Sundog c3e5510289 adding support for audio uploads, transcoded to mp4 videos
7 years ago
nullkal 81489970fb Add moderation note (#5240)
7 years ago
Eugen Rochko b98cd0041b Redesign public hashtag pages (#5237)
7 years ago
Eugen Rochko 60925ce0ae Encode custom emojis as resolveable objects in ActivityPub (#5243)
7 years ago
Jeong Arm 9ea15ab021 Korean translation (#5244)
7 years ago
m4sk1n 84780cbd96 i18n: Update Polish translation (#5255)
7 years ago
Eugen Rochko 27fd33256c Clean up code style of Mastodon::TimestampId module (#5232)
7 years ago
Eugen Rochko b4af50c521 Improve admin UI for custom emojis, add copy/disable/enable (#5231)
7 years ago
Lynx Kotoura 4e822d41b9 adjust public profile pages 2 (#5223)
7 years ago
Jakob Kramer 53105c4210 Update German translation (#5221)
7 years ago
utam0k 51f8cbfbeb Implement EmailBlackList (#5109)
7 years ago
Yamagishi Kazutoshi 6bd4e3bf97 Separate notifications preferences from general preferences (#4447)
7 years ago
aschmitz 4f7aa88461 Configure webpack to poll for changes in development (#5040)
7 years ago
Yamagishi Kazutoshi f7d7a92d57 Add missing Japanese translations (#5193)
7 years ago
Jakob Kramer 902e249cdb Update German translation (#5189)
7 years ago
m4sk1n 17bcb30c82 i18n: Update translation files and Polish translation (#5180)
7 years ago
Jeong Arm ee21576c19 Korean translation (#5185)
7 years ago
JeanGauthier 941a1532f2 l10n Update OC: reorganization pref. page (#5168)
7 years ago
Eugen Rochko 06ef1b0ac4 Reorganize preferences page (#5161)
7 years ago
Eugen Rochko 5983fa43f5 Fix #5104 - GET /api/v1/apps/verify_credentials to confirm app works (#5112)
7 years ago
roikale 4f18c27c43 Change wording on landing page. (#4805)
7 years ago
Nishi, Keisuke 8f344b7bb0 Fix Paperclip::Fog always responds Not Found in OpenStack-v2 like ConoHa (#5155)
7 years ago
Jakob Kramer 6f2a885ea3 Updated German translation (#5151)
7 years ago
Yanaken e65378e808 Better Japanese translations (#5142)
7 years ago
Eugen Rochko 6033b8eac1 Replace self-rolled statsd instrumention with localshred/nsa (#5118)
7 years ago
Jakob Kramer d55a6ae28a Update German translation (#5133)
7 years ago
JeanGauthier 0f0791c563 OC 500 error (#5110)
7 years ago
Eugen Rochko 795e624d5d Add ability to specify alternative text for media attachments (#5123)
7 years ago
Ondřej Hruška 282a126b3f Merge remote-tracking branch 'origin/better-themeing' into merging-upstream
7 years ago
Ondřej Hruška 0cc795db6b Merge commit '9ab3021562565eeee27820438f32b764414f5ab1' into merging-upstream
7 years ago
Ondřej Hruška 914c0465b1 Merge commit '57c5493d4e7a42ad9e8fec20d71c20bee8674287' into merging-upstream
7 years ago
Eugen Rochko 7031e350b3 When OAuth password verification fails, return 401 instead of redirect (#5111)
7 years ago
Yamagishi Kazutoshi 12b7306a03 Upgrade Webpacker to version 3.0.1 (#5122)
7 years ago
m4sk1n 7291f1de08 i18n: Update Polish translation (#5106)
7 years ago
kibigo! cae9e7ab76 Fixed webpack config code
7 years ago
kibigo! aac16a82d6 Better themeing support!!
7 years ago
Eugen Rochko 10a2b3dd4c Follow-up to #4582 and #5027, removing dead code (#5101)
7 years ago
Eugen Rochko 1767f9817c New error page graphic. Other error page improvements (#5099)
7 years ago
Eugen Rochko 6b0ea1e79c Generate 500.html with assets:precompile, remove loading from Google Fonts (#5067)
7 years ago
Eugen Rochko 65827bd2b4 Add strong_migrations gem to warn when creating unsafe migrations (#5078)
7 years ago
Eugen Rochko f621e05356 New API: GET /api/v1/custom_emojis to get a server's custom emojis (#5051)
7 years ago
Lynx Kotoura 88fd9f47fd Fix theme translations alphabetically (#5031)
7 years ago
Eugen Rochko f8e734ff9a Disable private status federation over OStatus (#5027)
7 years ago
Lynx Kotoura 42bacb1e30 Better Japanese translations (#5030)
7 years ago
mayaeh 0e9e5e0317 Add Japanese translations for multiple themes, custom emoji (#5026)
7 years ago
JeanGauthier acfb7a463e l10n Occitan: theme site, custom emoji, Oauth, newcomers follow admins, ... (#5023)
7 years ago
mayaeh d8a459820c Add japanese translations for custom emoji. (#5007)
7 years ago
m4sk1n 816175a1fb i18n: Update Polish translation (#5015)
7 years ago
Andrew b4842ef0b9 Add support for multiple themes (#4959)
7 years ago
Eugen Rochko e9bb7e62b1 Admin interface for listing, adding and removing custom emojis (#5002)
7 years ago
Eugen Rochko 327d21b8a4 Run i18n-tasks normalize (#5003)
7 years ago
BruWalfas f4d0774877 A few updates to the Spanish translation and some typos fixing (#4997)
7 years ago
unarist 938a99c89d Re-allow underscore on valid_url_path_ending_chars (#4999)
7 years ago
Lynx Kotoura 8585421eb1 Oauth code in input form and add description message (#4986)
7 years ago
Patrick Figel dde43a9e32 Randomize sidekiq-scheduler cron schedule (#4980)
7 years ago
Mingye Wang 9b85c3a13f Minor Chinese check & jsx addition (#4973)
7 years ago
Eugen Rochko 26c797bf0d When accessing uncached media attachment, redownload it (#4955)
7 years ago
Anna e só 584d2d8e02 l10n: PT-BR translation updated (#4953)
7 years ago
sdukhovni 1fb5e3b009 Add scheduled worker to purge old user IPs (#4951)
7 years ago
Yamagishi Kazutoshi 175c2a9df2 Add missing Japanese translations (#4947)
7 years ago
ふぁぼ原 c71727ca55 Enable to recognize most kinds of characters as URL paths (#4941)
7 years ago
Masoud Abkenar d08cf543a3 l10n: update Persian translation (#4946)
7 years ago
abcang 579a7c2654 Revert unique retry job (#4937)
7 years ago
m4sk1n 4d80e3c550 i18n: Update Polish translation (#4942)
7 years ago
Jeroen 8cd10e7df6 Another Dutch language update (#4944)
7 years ago
Quent-in 6279f70e60 l10n update OC/FR video redesign (#4938)
7 years ago
N氏 3d5170251e Add Japanese translate for #4913 (#4936)
7 years ago
Surinna Curtis 2bd218dfdb Add a /api/v1/mutes/details route that just returns the array of mutes.
7 years ago
Eugen Rochko 9ff429aa6d Uploads for admin site settings (#4913)
7 years ago
m4sk1n 5bcb431a46 i18n: Update Polish translation (#4929)
7 years ago
Jeroen 00b28a45b0 Updating Dutch translation (#4927)
7 years ago
Eugen Rochko a47a5ab5cd Fix #4918 - Limit pinned toots to 5 (#4923)
7 years ago
unarist 94fdf7da70 Add section for protocol specific information on the admin page (#4910)
7 years ago
Patrick Figel 759bbdd9ca Add OpenStack Keystone V3 support (#4889)
7 years ago
Anna e só d639474d8c l10n: Full PT-BR translation (#4882)
7 years ago
Masoud Abkenar 04183a9675 l10n: update Persian translation (#4880)
7 years ago
David Yip f90abccf33 Merge tag 'v1.6.0' into sync/upstream
7 years ago
m4sk1n 127d51bda7 i18n: Update Polish translation (#4881)
7 years ago
yoshipc 92bdd78105 Fix Japanese translation (#4876)
7 years ago
Eugen Rochko 6628ea4a82 Default follows for new users (#4871)
7 years ago
David Yip 017738c604 Merge tag 'v1.6.0rc4' into sync/upstream-1.6.0rc4
7 years ago
Yamagishi Kazutoshi 4c0a563c0c Set fallback address when empty notification address (#4868)
7 years ago
David Yip 67d9178007 Merge tag 'v1.6.0rc3' into sync/upstream
7 years ago
David Yip da3f22ee7d Merge branch 'origin/master' into sync/upstream
7 years ago
m4sk1n 1a4beb3122 i18n: Update Polish translation (#4845)
7 years ago
abcang 0080804f44 Enable UniqueRetryJobMiddleware even when called from sidekiq worker (#4836)
7 years ago
Masoud Abkenar add644eeb0 i18n: update Persian translation (#4822)
7 years ago
Adam Thurlow 57a821d4b9 swift-enable the paperclip! 📎 (#2322)
7 years ago
abcang 892aeb7ffe Do not execute the job with the same arguments as the retry job (#4814)
7 years ago
voidSatisfaction 7fc797da23 Translation korean added (#4802)
7 years ago
ButterflyOfFire f4d6ec8562 Update ar.yml (#4810)
7 years ago
Eugen Rochko 411183520b Fix short number locales (#4790)
7 years ago
Andreas Drop 20c0118cad Make german translation more gender neutral #4755 (#4789)
7 years ago
Quent-in 8d459da1f8 l10n Occitan update for Embed, cancel follow request, ... (#4788)
7 years ago
m4sk1n e472b79b1e i18n: Improve Polish translation (#4783)
7 years ago
Yamagishi Kazutoshi 3f517186b3 Add Japanese translate for #4561 (#4771)
7 years ago
Eugen Rochko 068bdd4c24 Use updated ActivityStreams context (added: sharedInbox) (#4764)
7 years ago
m4sk1n 186416830e Add link to 'noscript' message (#4561)
7 years ago
Eugen Rochko e9e271878e Make PreviewCard records reuseable between statuses (#4642)
7 years ago
Damien Erambert ce91ed1322 Update FR locales (#4714)
7 years ago
Eugen Rochko 2bbb10a186 Refactor Web::PushSubscription, remove welcome message (#4524)
7 years ago
Eugen Rochko ad769409f7 Embed modal (#4748)
7 years ago
Eugen Rochko 1b20fe79b4 Add sharedInbox to actors (#4737)
7 years ago
Eugen Rochko 651c659fd6 Update status embeds (#4742)
7 years ago
Lynx Kotoura 67223002d8 Add japanese translations for shorten display of large numbers (#4722)
7 years ago
Eugen Rochko 007d26852d Shorten display of large numbers on public profiles (#4711)
7 years ago
mayaeh 9b75d0e730 Add japanese translations for Pinned statuses based on pawoo. (#4717)
7 years ago
Eugen Rochko 5147147da9 Add handling of Linked Data Signatures in payloads (#4687)
7 years ago
Quent-in 9e60ec3c7d i18n Updated strings (#4675 - pinned toot) (#4695)
7 years ago
m4sk1n 8728b1b7c1 i18n: Update Polish translation #4675 (#4692)
7 years ago
Eugen Rochko 3e20cb7025 Pinned statuses (#4675)
7 years ago
Yamagishi Kazutoshi 9d1019bded Disable babel-loader cache when development environment (#4684)
7 years ago
Eugen Rochko cab7fa158a Add configuration to disable private status federation over PuSH (#4582)
7 years ago
Quent-in 62d93b1215 l18n update OC new strings (#4664) (#4680)
7 years ago
m4sk1n 9cfe449c6d Update Polish translation (#4674)
7 years ago
Yamagishi Kazutoshi ff62a8e3ee Add Japanese translations for #2758, #4506, #4521, #4600 and #4664 (#4665)
7 years ago
unarist 8a090910c8 Fix Japanese translation (#4669)
7 years ago
Eugen Rochko b13501268f Fix up the applications area (#4664)
7 years ago
Colin Mitchell 63b98318c5 Application prefs section (#2758)
7 years ago
Yamagishi Kazutoshi 9f95da9393 Add delete account link for French (#4659)
7 years ago
Eugen Rochko 0268b334ae Periodically remove expired PuSH subscribers (#4654)
7 years ago
m4sk1n cbc3b13ef6 i18n: Minor changes in Polish translation (#4649)
7 years ago
Quent-in 8aa84cc69e l10n update OC : Redesign public profiles (#4608) (#4646)
7 years ago
Naoki Kosaka 8308a51654 Update Japanese Translation. (Redesign public profiles) (#4612)
7 years ago
m4sk1n cf1d082be0 i18n: Update Polish translation (#4613)
7 years ago
Eugen Rochko 2dba0368f8 Redesign public profiles (#4608)
7 years ago
Quent-in 8e5ac13996 Update ActivityPub (#4600) (#4609)
7 years ago
unarist 40ec0f45fb Update /admin/accounts/:id view for ActivityPub (#4600)
7 years ago
Eugen Rochko 0e5c8372e7 Add protocol handler. Handle follow intents (#4511)
7 years ago
Eugen Rochko 1c7cbbcb8c Set correct content-type for ActivityPub JSON (#4592)
7 years ago
Eugen Rochko 506508f30c Extend Devise remember_me longevity to 1 year instead of 2 weeks (#4587)
7 years ago
Sylvhem 1263c0a60a Minor fixes in the French translation (#4580)
7 years ago
Quent-in 0aba3f01db l10n Update OC #4521 (#4577)
7 years ago
spla 039ea81acd Added new catalan strings (#4574)
7 years ago
m4sk1n 34c0f39d72 i18n: Improve admin panel translation (pl) (#4559)
7 years ago
Eugen Rochko f18739fd60 Add ActivityPub inbox (#4216)
7 years ago
unarist 527eacf403 Add Content-Type header on throttled response to fix mojibake (#4558)
7 years ago
Ondřej Hruška 913dd13575 Merge remote-tracking branch 'upstream/master'
7 years ago
m4sk1n f127f72d44 It makes no sense to try using invalid or expired link again (#4521)
7 years ago
m4sk1n 8e80cea3e4 i18n: Update Polish translation (#4545)
7 years ago
Masoud Abkenar 50c089d5ca i18n: update Persian translation (#4540)
7 years ago
Komic ef3c046936 Fix #4531 (#4533)
7 years ago
Komic 9003065063 fr.yml update (#4531)
7 years ago
Daigo 3 Dango 3f59c8a7d1 Translate 'Signed in as' into Japanese (#4530)
7 years ago
Quent-in 74eba690f9 l10n OC - Added #4523 "signed in as" (#4529)
7 years ago
Eugen Rochko fd69694749 Add "signed in as" header to some pages (#4523)
7 years ago
Quent-in aa1772de1e l10n update Occitan (#4522)
7 years ago
Krzysztof Jurewicz e55ecdf48f Fix some mistakes in Polish translation (#4495)
7 years ago
Eugen Rochko 33985f8020 Ignore some locale keys that can but do not need to be translated (#4515)
7 years ago
Jeroen fea7c275b2 Dutch strings: typo (#4489)
7 years ago
m4sk1n 45ed3ef755 i18n: Update Polish translation (#4479)
7 years ago
Yamagishi Kazutoshi 581f8b2909 Enable cache for babel-loader (#4505)
7 years ago
nullkal 62b92a4c0a Redirect to PasswordController#new when reset_password_token is invalid (#4506)
7 years ago
asria-jp 6bb6c2393b Update Japanese Translation (authorize_follow) (#4481)
7 years ago
kibigo! 2cdee6ae8a Merge upstream (#111)
7 years ago
Masoud Abkenar 755a7f2646 i18n: update Persian translation (#4470)
7 years ago
unarist 15a8d9b0ca Make salutation of email localizable (#4454)
7 years ago
Gô Shoemake 58446d39d8 Multiple frontend support (#110)
7 years ago
unarist a3df68eea8 Update Japanese translations (#4453)
7 years ago
Jeroen 4162b7e772 Dutch: Small fix (#4441)
7 years ago
Quent-in 321162b983 i18n update of OC version (#4425)
7 years ago
m4sk1n 24ec1e69b3 i18n: Update Polish translation (#4414)
7 years ago
Yamagishi Kazutoshi f61858281c Remove hash from chunk filename when dev env (#4411)
7 years ago
Sorin Davidoi 56c021c349 feat(web_push_notifications): Group notifications (#4388)
7 years ago
Eugen Rochko 3360187a90 Fix #3189 - Share CSRF secret between main app and Sidekiq Web (#4383)
7 years ago
Satoshi KOJIMA c6344547a3 fix #4356 : place sw.js to assets/sw.js (#4357)
7 years ago
Ratmir Karabut 400cdcd839 Update Russian translation (#4407)
7 years ago
Yamagishi Kazutoshi 839e1f911d Add default settings for user (#4393)
7 years ago
m4sk1n 346faaec2b s/PubSubHubbub/WebSub/g (#4372)
7 years ago
Ondřej Hruška 7072288bcf Merge git://github.com/tootsuite/mastodon into tootsuite-master
7 years ago
Clworld d4e188a3fb Update Japanese translations for landing page (for Mobile). (#4362)
7 years ago
Jeroen 1c9aac4878 Update and (almost) completing Dutch strings for 1.5 (#4351)
7 years ago
Petko Bordjukov dffb999070 Update Capistrano lock version in config/deploy.rb (#4352)
7 years ago
m4sk1n 46d52a9d85 i18n: @e43e0e9 (pl) (#4340)
7 years ago
Eugen Rochko fae1d9052b Redesign /terms page (#4338)
7 years ago
Eugen Rochko 97dda48f70 Move clean up of unconfirmed users to sidekiq-scheduler (#4336)
7 years ago
Eugen Rochko e43e0e959c Redesign extended information page (#4322)
7 years ago
Eugen Rochko d44456be73 Run i18n-tasks normalize (#4335)
7 years ago
sdukhovni 961f103c35 Allow domain blocks that only reject media without silencing or suspending (#4325)
7 years ago
Yamagishi Kazutoshi c946795bc3 Redirect user profile page to short URL when HTML format (#4328)
7 years ago
m4sk1n 9be9227c38 i18n: Update Polish translation (#4327)
7 years ago
Yamagishi Kazutoshi ec335a5128 Change about_mastodon to about_mastodon_html for all locales (#4326)
7 years ago
Yamagishi Kazutoshi 0e677c278d Update Japanese translations for #4313 and #4315 (#4323)
7 years ago
Eugen Rochko cdaf19daeb Improve noscript message and style (#4315)
7 years ago
Quent-in f62d565969 i10n Update for Occitan (#4301)
7 years ago
Eugen Rochko 9f232204b8 Run yarn run manage:translations and i18n-tasks normalize (#4302)
7 years ago
Ondřej Hruška 1dda0acdcb Merge pull request #92 from tootsuite/master
7 years ago
Damien Erambert 70d4d90813 Update French locales (settings, ToS, & co) (#4261)
7 years ago
Sylvhem e1257c78e6 Mise à jour de la traduction de la page d’accueil (#4294)
7 years ago
beatrix-bitrot 8deb2072ef Merge that good fresh upstream shit
7 years ago
Eugen Rochko f3e8fca1a7 Fix sessions being replaced needlessly (#4292)
7 years ago
Ondřej Hruška 87d95a1eb5 New notification cleaning mode (#89)
7 years ago
beatrix ae0c744619 disable about page timeline
7 years ago
Eugen Rochko 9d8d1d90e0 Add button to re-subscribe to all accounts from a domain (#4285)
7 years ago
beatrix 64a107bc64 Merge pull request #87 from tootsuite/master
7 years ago
m4sk1n 0add7e293f i18n: @9392d10 (pl) (#4266)
7 years ago
Damien Erambert d367c3ce41 fix missing closing <p> tag in ToS in en.yml (#4262)
7 years ago
m4sk1n 383c438a44 Fix missing closing <p> tag in ToS in .yml files (#4264)
7 years ago
Yamagishi Kazutoshi 9392d10250 Add feature to revoke sessions (#4259)
7 years ago
Eugen Rochko 3852032953 Correct OStatus inflection (Ostatus -> OStatus) (#4255)
7 years ago
kibigo! 0b64d60988 Fix for stylesheet split
7 years ago
Surinna Curtis 6311bfb8ff Add sourceRoot/includePaths to loaders
7 years ago
lindwurm b8db4f786a Update Japanese translation (chase #4249) (#4251)
7 years ago
m4sk1n 03644ac855 i18n: Update Polish translation (#4252)
7 years ago
Ondřej Hruška ed6c60a0c2 Merge changes from upstream with the CSS reload fix
7 years ago
lindwurm 7c0b509ba9 Update Japanese translations for new landing page (#4159)
7 years ago
unarist d7388f7314 Add Japanese translation for #4199 (#4247)
7 years ago
Yamagishi Kazutoshi 87bb16a236 Add unfollow modal (optional) (#4246)
7 years ago
abcang e3251e74c1 Improve admin page (#4121)
7 years ago
Ondřej Hruška 713938f266 Updated from tootsuite
7 years ago
m4sk1n 1630f8d58c i18n: update (pl) (#4233)
7 years ago
Eugen Rochko 49ef5145ea Add SMTP_TLS variable for configuring TLS when server uses non-standard port (#4227)
7 years ago
unarist f32c437a41 Don't mention default post privacy on hints for locked accounts (#4222)
7 years ago
Ondřej Hruška 02f16aea28 split added glitch locales from vanilla (#82)
7 years ago
kibigo! f48f42598f Merge upstream (#81)
7 years ago
Eugen Rochko c99f41dc3c Improve ActivityPub representations (#3844)
7 years ago
Ondřej Hruška 1eeead616d Added buttons and menu items to dismiss individual notifications (#76)
7 years ago
Eugen Rochko 7d8fd050eb Add option to opt out of search engines on public profile/status pages (#4199)
7 years ago
m4sk1n 0ae3d1d613 i18n: fediwers › fediwersum (pl) (#4198)
7 years ago
Albert ARIBAUD 6d21e8e230 fr: replace "silencer" with "masquer" throughout (#4197)
7 years ago
Yamagishi Kazutoshi 7be29a500d Add Rake task for generate VAPID key (#4195)
7 years ago
Yamagishi Kazutoshi 9669dc86f4 Add Japanese translations for #3243 (#4192)
7 years ago
Sorin Davidoi ecab38fd66 Web Push Notifications (#3243)
7 years ago
m4sk1n a5ea495c96 i18n: @49026e2, @8abeec1 + consistency improvement (pl) (#4171)
7 years ago
Yamagishi Kazutoshi 8589baa709 Add Japanese translations for #4163 and #4129 (#4166)
7 years ago
Yamagishi Kazutoshi 6738130153 Fix broken terms for Japanese (#4170)
7 years ago
kibigo! bcc30c8697 Merge upstream!! #64 <3 <3
7 years ago
Eugen Rochko 8abeec1f4f Improve UI of admin site settings (#4163)
7 years ago
Eugen Rochko 49026e27e8 Redesign the landing page, mount public timeline on it (#4122)
7 years ago
m4sk1n 9c1608a585 i18n: @098eef3 (pl) (#4144)
7 years ago
Eugen Rochko fb7fcebb2b Fix #4059 - Remove ModuleConcatenationPlugin (#4139)
7 years ago
STJrInuyasha 098eef3211 Remote following success page (#4129)
7 years ago
m4sk1n fdd9d8eecf i18n: @865f517 (pl) (#4143)
7 years ago
Yamagishi Kazutoshi 1a946c1362 Add Japanese translations (#4140)
7 years ago
のら 682d93a869 Add Japanese translation of terms and flash (#4137)
7 years ago
Yamagishi Kazutoshi 2cd7d15620 Fix regular expression for RFC 5646 (regression from #3604) (#4133)
7 years ago
Yamagishi Kazutoshi 865f5170a8 Add setting a always mark media as sensitive (#4136)
7 years ago
Sadiq Saif 4ab5c475a9 Change default for auto_play_fit to false for a11y (#4132)
7 years ago
m4sk1n 69fdf093d8 i18n: minor change (pl) (#4124)
7 years ago
Jeroen 01b589522e Update and improvement Dutch language strings (#4117)
7 years ago
Sylvhem 9f5ab101ee Various fixes in the French translation (#4107)
7 years ago
Eugen Rochko 0217e15dd3 Fix #4058 - Use a long-lived cookie to keep track of user-level sessions (#4091)
7 years ago
m4sk1n 3c60334a17 i18n: improve consistency (pl) (#4104)
7 years ago
m4sk1n 890cc25491 i18n: @387de88 (pl) (#4101)
7 years ago
Yamagishi Kazutoshi 46a69513d4 Add recursive object support to API response (#4095)
7 years ago
Akihiko Odaki (@fn_aki@pawoo.net) 9669f065af Set default From address in config (#3756)
7 years ago
Damien Erambert 387de88e2f Add a setting allowing the use of system's default font in Web UI (#4033)
7 years ago
Quent-in 8ea261cc38 l10n Occitan locale (#4089)
7 years ago
m4sk1n 2a41e5c9f2 i18n: minor changes in Polish translation (#4087)
7 years ago
m4sk1n 26ba9a9ca5 i18n: Updated Polish translation (#4068)
7 years ago
Gyuhwan Park bdafdcc924 i18n: Update korean translation (#4066)
7 years ago
Minori Hiraoka 1dd11f7f1a Fix Korean translation (#4065)
7 years ago
Gyuhwan Park 9296aedfd8 i18n: Add korean translation (#4064)
7 years ago
Yamagishi Kazutoshi 68abc90aec Customizable privacy policy from admin interface (#4062)
7 years ago
のら 8442a1ae31 Update Japanese translation (#4051)
7 years ago
Ratmir Karabut 48e8f704c8 Update Russian translation (sessions) (#4041)
7 years ago
Damien Erambert 21239abcf4 Update French locales (#4034)
7 years ago
unarist 03d1dc655d Update Japanese translation (Credentials -> Security) (#4025)
7 years ago
Nolan Lawson 144d13eb48 Fix webpack-dev-server on Windows (#4000)
7 years ago
Yamagishi Kazutoshi 7700d71f1e Add Japanese translations (#3985)
7 years ago
m4sk1n c7c8e145bd i18n: added email to activerecord.pl.yml (#3981)
8 years ago
m4sk1n 0e81dda101 i18n: Minor fix in devise.pl.yml (#3978)
8 years ago
beatrix-bitrot cdcb74ffb6 Merge remote-tracking branch 'upstream/master'
8 years ago
m4sk1n e88228f0eb i18n: E-mail notifications to admins about new reports (pl) (#3975)
8 years ago
Eugen Rochko d0221b05bc Fix #1624 - Send e-mail notifications to admins about new reports (#3949)
8 years ago
m4sk1n 196bd78b60 i18n: Updated Polish translation (#3956)
8 years ago
m4sk1n f37382eb68 i18n: Warning to look into the spam folder (pl) (#3955)
8 years ago
Alda Marteau-Hardi 103f87f9ae Translate pin/unpin and fix some inconsistencies in gender neutral strings (#3952)
8 years ago
Eugen Rochko b90a44b6d0 Fix #3910 - Require OTP authentication to disable 2FA (#3935)
8 years ago
Eugen Rochko ad531f90b1 Bind web UI access tokens to sessions (#3940)
8 years ago
amazedkoumei b686b4350c fix unnecessary variable (#3947)
8 years ago
Eugen Rochko 7814133f0a Rename "Credentials" page to "Security" for clarity (#3941)
8 years ago
amazedkoumei a1fd5d7f61 more free pgconfig by .env (#3909)
8 years ago
Eugen Rochko c465c5b3a8 Add overview of active sessions (#3929)
8 years ago
unarist 7968c69df4 Fix react-intl/locale-data import issue on production build (#3937)
8 years ago
unarist 741fd15f4e Fix webpack config for Windows (#3926)
8 years ago
Charlotte Fields a7a7613e71 cybre cleanup
8 years ago
Chronister 2edadd7fe7 All cybrespace changes through 5/28
8 years ago
beatrix-bitrot 4f54d53a84 update local modifications for cors and cp
8 years ago
Beatrix Bitrot 6a5afc6fe8 CORS tweaks
8 years ago
Sorin Davidoi 1280559503 Revocable sessions (#3616)
8 years ago
Nolan Lawson 9c246cac5c Apply babel to react-intl to remove prop-types (#3914)
8 years ago
Nolan Lawson 61634505c1 Upgrade to Webpack 3 with module concatenation (#3912)
8 years ago
Ratmir Karabut d9eeb1340d Update Russian translation (#3902)
8 years ago
Quent-in b0debe35d6 Update of doorkeeper.oc.yml (#3896)
8 years ago
m4sk1n 3c355ed26b i18n: Fixed typo in Polish translation (#3864)
8 years ago
のら 8b65b64428 Add Japanese translation "Action taken by" (#3850)
8 years ago
masarakki d947978192 setting-for-account-deletable (#3852)
8 years ago
Yamagishi Kazutoshi 0a2e331bd5 Re-add disableHostCheck (regression #3729) (#3854)
8 years ago
spla 7a96f422db Added new Catalan strings (#3843)
8 years ago
Eugen Rochko 8bed91d94c Rename FollowRemoteAccountService to ResolveRemoteAccountService (#3847)
8 years ago
Yamagishi Kazutoshi dece663cd0 Upgrade Webpacker to version 2.0 (#3729)
8 years ago
Quent-in d792a958fb l10n update for account deletion (#3820)
8 years ago
m4sk1n a15a1827ab updated Polish translation (#3751)
8 years ago
unarist 54addd93c5 Add Japanese translation for Account deletion (#3747)
8 years ago
m4sk1n cc22f75a94 i18n: updated Polish translation (#3744)
8 years ago
Eugen Rochko 1c7e2ddd65 Account deletion (#3728)
8 years ago
Eugen Rochko baf07bc83b Exclude packs/custom.js from webpack compilation to prevent breakage (#3719)
8 years ago
Ratmir Karabut 0962301493 Update Russian translation (#3692)
8 years ago
Yamagishi Kazutoshi eb34081815 Remove comments for eslint-disable (#3691)
8 years ago
Matt Jankowski e31cd944c2 Move create/destroy actions for api/v1/statuses to namespace (#3678)
8 years ago
m4sk1n 8ceff751e2 i18n: Minor fixes in Polish translation (#3674)
8 years ago
Matt Jankowski dc717cf425 Move reblogged_by and favourited_by actions out of api/v1/statuses and into unique controllers (#3646)
8 years ago
m4sk1n caa3d4acbd i18n: updated Polish translation (#3670)
8 years ago
Yamagishi Kazutoshi 7f99456ab0 Refactor views/admin/reports/show.html.haml (#3656)
8 years ago
unarist 6c2359ce87 Add Japanese translation for #3640 (#3650)
8 years ago
Eugen Rochko 9eefd60136 Add explit admin actions to (re)subscribe/unsubscribe remote accounts (#3640)
8 years ago
nullkal 9335e15763 Support multiple trusted proxy ip addresses (#3639)
8 years ago
Yamagishi Kazutoshi 26e4a2cc3c Add Japanese translations (#3635)
8 years ago
m4sk1n 28c83a27f3 i18n: Update Polish translation (#3637)
8 years ago
Sorin Davidoi 4ce6597e3a fix: Warn if JavaScript is disabled (#3634)
8 years ago
jeroenpraat fa04340b99 Rest of 2FA translated + small fix (#3630)
8 years ago
Eugen Rochko 143ab47410 Fix #3063 - Add dynamic app manifest (#3563)
8 years ago
Yamagishi Kazutoshi d66a5fb801 Refactor translationRunner.js (#3604)
8 years ago
m4sk1n 3d1ea01df1 i18n: updated Polish translation (#3597)
8 years ago