4194 Commits (9f55021e7e1dd44123508b63f8d1db6692041a62)

Author SHA1 Message Date
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f759ec9d8d Don't resize avatars/headers if their dimensions are already right (#6508)
7 years ago
Eugen Rochko a30a207fd2 Fix media spoiler design (#6507)
7 years ago
Konrad Pozniak fa710fd496 add parameter locked to /api/v1/update_credentials (#6506)
7 years ago
HellPie edd1a3fb4e Remove outline from body window (Fixes #6501) (#6502)
7 years ago
Eugen Rochko 750f3e64c9 Cache relationships in API (#6482)
7 years ago
Eugen Rochko 3f2a113d32 Push discovered status through streaming API within a time window (#6484)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Eugen Rochko 5a5920f1bd Do not hide NSFW media/CW'd text in OpenGraph tags (#6479)
7 years ago
Eugen Rochko 1cf9467613 After click to embed video, autoplay it (#6480)
7 years ago
Eugen Rochko 0357e93a91 Fix #5173: Click card to embed external content (#6471)
7 years ago
abcang 6cb5d71e5f Fix media button type (#6478)
7 years ago
Marcin Mikołajczak 0ce908b3e0 i18n: Update Polish translation (#6470)
7 years ago
Jenkins 3a1f58e9eb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip d9cc3b60fb Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
beatrix cca508ceb7 Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing
7 years ago
Thibaut Girka da0a577768 Revert 4a48d03b31 (fixes #348)
7 years ago
David Yip 062f72c593 Use Html2Text to generate plaintext for keyword mutes. #236.
7 years ago
David Yip 00cb763893 Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
7 years ago
ThibG d12bff875e Fix password recovery (#6459)
7 years ago
David Yip a5f1c1f469 Fill out some examples for Glitch::FilterHelper. #234.
7 years ago
David Yip e365675e0a Strip HTML from keyword mute input. #234.
7 years ago
Eugen Rochko 7ca5a06505 Full-text search for authorized statuses (#6423)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 26fe2c27c3 Change web UI "posts" to "toots" on profile for consistency (#6447)
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang c1263f5db5 Clear account cache of notification target_status (#6442)
7 years ago
abcang 1f2aa77758 Fix response of signature_verification_failure_reason (#6441)
7 years ago
Akihiko Odaki 72e284028f Change user_id column non-nullable (#6435)
7 years ago
Jenkins 98c57e4d92 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 752ccc52e8 match hashtag regex in js client with server (#6431)
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
abcang 225fdc2409 Validation of count works even when text of status is nil (#6429)
7 years ago
abcang 6e12cb4524 Exclude nil from relationships array (#6427)
7 years ago
abcang 0092711e16 Make sure status is not nil (#6428)
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
Jenkins 06d2bfd63f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ncls7615 0318146f16 Fix detailed-status
7 years ago
takayamaki 5ad806ecab fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
abcang 48af3df758 Fix column header button (#6411)
7 years ago
abcang b209de40f4 Fix saving of oEmbed image (#6409)
7 years ago
Akihiko Odaki 1cd049c57b Set minimum height for mastodon on drawer (#6142)
7 years ago
ThibG f7651c3449 Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)
7 years ago
Charlotte Fields 9c94c1e66f moved save button (#3792)
7 years ago
Akihiko Odaki 180872ddd5 Remove wave from list drawer (#6381)
7 years ago
Akihiko Odaki f35fadcb9a Unify links container implementation in about pages (#6382)
7 years ago
Akihiko Odaki 3cd3cae7f7 Accept ActivityPub announce from the author of the original note (#6236)
7 years ago
puckipedia 081ba8fc90 Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
abcang 95da1b3351 Fix button hiding when header title is too long (#6406)
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 602ec7b7d6 Fix padding bug in landing page column header (#6374)
7 years ago
Eugen Rochko 6278ffdba3 Add direction tags to HTML e-mails for RTL languages (#6373)
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
abcang 073f4309a5 Fix initial_state me in push_notification_register (#6349)
7 years ago
codl 2710843f69 remove escapes from server-side γaml handler
7 years ago
abcang 83a68aa224 Fix hide and show media button on admin page (#6347)
7 years ago
Quenty31 cd18b23226 l10n Occitan language update (#6346)
7 years ago
Eugen Rochko 6661ae14b0 Fix style of legacy column headers (#6342)
7 years ago
Eugen Rochko f378280e49 Fix #6331 (#6341)
7 years ago
ThibG 42457924eb Display deleted users' role as “Suspended” (#6339)
7 years ago
Eugen Rochko 876c20ad92 Fix e-mail icon for reblog being stretched (#6336)
7 years ago
Thibaut Girka 810312213a Remove some leftover code, I guess
7 years ago
cwm 5a3792dfd8 add 'this.props' to fetchLists
7 years ago
Eugen Rochko 4cf5144099 Fix regression from #6199: Make entire column header clickable (#6334)
7 years ago
cwm 0bf2f1d6d5 remove unused openOnboardingModal from getting_started
7 years ago
cwm 02b8b6efdf merge tootsuite pr #6313 into glitch
7 years ago
Akihiko Odaki b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
Akihiko Odaki fabc4af7ff Rename FetchRemoteResourceService to ResolveURLService (#6328)
7 years ago
Akihiko Odaki a87bb3f4f6 Resolve URL for local account in follow authorization success view (#6324)
7 years ago
Renato "Lond" Cerqueira 11f970da4d Weblate translations (#6323)
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
codl 4d15390eb6 fix filter search index being too strict when looking for line breaks (#6318)
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
Eugen Rochko 4ee27e1630 Display number of follow requests in getting started menu, and (#6313)
7 years ago
Eugen Rochko d9421e01df Fix invalid value passed to full_asset_url in mailers (#6312)
7 years ago
David Yip d000f5dd80 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip 8354cca2fa Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
7 years ago
David Yip 6b4f90e5fb Merge pull request #342 from glitch-soc/merge-upstream
7 years ago
Iijima Yasushi c8d971a5c1 Change mailer avatar url (#6309)
7 years ago
David Yip 75dac5d056 Merge new onboarding styles; delete refs to PNGs.
7 years ago
David Yip 0f703fe455 Eliminate stray conflict markers.
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 9c6dba3999 Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)
7 years ago
Eugen Rochko adb0b4a59a Restore onboarding modal (#6303)
7 years ago
Eugen Rochko 896cadceed Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
Eugen Rochko 5f9c017c01 Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Thibaut Girka 12edfead8e Do not discard statuses obtained via websocket when API request finishes
7 years ago
ThibG 1e6d392ff5 Do not throw away statuses obtained via websocket when API request finishes (#6302)
7 years ago
Yamagishi Kazutoshi 49b76b3025 Change belongs_to_required_by_default to true (#5888)
7 years ago
ThibG dc4054abe9 Process mentions and reblogs even from resolved threads (#6299)
7 years ago
ThibG 30df8fc679 Retry delivering toots over ActivityPub for about 2 days (#6298)
7 years ago
Eugen Rochko 5daf5f2c57 Replace drawer elephant graphic with a vector image (#6286)
7 years ago
Thibaut Girka 41c1e5533e Display a warning when composing unlisted toots with something looking like a hashtag
7 years ago
David Yip 477fbec714 Merge pull request #332 from glitch-soc/merge-upstream
7 years ago
Eugen Rochko 92df0bba59 Fix regeneration marker not expiring (#6290)
7 years ago
Eugen Rochko b0f2bff481 Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip 011d6011f9 Strip trailing whitespace on win95.scss
7 years ago
David Yip fc20361bbe Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
7 years ago
David Yip 14fffe6e88 Use absolute paths for new working/not-found SVGs
7 years ago
David Yip 2a201c2ec6 Port 9cfbbbce1f to glitch frontend
7 years ago
David Yip f4428a7ba8 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip d0e525c463 Merge branch 'gs-master' into merge-upstream
7 years ago
David Yip dfcee78446 Style fixes to make eslint happier, hopefully
7 years ago
Renato "Lond" Cerqueira b2632dfad7 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283)
7 years ago
David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9cfbbbce1f Fix home regeneration (#6251)
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
りんすき 1827d142ee implement web share target (#6278)
7 years ago
Yamagishi Kazutoshi ea55e437f7 Upgrade ESLint to version 4.x (#6276)
7 years ago
SerCom_KC 350f65a6ef Update Simplified Chinese translations (#6280)
7 years ago
Eugen Rochko 2c81cf416d Use better reblog icon and improve contrast in HTML e-mails (#6272)
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
Yamagishi Kazutoshi d60d5fbd26 Change image URL in mailer to full path (#6264)
7 years ago
kibi! 89e8f9549b Fixed improper mailer import
7 years ago
kibi! be525dd4db Fix mailer to use webpack core
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
Eugen Rochko 19aaf0e99f Surround mid-text display names with bdi tags (#6257)
7 years ago
Eugen Rochko 1a90ef9c25 Fix #6128 - Display unfollow button even if account moved (#6258)
7 years ago
Jenkins 6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 87dd003ea5 Allow attributedTo in a status to be an embedded object (#6238)
7 years ago
Patrick Figel 2a27afc656 Suppress CSRF token warnings (#6240)
7 years ago
neetshin e980900b7d Make columns-area unscrollable when modal opened (#6241)
7 years ago
Eugen Rochko 67ee638c28 Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
7 years ago
Gô Shoemake c6d5ea8695 Fix column headers accessibility (#6199)
7 years ago
kibi! 7a692fe499 Increase priority of favstar gold
7 years ago
kibi! 28be50d95e Fixes to notification styling
7 years ago
kibi! 919caa6e1c Fixes to drawer and CWs
7 years ago
beatrix 5ded1fc5b8 Merge pull request #329 from KnzkDev/scss-refactor
7 years ago
beatrix 093cc02c84 Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
7 years ago
kibi! e106f0be6d Oops this should have been a part of last commit
7 years ago
kibi! df2f1344fa Fixes onboarding modal (#318)
7 years ago
kibi! 8399fba7f2 Fixed autocollapse detection
7 years ago
David Yip 7333a28191 Fix eslint errors. #294.
7 years ago
David Yip 20a82bf6a3 Run slightly less afoul of accessibility checks. #294.
7 years ago
David Yip 7ccde6b46b Introduce a bit of luck into the elefriend selection. #294.
7 years ago
David Yip bbfeb688e5 Add wave background; blend elefriend in a bit more. #294.
7 years ago
David Yip 1da6d12ea7 Bind click event to elefriend cycling. #294.
7 years ago
David Yip e018b6c44c Set glitchy elephant friend variant in initial state. #294.
7 years ago
David Yip 5b4f9858e6 Add the shrinking glitchy elefriend. #294.
7 years ago
David Yip a6eeda658c Prototype out glitchy elephant friend. #294.
7 years ago
ncls7615 808ace389f Fix collapsed toot style
7 years ago
ncls7615 3a5ecab183 Fix un-fullwidth media style
7 years ago
ncls7615 75ab24dcea Fix media detailed style
7 years ago
ncls7615 8709608e10 Fix confirmation modal bug
7 years ago
ncls7615 3ccbe066f0 Fix letterbox bug
7 years ago
ncls7615 80c899153f Improve scss refactor 5
7 years ago
ncls7615 a263178cf3 Improve scss refactor 4
7 years ago
ncls7615 25f7568a7e Improve scss refactor 3
7 years ago
ncls7615 090d7c1807 Improve scss refactor 2
7 years ago
ncls7615 4d9133003f Improve scss refactor 1
7 years ago
ncls7615 75af54925a Fix padded-blocks error
7 years ago
ncls7615 9e7150c6fa Initial scss refactor
7 years ago
Gô Shoemake 64f483cc0f load public.js on vanilla#admin
7 years ago
Gô Shoemake 056f52edac Load packs/public.js for glitch#admin
7 years ago
David Yip 430f9c37ea Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility'
7 years ago
Marcin Mikołajczak 6be6f6f5bd i18n: Update Polish translation
7 years ago
ncls7615 327c9e96e0 Fix dropdown text
7 years ago
Jenkins e6049e6fd0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 73b6f2ebe9 Handle sessions that can't be translated (#6245)
7 years ago
David Yip 53854707ce Thank you, Officer Murphy
7 years ago
David Yip ec1199404c The flavour parameter is unused, so omit it (#317)
7 years ago
David Yip 28e652d35d Allow for user object to be empty. Fixes #317.
7 years ago
David Yip dbf88612e3 Merge pull request #316 from glitch-soc/fix-async
7 years ago
kibigo! c4d63ba442 Renamed glitch async chunks
7 years ago
David Yip 7852fc7706 Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
7 years ago
David Yip 1a7f8eb723 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e19ece354e Skip ActivityPub Announces of non-public objects (#6230)
7 years ago
Eugen Rochko 6d9f2924ad Fix #6204: Use content warning for page title when present (#6231)
7 years ago
cwm 12469bed1b Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223)
7 years ago
cwm 6b20cd7c10 Fix overflowing audit logs (tootsuite pr #6184)
7 years ago
cwm d1ddba043a Set background to the navigation of Getting Started column (tootsuite pr #6163)
7 years ago
cwm 3ba78c7bda Use const instead of let for constant (tootsuite pr #6106)
7 years ago
cwm 90c35fe17a change key to path in timeline settings containers
7 years ago
cwm cf027c74db Rename key to path in actions and reducers for settings (tootsuite pr #6105)
7 years ago
cwm d12ce24054 Fix newlines-to-spaces functionality (tootsuite pr #6158)
7 years ago
cwm 0d399a4edc Hide moved account's follow button in search result (tootsuite pr #5913)
7 years ago
cwm 783f65dd72 Prevent duplicate load of favourites (tootsuite pr #5931)
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
David Yip 1dd6482fb5 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 52d99f96bd Merge pull request #312 from glitch-soc/tag-sensitive-imgs
7 years ago
David Yip b02479fbb1 Merge pull request #311 from glitch-soc/dont-show-solo-skins
7 years ago
Jenkins f9a0b246e5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
kibigo! ff6ecdda4e Add missing comma
7 years ago
kibigo! 95459fc5bd Show SENSITIVE tag on sensitive images (#267)
7 years ago
kibigo! 134e6590c6 Don't show skins selector when there's only one (#256)
7 years ago
kibigo! 62a33d5ae0 Threads now inherit privacy directly (#309)
7 years ago
puckipedia 74e427c24b Add the author of a status to cc if reblogged (#6226)
7 years ago
Andrew 9c98778bed Minor style fixes
7 years ago
nightpool eac9039a63 Refactor /api/web APIs to use the centralized axios instance (#6223)
7 years ago
ncls7615 2210eb0926 fix list editor scss
7 years ago
David Yip 15834e4136 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 75cbeb775f When pulling out max_toot_chars, handle nulls
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 f10ce3f003 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko d4e0d2563c Fix bad URL schemes being accepted (#6219)
7 years ago
Eugen Rochko b9375d92b3 Do not display elephant friend in single-column layout (#6222)
7 years ago
puckipedia 4ae7b4eb1e Move Article from supported to converted types (#6218)
7 years ago
David Yip 22286ee6cd Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 9e5b431655 Use error pack when rendering error pages. Fixes #305.
7 years ago
Jenkins 8704a190c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi c89bb8ae40 Fix force_ssl conditional (#6201)
7 years ago
Yamagishi Kazutoshi 63c17a66b8 Fix unintended cache (#6214)
7 years ago
SerCom_KC 154bd8db56 Update Simplified Chinese translations (#6215)
7 years ago
David Yip a37e295901 Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
7 years ago
Yamagishi Kazutoshi 4f24f54739 Fix unintended cache
7 years ago
Andrew b8127caea0 Z indexes and colors
7 years ago
Andrew 5fc9f535b5 To 2.1.2
7 years ago
Jenkins 17a472d50d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm f8cd218003 Translate Korean (#6212)
7 years ago
kibigo! a38bd57f8a Fixes to search dropdown
7 years ago
beatrix cd8d0d7b85 fix typo in vanilla names.yml
7 years ago
Ondřej Hruška 07ea1aa6fe fixed ctrl enter
7 years ago
Ondřej Hruška 568c9272ff Fix the always-threaded bug
7 years ago
ncls7615 aa02511e1c Update ja.js
7 years ago
beatrix ed5d06c7e7 Merge pull request #296 from glitch-soc/thread-mode
7 years ago
beatrix 45487e8862 Merge pull request #302 from KnzkDev/fix/search-popout
7 years ago
beatrix 34b7208e3f appease eslint
7 years ago
ncls7615 896830cc57 Fix search popout
7 years ago
David Yip 2e3bb24ed6 Read max_toot_chars from root object. Fixes #297.
7 years ago
kibigo! 25da6ed5c1 my global .gitignore excluded this file ;_;
7 years ago
kibigo! e5a10a1fd3 Threaded mode~
7 years ago
kibigo! 85ffb07656 Fixed improper dropdown func binding for #293 + toot button spacing
7 years ago
kibigo! 77cb2d04f9 Styling and autosuggest fixes for #293
7 years ago
kibigo! 0e418264fb Fixes composer mounting issue with #293
7 years ago
Andrew 46001c0137 Win95 to 2.1
7 years ago
Andrew ee15e445ad Updates and fixes to win95 theme
7 years ago
Andrew ac2fb6c431 Theme: Windows 95
7 years ago
David Yip 64fee6ca73 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
beatrix 5500346b79 Merge pull request #290 from chriswmartin/web-push-updates
7 years ago
beatrix 3671d07f37 Merge pull request #295 from chriswmartin/getting-started-key-fix
7 years ago
beatrix f6ed878ee9 Merge pull request #293 from glitch-soc/compose-refactor
7 years ago