about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-05-29Merge pull request #525 from ThibG/glitch-soc/merge-upstreamDavid Yip
2018-05-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-29Fix N+1 on AtomSerializer (#7669)abcang
2018-05-29Use URL polyfill (#7664)Yamagishi Kazutoshi
2018-05-29Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)Eugen Rochko
2018-05-29Always display tab navigation on local/federated timeline even when empty (#7...Eugen Rochko
2018-05-29Rescue Mastodon::DimensionsValidationError in Remoteable (#7662)Eugen Rochko
2018-05-29Cache attachments on external host with service worker (#7493)Akihiko Odaki
2018-05-28fix: Don't validate MX record in development (#7654)takayamaki
2018-05-28Fix embed, error and onboarding modals in light theme (#7656)Lynx Kotoura
2018-05-28Fix incomplete flex style on trends items (#7655)Eugen Rochko
2018-05-28Add a test for emojis_controller (#7652)Shuhei Kitagawa
2018-05-28optimize direct timeline (#7614)tateisu
2018-05-28Record trending tags from ActivityPub, too (#7647)Eugen Rochko
2018-05-28Replace recursion in status mapStateToProps (#7645)Eugen Rochko
2018-05-27Track trending tags (#7638)Eugen Rochko
2018-05-27[Glitch] Replace onScrollToBottom with onLoadMoreThibaut Girka
2018-05-27Do not needlessly refresh pinned tootsThibaut Girka
2018-05-27[Glitch] Change icon for domain blocksThibaut Girka
2018-05-27[Glitch] Add option to show only local toots in timeline previewThibaut Girka
2018-05-27[Glitch] Use streaming API for standalone timelines on /about and /tag pagesThibaut Girka
2018-05-27Change direct message warning to match upstreamThibaut Girka
2018-05-27Merge pull request #520 from ThibG/glitch-soc/merge-upstreamThibG
2018-05-27Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-27Implement client-size image resizing from upstreamThibaut Girka
2018-05-27Port upstream's result section headers (fixes #366)Thibaut Girka
2018-05-27Validate that e-mail resolves with MX and it's not blacklisted (#7631)Eugen Rochko
2018-05-27Don't use Object.assign with Notification, only display actions for mentions ...Eugen Rochko
2018-05-26Fix lock icon position in account card (#7630)bsky
2018-05-26Merge pull request #508 from ThibG/glitch-soc/fixes/remove-leftover-from-atta...ThibG
2018-05-26Fix caret position after inserting suggestions (fixes #281)Thibaut Girka
2018-05-26Remove unneeded code now that attachment URL isn't appended to tootsThibaut Girka
2018-05-26Add right margin of notification message (#7628)Lynx Kotoura
2018-05-26Fix color mistakes in mastodon-light theme (#7626)Lynx Kotoura
2018-05-26Weblate translations (2018-05-26) (#7624)Yamagishi Kazutoshi
2018-05-26Catch ActionController::UnknownFormat and return HTTP 406 (#7621)Eugen Rochko
2018-05-26Disable AMS logging (#7623)Eugen Rochko
2018-05-25Merge pull request #514 from ThibG/glitch-soc/fixes/fix-hardcoded-favThibG
2018-05-25Merge pull request #518 from ThibG/glitch-soc/merge-masterThibG
2018-05-25Merge branch 'master' into glitch-soc/merge-masterThibaut Girka
2018-05-25Remove Puma pidfile before boot if container receives SIGTERM (#7052)Isatis
2018-05-25Introduce flat layout to contexts reducer (#7150)Akihiko Odaki
2018-05-25Enable media timeline (#7598)Yamagishi Kazutoshi
2018-05-25More polished light theme (#7620)Lynx Kotoura
2018-05-25Fix color of /about/more link anchors (#7618)Lynx Kotoura
2018-05-25Merge pull request #517 from ThibG/glitch-soc/fixes/max_toot_charsThibG
2018-05-25Added the law requirements for the EU/EEA (#7605)Jeroen
2018-05-25Ignore multiple occurrences of a hashtag within a status (fixes #7585) (#7606)ThibG
2018-05-25Add missing comma in InitalStateSerializer (fixes #516)Thibaut Girka
2018-05-25[Glitch] Use .star-icon instead of hardcoding color in detailed statusesThibaut Girka