5261 Commits (9002ec066a2c680757a15c3c3e2711006e8f6d34)

Author SHA1 Message Date
Evgeny Petrov 86183968b4 Added endorse strings, fixed footer 'developers' string (#8183)
6 years ago
Eugen Rochko 9a1cf4a558 Expect relays to answer with accept/reject (#8179)
6 years ago
Yamagishi Kazutoshi 31507b5cdb Weblate translations (2018-08-12) (#8171)
6 years ago
Evgeny Petrov 5dbc798bb4 Added endorse strings, fixed footer 'developers' string (#8183)
6 years ago
Eugen Rochko 3fe1f95dd0 Expect relays to answer with accept/reject (#8179)
6 years ago
Yamagishi Kazutoshi 5d8b8f22f9 Weblate translations (2018-08-12) (#8171)
6 years ago
Thibaut Girka 03ac196126 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 6c1e770658 Fix statuses batch checkboxes in admin panel (fixes #411)
6 years ago
Thibaut Girka ac67589755 Don't prevent opening links in tabs with keyboard modifiers
6 years ago
ThibG 1d3b39e106 Ensure single user is a local user (fixes #8154) (#8157)
6 years ago
Mélanie Chauvel (ariasuni) 92ae613358 Fix crash when clicking “Show more/less for all” when a toot is not visible (#8118)
6 years ago
Nathaniel Ekoniak 8254b9fb19 i18n: fix Slovak language name (#8169)
6 years ago
Yamagishi Kazutoshi a74f0d2dd9 Weblate translations (2018-08-11) (#8167)
6 years ago
Marcin Mikołajczak fd8ca84077 i18n: Update Polish translation (#8155)
6 years ago
Evgeny Petrov 399a008cfb [RU] Updated translation (#8164)
6 years ago
Thibaut Girka ca4fa96a99 Implement public profile endorsements in glitch-soc
6 years ago
Thibaut Girka 35ee061e42 Merge upstream SCSS changes for /about, /about/more and /terms
6 years ago
Thibaut Girka 1e18374e53 Merge upstream styling for public profile endorsements
6 years ago
Thibaut Girka 5ed6f6db1d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 3fd47f9bc0 Introduce OAuth scopes for bookmarks
6 years ago
Eugen Rochko 0dcd212735 Adjust responsive design for /about/more and /terms (#8158)
6 years ago
Eugen Rochko d0b6cbfb92 When follow is removed, remove endorsement (#8149)
6 years ago
Eugen Rochko 9e8366d4cb Update /terms and /about/more to use public layout (#8142)
6 years ago
Eugen Rochko 6e3cb11f3c Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Evgeny Petrov f1fe022a13 [RU] Translation update: (#8147)
6 years ago
Eugen Rochko 3a8d839200 Remove protocol handler registration (#8127)
6 years ago
Thibaut Girka 2107ea78c3 Good bye, CW rainbows
6 years ago
Thibaut Girka 929324cf60 Scroll to linked status in public status view
6 years ago
ThibG 80d02cf8f9 Scroll to linked status in public status view (fixes #7884) (#8130)
6 years ago
Thibaut Girka dc85e5a379 Restore glitch-soc's 500 characters limit for bios (fixes #625)
6 years ago
Thibaut Girka dfe8240f8d Import upstream's emojify function in settings.js
6 years ago
ThibG 193ebf3cf4 Serialize text-less statuses as '.' over OStatus (fixes #7856) (#8126)
6 years ago
Marcin Mikołajczak b5d5fc9855 i18n: Make Polish translation more gender neutral + update (#8119)
6 years ago
ThibG 8f61dfe044 Render custom emoji in display name on public profile (#8115)
6 years ago
Thibaut Girka d99f8674ab Fix styling of toot prepended text on public profiles
6 years ago
Thibaut Girka 30c9fef4d4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 9e0015e834 Do not show pinned toots when min_id is set (#8111)
6 years ago
Thibaut Girka 52b61a8b71 Delete leftovers from keyword_mutes
6 years ago
Thibaut Girka 8d2f582bf7 Fix toot styling on public pages
6 years ago
Thibaut Girka d87eac4663 Reintroduce glitch-soc avatar styling in public pages
6 years ago
Thibaut Girka 89b05c7d68 [Glitch] Do not hide hashtag timeline in mobile view, make it full-window
6 years ago
Thibaut Girka 658fc6bc1e [Glitch] Compensate for scrollbar disappearing when media modal
6 years ago
Thibaut Girka 28cdf3da09 [Glitch] Show media modal on public timeline
6 years ago
Thibaut Girka 8c4fc00ece [Glitch] Add missing formatting to the text in hero widget
6 years ago
Thibaut Girka ca256cca22 Port profile redesign to glitch-soc
6 years ago
Thibaut Girka 1159490f00 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 934d50daf0 Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Thibaut Girka 4277328e9c Drop glitch-style account bio fields
6 years ago
Thibaut Girka 919fc15097 Disallow remote users from viewing local-only toots
6 years ago
Eugen Rochko d39e0ad4d5 Do not hide hashtag timeline in mobile view, make it full-window (#8093)
6 years ago
Eugen Rochko a78672ae50 Compensate for scrollbar disappearing when media modal visible (#8100)
6 years ago
Eugen Rochko ebf836cc69 Enforce username format for remote users, too (#8102)
6 years ago
Eugen Rochko 8c8f80c0fb Fix incorrect context definition for the "featured" keyword (#8090)
6 years ago
Eugen Rochko f7910c4164 Convert MOV and WEBM to MP4, raise maximum limit to 40MB (#8101)
6 years ago
Thibaut Girka f5b880a429 [Glitch] Resize images by area instead of fixed dimensions
6 years ago
Thibaut Girka f866d00fa2 Merge commit 'dad7cd6d77f1bb090a7a64df405a920a1a1b2d83' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka f37bf7c0a3 Don't reset scroll position when opening a modal
6 years ago
Thibaut Girka 4e8532cc1a Allow modals to be closed by pressing “back”
6 years ago
Thibaut Girka 32d4005516 Treat the App Setting link as a proper link (fixes #375)
6 years ago
Thibaut Girka 8a9882ee34 [Glitch] Improve WebUI account action bar
6 years ago
Thibaut Girka a3d318ec76 [Glitch] Fix accounts' display name/bio not being set from initial state
6 years ago
Yamagishi Kazutoshi 9d3bb125b7 Weblate translations (2018-07-30) (#8096)
6 years ago
Yamagishi Kazutoshi 2d000a877b Do not scroll up when modal is opened (#8095)
6 years ago
Eugen Rochko f53755aaad Fix size/dimension values in avatar/header hint localizations (#8088)
6 years ago
Eugen Rochko bdb76122bc Add missing formatting to the text in hero widget (#8089)
6 years ago
Thibaut Girka 9a1015327b Use same margin for navbar and column for consistency
6 years ago
Thibaut Girka 78071de615 Hide navigation bar text so it can fit on small screens
6 years ago
Thibaut Girka 429c05537e Fix glitch-soc columns padding on mobile (fixes #561)
6 years ago
Thibaut Girka 9507ab6493 Preserve hashtags in threaded mode (fixes #584)
6 years ago
Thibaut Girka 40fe9256ea Move CW field just above main textarea
6 years ago
Thibaut Girka 0ef509c27a Get rid of Collapsable, use CSS instead
6 years ago
Thibaut Girka 5eeb95fac7 Refactor reply indicator and show compact list of attachments
6 years ago
Thibaut Girka 22618172b4 Show reply indicator for empty toots, not undefined toots (fixes #610)
6 years ago
Eugen Rochko 7d51186e8e Order invites by recent first (#8091)
6 years ago
Eugen Rochko 3dc21c1ff6 Prevent ActivityPub movedTo recursion (#8092)
6 years ago
Mélanie Chauvel (ariasuni) da72dc2374 Improve account bar css (#8087)
6 years ago
Eugen Rochko 13df3889f0 Redesign public profiles and toots (#8068)
6 years ago
Marcin Mikołajczak dad7cd6d77 i18n: Update Polish translation (#8084)
6 years ago
Eugen Rochko 91aadec929 Resize images by area instead of fixed dimensions (#8083)
6 years ago
Thibaut Girka d0853d1f3a [Glitch] Add documentation for “p” hotkey
6 years ago
Thibaut Girka 56f5323194 Add hotkey variants to keyboard shortcuts description
6 years ago
Thibaut Girka 3a4a87d9c0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 12eb48c85c Prevent scrolling main frame when navigating in image gallery with arrow keys
6 years ago
ThibG d2b918522e Improve keyboard shortcuts descriptions (#8066)
6 years ago
ThibG a2ed0630a2 Prevent scrolling main frame when navigating in image gallery with arrow keys (#8073)
6 years ago
Eai ff2e8c70c6 Fix .column-back-button line-height (#8074)
6 years ago
abcang 258eba090b Call address instead of exchange (#8076)
6 years ago
Marcin Mikołajczak 288ac10da1 fix typo in 🇵🇱 (#8075)
6 years ago
Thibaut Girka ddaf5eeb3b [Glitch] Use LoadingBar instead of blur to indicate that an image is loading
6 years ago
Thibaut Girka 443b660cd6 Use the same description string as upstream for the “x” hotkey
6 years ago
Thibaut Girka a2c595d0d0 Fix focusing search bar with hotkeys
6 years ago
Thibaut Girka 5de267d6ff Fix focusing composer textarea on “new toot” hotkey
6 years ago
Thibaut Girka b908e9b23a Fix routing issues, especially keyboards shortcuts changing location
6 years ago
Yamagishi Kazutoshi 2629ffb68a Weblate translations (2018-07-25) (#8065)
6 years ago
Thibaut Girka faa14e76da Display custom emoji in account notes in WebUI (fixes #595)
6 years ago
Thibaut Girka 25a68179f5 Add CSS for the newly-introduced dashboard (fixes #592)
6 years ago
Thibaut Girka 57b3874b47 [Glitch] Ensure container of React components has full width
6 years ago
Thibaut Girka e81eb34566 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 95a752365a Disable threaded mode when canceling a reply (fixes #583)
6 years ago
Yamagishi Kazutoshi 8aa855c0f7 Weblate translations (2018-07-18) (#8047)
6 years ago
Thibaut Girka 62b47edf17 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka a69426ba4e Do not cause an error if domain_lists.blocks.next is undefined (fixes #572)
6 years ago
Thibaut Girka 7cc4e6b2b2 Process statuses on COMPOSE_SUBMIT_SUCCESS (fixes #579)
6 years ago
Eugen Rochko cc3a3f579a Hide "A look inside" in mobile layout on frontpage (#8044)
6 years ago
Eugen Rochko 8058ec5a13 Ensure container of React components has full width (#8043)
6 years ago
Eugen Rochko 56fdbc04b3 Fix number of results returned from TrendingTags.get
6 years ago
Eugen Rochko d987567b39 Fix tag usage display on admin dashboard
6 years ago
Eugen Rochko 2f6967913a Display trending hashtags on admin dashboard (#8038)
6 years ago
Eugen Rochko 77d8396217 Fix ActivityPub::UpdateDistributionWorker regression (#8039)
6 years ago
Eugen Rochko 38f413e583 Fix activity:interactions counter to count all interactions (#8037)
6 years ago
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)
7 years ago
Yamagishi Kazutoshi 0c870f747b Weblate translations (2018-06-18) (#7839)
7 years ago
Lynx Kotoura 781fe9a152 Change list icons different from the getting-started icons (#7838)
7 years ago
Eugen Rochko f91fa10804 Allow selecting default posting language instead of auto-detect (#7828)
7 years ago
Hinaloe 519473e8f6 DataTransfer.types may Array-like object (#7827)
7 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
7 years ago
Lynx Kotoura d0aadee0da Fix the action with X button on compose form (#7826)
7 years ago
Eugen Rochko 9bcd509165 Do not pre-emojify note HTML in accounts REST API (#7821)
7 years ago
Thibaut Girka c60f97f116 [Glitch] Preserve newlines in delete & redraft and desktop notifications
7 years ago
Thibaut Girka d8c35a6b85 [Glitch] Add redraft function
7 years ago
ThibG 079bc2906a Merge pull request #544 from ThibG/glitch-soc/merge-upstream
7 years ago
Lynx Kotoura 76905a95a2 Adjust account__action-bar contents (#7818)
7 years ago
Lynx Kotoura a37dc30717 Fix autosuggest-textarea backgrounds and some minor adjustments (#7817)
7 years ago
Yamagishi Kazutoshi cd79647197 Weblate translations (2018-06-16) (#7815)
7 years ago
Jeong Arm c5edc53b2e Add missing Korean translations (#7819)
7 years ago
SerCom_KC 355f55772d Update Chinese (Simplified) Translations (#7816)
7 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