5101 Commits (20689a5b5edcc735fdfc21f17529f7fce7b80951)

Author SHA1 Message Date
Thibaut Girka 27be4fa311 Avoid loading rails-ujs twice on vanilla flavour
6 years ago
Eugen Rochko b751ec1c2e Whitelist dat/ipfs/gopher links in sanitizer (#8034)
6 years ago
Thibaut Girka 4ec907e413 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Marcin Mikołajczak d1d46f914b i18n: Update Polish translation (#8032)
6 years ago
Eugen Rochko 26bd3742e9 Fix typo in Admin::DashboardController#index
6 years ago
Eugen Rochko d0b14eaee2 Add admin dashboard (#8029)
6 years ago
ThibG 792362b806 Use LoadingBar instead of blur to indicate that an image is loading (fixes #4060) (#7562)
6 years ago
ThibG 3aaa8f1a95 Do not cause an error if domain_lists.blocks.next is undefined (#8021)
6 years ago
Eugen Rochko 6cd4b45ec0 Display full acct on public status pages, always (#8011)
6 years ago
Eugen Rochko 64ce00c9c5 Disable language detection for texts shorter than 140 characters (#8010)
6 years ago
Yamagishi Kazutoshi 2275752fca Upgrade webpack to version v4.x (#6655)
6 years ago
Eugen Rochko e90b9a0b05 Display Mastodon version in footer of web UI (#8013)
6 years ago
Eugen Rochko 80dab2e678 Weblate translations (2018-07-14) (#8016)
6 years ago
Eugen Rochko 28c301e41c Do not count self in potential friendships (#8014)
6 years ago
Eugen Rochko 171c20ce72 Add federation relay support (#7998)
6 years ago
Thibaut Girka 7be52a7c16 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 4a23251f3c Add an option restricting secondary toot privacy to that of the toot being replied to
6 years ago
mayaeh 3dc6c216ce Fix whole-word selection and i18n: Add Japanese translation for Whole-word (#8004)
6 years ago
Thibaut Girka 694b9c5b54 Move privacyPreference to utils
6 years ago
Thibaut Girka 78811a547c [Glitch] Refactor privacyPrefence() to use priority list
6 years ago
Thibaut Girka 1a3e119ef7 Use options rather than a boolean
6 years ago
Thibaut Girka b169f2df3b Do not store duplicate reply_privacy
6 years ago
Ash Levy 2d4c33a89c add option to enable auto visibility on secondary toot button
6 years ago
Thibaut Girka 052f5324fc [Glitch] Make whole-word filter regex consistent between Ruby and JS
6 years ago
Thibaut Girka 78fcb67c12 [Glitch] Add follow button to detailed status, add gradient to mask bio cut-off (fixes #566)
6 years ago
Thibaut Girka ca97b0341b Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko df34e4efff Weblate translations (2018-07-11) (#7992)
6 years ago
Eugen Rochko d058edc3d3 Add link to filters in web UI dropdown (#7990)
6 years ago
Thibaut Girka 14061b76dc Display reply indicator even when replying to contentless toot (fixes #564)
6 years ago
Thibaut Girka b7b718df0d make sure reblogged's filter is set correctly
6 years ago
Thibaut Girka aec11a568e [Glitch] Add option to not consider word boundaries when processing keyword filtering
6 years ago
Thibaut Girka 1966652cba [Glitch] In keyword filter, account for reblogs, HTML and whole-words
6 years ago
Thibaut Girka f94afcb935 [Glitch] Fix filters not affecting notifications in web UI
6 years ago
Thibaut Girka 4850a2348c Add client-side custom filter support to glitch-soc
6 years ago
Thibaut Girka a68e7db2fb [Glitch] Fix Chrome issue with sizes="0px"
6 years ago
Ash Levy 58c19ac07c add keybind in composer textarea for secondary submit
6 years ago
Eugen Rochko a94f6c800d Make whole-word filter regex consistent between Ruby and JS (#7987)
6 years ago
Thibaut Girka 262f7d147d Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka fc91260310 Set appropriate assets pack for the keyword filter page
6 years ago
Thibaut Girka cf8121376b Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
ThibG 4c70bb6d6d Add option to not consider word boundaries when processing keyword filtering (#7975)
6 years ago
Eugen Rochko 5294f3a1d2 Add follow button to detailed status, add gradient to mask bio cut-off (#7979)
6 years ago
Eugen Rochko a7039e4fd3 Add API method to remove a suggestion (#7978)
6 years ago
Eugen Rochko 93bdaa0526 Fix filters not affecting notifications in web UI (#7977)
6 years ago
Thibaut Girka 6016b5d57b Remove duplicate code for handling muted users
6 years ago
Eugen Rochko 5f3ef03156 Remove .p-name microformat class (#7961)
6 years ago
Eugen Rochko 0dbaa1badf Fix missing irreversible in filters API, expires_in param (#7976)
6 years ago
Lynx Kotoura b3ec23311c Revert "Fix dark background error on user-mention autosuggest (#7937)" (#7964)
6 years ago
Lynx Kotoura aa606281f1 Fix gradient, regression from #7927 (#7963)
6 years ago
Eugen Rochko 5bec5c3e6e Add admin setting to enable OG previews for sensitive media (#7962)
6 years ago
Eugen Rochko 6084257fda In keyword filter, account for reblogs, HTML and whole-words (#7960)
6 years ago
Eugen Rochko 68d884e556 Send undo of boost to original poster if reblog (#7959)
6 years ago
Eugen Rochko 08ee72640b If signed in, redirect autofollow invite to profile page (#7956)
6 years ago
Eugen Rochko 8bdc12d494 In e-mail validator, fallback from MX to A record (#7955)
6 years ago
Eugen Rochko 9f0a91e142 Check reblogged status for blocked/muted mentions (#7957)
6 years ago
Eugen Rochko 34fdf77f48 Add more granular OAuth scopes (#7929)
6 years ago
Maciek Baron e5134142bc Crush PNGs to reduce overall size (#7954)
6 years ago
Renato "Lond" Cerqueira 607654572a Weblate translations (2018-07-05) (#7950)
6 years ago
Maciek Baron c6084cf719 Add comment, test to unescapeHTML (#7949)
6 years ago
Maciek Baron d171801898 Fix #6395 - overlapping profile name and domain (#7927)
6 years ago
Marek Lach 664fd9fb19 Fix dark background error on user-mention autosuggest (#7937)
6 years ago
Maciek Baron 2b44b7a9f6 Refactor privacyPrefence() to use priority list (#7945)
6 years ago
Maciek Baron 6b9e5026fd Add white outline to black emojis (fix #5083) (#7936)
6 years ago
Maciek Baron df5b46f1b0 Check if router is injected in media modal (#7941)
6 years ago
Maciek Baron 4ebdff6e25 Respect noindex rule in remote follow view (fix #7869) (#7939)
6 years ago
Eugen Rochko a5f0103a6f What is on your mind -> What's on your mind (#7938)
6 years ago
Eugen Rochko 2f111b7fbb Disable service worker media cache and IndexedDB storage (#7932)
6 years ago
Renato "Lond" Cerqueira c0fbe9e3a4 Restore support to ruby 2.3, add ruby 2.3 to circle ci (#7935)
6 years ago
Maciek Baron 4d28dd39d3 Allow the media modal to be closed by pressing back (#7934)
6 years ago
Eugen Rochko e57d9177dc Fix check for PotentialFriendshipTracker when replying (#7933)
6 years ago
Eugen Rochko 3cb10d1020 Fix M hotkey inserting @undefined when in detailed status (#7931)
6 years ago
Eugen Rochko 7ea46177f2 Fix style of attachment list on /about (#7930)
6 years ago
Eugen Rochko aa4e75166b Re-add follow recommendations API (#7918)
6 years ago
Shaun Gillies 1202b4e756 Display full username in tooltip on search and autosuggest #7478 (#7920)
6 years ago
Eugen Rochko 23624f709a Improve embeds (#7919)
6 years ago
Marty McGuire 4aa3f667fc Typo in signature verification failure logging (#7916)
6 years ago
Marcin Mikołajczak 4833d285a7 i18n: Update Polish translation (#7915)
6 years ago
MIYAGI Hikaru ac56fa3c22 Merge `HIDDEN_SERVICE_VIA_TRANSPARENT_PROXY` into `ALLOW_ACCESS_TO_HIDDEN_SERVICE` (#7901)
6 years ago
Eugen Rochko d878e3e945 Keyword/phrase filtering (#7905)
6 years ago
Quentí 751276484d Missing translations (#7896)
6 years ago
ふぁぼ原 5f0b9c5d36 On the mobile UI, move the search column to the right (#7877)
6 years ago
Yamagishi Kazutoshi 08c9914bc5 Weblate translations (2018-06-25) (#7890)
6 years ago
Eugen Rochko 2dfd016085 Fix Chrome issue with sizes="0px" (#7886)
6 years ago
ThibG 98c0128d3b Merge pull request #553 from ThibG/glitch-soc/merge-upstream
6 years ago
Thibaut Girka 7f143d1a92 Increase padding of toots
6 years ago
Thibaut Girka 8e4fbf9846 Fix margins of toot text
6 years ago
Thibaut Girka 44e49d2b52 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG ef3ac6e4a7 Fix jpeg files sometimes being returned with a .jpe extension (#7881)
6 years ago
Shuhei Kitagawa bc45dd2f97 Add tests for remote_unfollows_controller (#7879)
6 years ago
ThibG 5321d2ef02 Merge pull request #550 from ThibG/glitch-soc/merge-upstream
6 years ago
Thibaut Girka 636973707f Fix confirmations_controller
6 years ago
Mélanie Chauvel (ariasuni) 7406d07985 Fix CW field still having animation in when reduce motion is enabled (#7872)
6 years ago
Thibaut Girka 7833326959 [Glitch] Submit report using meta key
6 years ago
Thibaut Girka d325dd899c Fix clicking on collapsed toots with a background (fixes #547)
6 years ago
Thibaut Girka 8bd7b9b586 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Shuhei Kitagawa d61e647e8a Replace bypass option with bypass_sign_in (#7867)
6 years ago
Hinaloe d037ae26e2 Return collect response when fail put cache to storage (#7863)
6 years ago
kedama 5ba2ceda2e Fix broken single column getting-started menu (Fix #7854) (#7862)
6 years ago
Eugen Rochko 71713fabde Weblate translations (2018-06-19) (#7847)
6 years ago
Eugen Rochko 549d2f3d42 Always send content for backwards-compatibility (#7844)
6 years ago
Eugen Rochko 1efdd31c68 Serialize language into ActivityPub JSON (#7840)
6 years ago
Eugen Rochko 38fb602407 Create special case to prefer "jpeg" over "jpe" file extension (#7841)
6 years ago
Yamagishi Kazutoshi 0c870f747b Weblate translations (2018-06-18) (#7839)
6 years ago
Lynx Kotoura 781fe9a152 Change list icons different from the getting-started icons (#7838)
6 years ago
Eugen Rochko f91fa10804 Allow selecting default posting language instead of auto-detect (#7828)
6 years ago
Hinaloe 519473e8f6 DataTransfer.types may Array-like object (#7827)
6 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
6 years ago
Lynx Kotoura d0aadee0da Fix the action with X button on compose form (#7826)
6 years ago
Eugen Rochko 9bcd509165 Do not pre-emojify note HTML in accounts REST API (#7821)
6 years ago
Thibaut Girka c60f97f116 [Glitch] Preserve newlines in delete & redraft and desktop notifications
6 years ago
Thibaut Girka d8c35a6b85 [Glitch] Add redraft function
6 years ago
ThibG 079bc2906a Merge pull request #544 from ThibG/glitch-soc/merge-upstream
6 years ago
Lynx Kotoura 76905a95a2 Adjust account__action-bar contents (#7818)
6 years ago
Lynx Kotoura a37dc30717 Fix autosuggest-textarea backgrounds and some minor adjustments (#7817)
6 years ago
Yamagishi Kazutoshi cd79647197 Weblate translations (2018-06-16) (#7815)
6 years ago
Jeong Arm c5edc53b2e Add missing Korean translations (#7819)
6 years ago
SerCom_KC 355f55772d Update Chinese (Simplified) Translations (#7816)
6 years ago
Masoud Abkenar c9a4023e1c Update fa.json (#7814)
7 years ago
Thibaut Girka 31091836e9 [Glitch] Add vendor prefix for background-clip
7 years ago
David Yip c3202b66f2 Port bf508b9f74 to glitch emoji picker.
7 years ago
Thibaut Girka 3d6c594903 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko d928aac40c Fix regression where CW is focused on reply (#7811)
7 years ago
Eugen Rochko 907694df6a Add autofollow option to invites (#7805)
7 years ago
Eugen Rochko 915f02ce8f Fix vertical alignment of navigation bar (#7807)
7 years ago
Eugen Rochko 681ac8580a Remove placeholder text for media-only toots (#7806)
7 years ago
Eugen Rochko a21c8a2e0e Add "find friends", "invite people", and more to getting started footer (#7803)
7 years ago
chr v1.x 9c2fc4d684 Put "Media Only" option in column settings instead of content area headline (#7801)
7 years ago
Jenkins 6e961f0731 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1ffb500242 Hide status content when spoiler text is not empty (#7797)
7 years ago
Yamagishi Kazutoshi 70b5274caa Fix "Invalid DOM property `class`" (#7798)
7 years ago
Lain Iwakura 8a66ab68e8 Handle character limit in initial state in frontend.
7 years ago
chr v1.x bc9d1ea0e3 Add profile options on compose form (#7789)
7 years ago
David Yip 4692eed7bd Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
David Yip 4cc75efb7b Port emojimart 2.6.1 changes to glitch flavour
7 years ago
David Yip b8205550dd keyword mute: use mentions scope in home feed filtering (#454)
7 years ago
David Yip f9c8642a11 Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
Jenkins 695674b2fa Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Lynx Kotoura cd1d25b9d0 Uniform media and video spoiler settings and fix them of the light theme (#7778)
7 years ago
Yamagishi Kazutoshi 51c639980c Weblate translations (2018-06-10) (#7779)
7 years ago
kedama 101f5544e1 Control the focus when clicking the "CW" button. (#7776)
7 years ago
Renato "Lond" Cerqueira 2e4a1d3109 Rename emoji sheet to avoid caching issue (#7777)
7 years ago
Shuhei Kitagawa d230066746 Add tests for intents_controller (#7763)
7 years ago
Eugen Rochko b051d74029 Fix domain hiding logic (#7765)
7 years ago
Lynx Kotoura d997fb520a Fix background color of emoji-mart-bar in light theme (#7768)
7 years ago
Lynx Kotoura 2d2002436c Adjust emoji-mart-anchor-bar for environments that use display scaling (#7772)
7 years ago
Eugen Rochko 39930a8432 Fix has_one association on Web::PushSubscription (#7767)
7 years ago
Thibaut Girka 5af047df32 Delete references to removed constants (fixes #537)
7 years ago
David Yip 34ac79cb68 Merge pull request #506 from ThibG/glitch-soc/fixes/static-500
7 years ago
SerCom_KC 77c94ffe82 Update Chinese (Simplified) translations (#7769)
7 years ago
Renato "Lond" Cerqueira bf508b9f74 Fix issues with updated emoji mart (#7761)
7 years ago
Yamagishi Kazutoshi 3e2eddaba7 Weblate translations (2018-06-08) (#7759)
7 years ago
Eugen Rochko 5aa5b86bf1 Do not accept ActivityPub follow requests from blocked user (#7756)
7 years ago
Eugen Rochko e1054a747e Add "Edit profile" link to public profile page, increase bottom padding (#7754)
7 years ago
Renato "Lond" Cerqueira ae0b751a30 Update to emojimart 2.6.1 (#7746)
7 years ago
David Yip c2f7676dfc Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
David Yip 4b7ceed3f0 Merge pull request #509 from ThibG/glitch-soc/fixes/router-history-navigation
7 years ago
Marcin Mikołajczak a5e289e273 🌍🇵🇱 (#7753)
7 years ago
Eugen Rochko ecec45ff9b Filter out blocked/muted people from profile timelines (#7747)
7 years ago
Yamagishi Kazutoshi 29f4196d87 Fix fetch of remote image with multiple Content-Type headers (#7749)
7 years ago
Eugen Rochko 5d419119de Preserve newlines in delete & redraft and desktop notifications (#7750)
7 years ago
Yamagishi Kazutoshi 7ed181c41c Add missing dot for remote image (#7751)
7 years ago
David Yip 63a5f8a4e4 Merge pull request #534 from glitch-soc/restructure-kw-as-word-lists
7 years ago
Renato "Lond" Cerqueira 19b653991d Weblate translations 20180605 (#7743)
7 years ago
Renato "Lond" Cerqueira 94077935ac Add missing locale strings (#7742)
7 years ago
David Yip 9f9aa39eb5 Escape metacharacters in non-whole-word keyword mutes. Fixes #533.
7 years ago
Eugen Rochko 16173535d9 Add redraft function (#7735)
7 years ago
David Yip 3413105ec7 Merge pull request #530 from glitch-soc/restructure-kw-as-word-lists
7 years ago
nightpool 0378f74430 Fix context performance by partially reverting #7083 (#7734)
7 years ago
Yamagishi Kazutoshi a936ccd126 Detect extname from Content-Type (#7733)
7 years ago
Yamagishi Kazutoshi 1a145c6af1 Skip processing when HEAD method returns 501 (#7730)
7 years ago
Yamagishi Kazutoshi 963b82f5e5 Add vendor prefix for background-clip (#7727)
7 years ago
Lynx Kotoura e2b4e6f05e Change border color of activity-stream (#7724)
7 years ago
Yamagishi Kazutoshi 10a8ac8b80 Submit report using meta key (#7729)
7 years ago
Yamagishi Kazutoshi f4a6f6fb89 Remove unnecessary underline on accounts table (#7728)
7 years ago
David Yip a38c4c45da Add apply-to-mentions option to keyword mute UI. #454.
7 years ago
David Yip 2bb5842541 Thread scopes through #matches?. #454.
7 years ago
Eugen Rochko ca9ac011a5 Display numbers in account header using shortNumberFormat for consistency (#7723)
7 years ago
Akihiko Odaki 3114ac9655 Do not mark remote status sensitive even if spoiler text is present (#7395)
7 years ago
Lynx Kotoura 93d90d3237 Fix activity-stream-tabs colors and set text variables for text colors (#7722)
7 years ago
Eugen Rochko 2af43c3dce Fix bug in order of conversations in web UI (#7721)
7 years ago
David Yip 9e830f7f37 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 650e3e346b Remove trending hashtags (#7711)
7 years ago
David Yip d55d5ccc9d keyword mute: Store keywords as a list
7 years ago
David Yip 5ec2d25ef6 Merge pull request #528 from glitch-soc/merge-upstream
7 years ago
David Yip 330a234d1f Whoops, forgot to clean up a conflict.
7 years ago
David Yip 1a0491b3cf Merge pull request #519 from ThibG/glitch-soc/fixes/status-node-null
7 years ago
David Yip 827d1ea864 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip 3dc8af0016 Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
Yamagishi Kazutoshi ca2a6b2071 Weblate translations (2018-06-02) (#7705)
7 years ago
Eugen Rochko 3833c8b690 Use different algorithm for trending tags (#7697)
7 years ago
Eugen Rochko 57ad751230 Fix margin between compose warning, reply indicator and textarea (#7701)
7 years ago
Eugen Rochko aa54c65ee2 Improve trends layout (#7700)
7 years ago
Yamagishi Kazutoshi f64f9860c7 Add loading indicator for trending tags (#7693)
7 years ago
Yamagishi Kazutoshi fe98e276e1 Update ESLint for Code Climate (#7696)
7 years ago
Yamagishi Kazutoshi a87927437d Fix duplicate key attributes (#7694)
7 years ago
David Yip c10df6cf00 Merge pull request #501 from ThibG/glitch-soc/features/red-bookmarks
7 years ago
Spencer Alves 559ce5c098 Adjust spacing between status icons
7 years ago
Spencer Alves c86cd2041d Merge branch 'glitch' into thread-icon
7 years ago
Eugen Rochko 946091af45 Exclude unlisted, private and direct toots from affecting trends (#7686)
7 years ago
Eugen Rochko aa1f74cba6 Make the refresh trends button refresh trends (#7685)
7 years ago