about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-23Fix caret position after selected suggestion and media upload (#7595)ThibG
2018-05-23Fix tests for invites controller (regression from 4d81809f36fcbfe787e23d490f2...Yamagishi Kazutoshi
2018-05-22Yeah, it was supposed to be #create?Eugen Rochko
2018-05-22Bump version to 2.4.0Eugen Rochko
2018-05-22Remove pointer to light theme until it is more polished (#7594)Eugen Rochko
2018-05-22Remove unneeded code now that attachment URL isn't appended to toots (#7593)ThibG
2018-05-22Do not encode HTML entities in initial Web Push payload body (#7592)Eugen Rochko
2018-05-22[WIP] i18n: Update Simplified Chinese translations (#7576)SerCom_KC
2018-05-22Add tests for report notes controller (#7589)Shuhei Kitagawa
2018-05-22Enforce order on authorized applications page (#7587)Eugen Rochko
2018-05-22Hide section headline for timelines in production (#7590)Yamagishi Kazutoshi
2018-05-22Change column params on pinned timeline (#7581)Yamagishi Kazutoshi
2018-05-22Remove outline (#7582)bsky
2018-05-22[RU] Added mastodon-light string (#7583)Evgeny Petrov
2018-05-22Merge pull request #503 from glitch-soc/merge-upstreamThibG
2018-05-21Merge remote-tracking branch 'origin/master' into merge-upstreamDavid Yip
2018-05-21🌍: 🇵🇱⬆️ (#7580)Marcin Mikołajczak
2018-05-21Merge remote-tracking branch 'tootsuite/master' into glitchsoc/masterJenkins
2018-05-21Merge pull request #495 from ThibG/glitch-soc/fixes/port-upstream-fixesThibG
2018-05-21Fix width only being set for standalone mediaThibaut Girka
2018-05-21[Glitch] Use real container width in MediaGallery srcSetThibaut Girka
2018-05-21[Glitch] Do not override the default push notification settingsThibaut Girka
2018-05-21Merge pull request #499 from ThibG/glitch-soc/merge-upstreamThibG
2018-05-21Save onlyMedia prop when pinning column (#7575)Eugen Rochko
2018-05-21Display only domain of report account if remote under comment (#7574)Eugen Rochko
2018-05-21Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-21Merge pull request #492 from ThibG/glitch-soc/fixes/port-scssThibG
2018-05-21Add exact attribute to WrappedRoute for community timeline (#7572)Yamagishi Kazutoshi
2018-05-21Bump version to 2.4.0rc5Eugen Rochko
2018-05-21Use real container width in MediaGallery srcSet (#7571)Eugen Rochko
2018-05-21Use #any? instead of #exists? when checking media attachments (#7570)Eugen Rochko
2018-05-21Unescape HTML entities in rich web push notifications in web UI (#7569)Eugen Rochko
2018-05-21Recover glitch-soc specific styles that were removed by accidentThibaut Girka
2018-05-21i18n: Update Simplified Chinese translations (#7565)SerCom_KC
2018-05-21Add a light theme (#7027)Sylvhem
2018-05-21Add media timeline (#6631)Yamagishi Kazutoshi
2018-05-21Remove small pagination limit from context API (#7564)Eugen Rochko
2018-05-21Convert rich push notifications to plaintext in webapp (#7563)Eugen Rochko
2018-05-20[i18n] Update for Occitan (#7558)Quentí
2018-05-20Improve default background of public profile header (#7556)Eugen Rochko
2018-05-20In footer, replace text "Mastodon" with logoThibaut Girka
2018-05-20Add preference to hide following/followers listsThibaut Girka
2018-05-20[Glitch] Improvements to toots display in admin viewThibaut Girka
2018-05-20Merge pull request #470 from ThibG/glitch-soc/fixes/status-click-detailedDavid Yip
2018-05-20Merge pull request #494 from ThibG/glitch-soc/merge-upstreamDavid Yip
2018-05-20[RU] Updated strings for 2.4.0 (#7555)Evgeny Petrov
2018-05-20🌍: 🇵🇱⬆️ (#7554)Marcin Mikołajczak
2018-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-05-19Weblate translations (2018-05-20) (#7552)Yamagishi Kazutoshi