about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-10-30Remove progress estimate from MigrateAccountConversations (#9168)Eugen Rochko
2018-10-30Merge pull request #802 from ThibG/glitch-soc/merge-upstreamThibG
2018-10-30Specify node version to not use node11 (#9166)Jeong Arm
2018-10-30[Glitch] Fix empty display name precedence over username in web UIThibaut Girka
2018-10-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-30Add a local setting for inline preview cardsThibaut Girka
2018-10-30Add a “link” status icon for toots with a preview cardThibaut Girka
2018-10-30[Glitch] Fix dimensions of preview cards, fix crash in web UI, fix warningThibaut Girka
2018-10-30[Glitch] Include preview cards in status entity in REST APIThibaut Girka
2018-10-30Bump version to 2.6.0rc4 (#9164)Eugen Rochko
2018-10-30Fix empty display name precedence over username in web UI (#9163)Eugen Rochko
2018-10-30Fix td instead of th in sessions table header (#9162)Eugen Rochko
2018-10-30Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out ...Eugen Rochko
2018-10-30Fix FetchAtomService content type handling (#9132)valerauko
2018-10-30[i18n] Update for Occitan (#9157)Quentí
2018-10-30Accept the same payload in multiple inboxes and deliver (#9150)Eugen Rochko
2018-10-30Always let through notifications from staff (#9152)Eugen Rochko
2018-10-30Fix Pleroma mentions being fetched as preview cards (#9158)ThibG
2018-10-30[Security] Bump loofah from 2.2.2 to 2.2.3 (#9160)dependabot[bot]
2018-10-30Merge pull request #801 from ThibG/glitch-soc/merge-upstreamThibG
2018-10-30Remove duplicate and outdated specsThibaut Girka
2018-10-30[Glitch] RTL: fix toot privacy preferences radio buttonssMasoud Abkenar
2018-10-30[Glitch] RTL: fix preferences page checkbox marginsMasoud Abkenar
2018-10-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-30Bump oj from 3.6.12 to 3.7.0 (#9155)dependabot[bot]
2018-10-30Make detailed-status__wrapper actually wrap detailed status (#8547)trwnh
2018-10-30Bump i18n-tasks from master to 0.9.28 (#9148)Eugen Rochko
2018-10-30RTL: fix toot privacy preferences radio buttonss (#9146)Masoud Abkenar
2018-10-30RTL: fix preferences page checkbox margins (#9145)Masoud Abkenar
2018-10-30Do not hide boost notifications from followed people with hidden boosts (#9147)ThibG
2018-10-29move some constants to rails environmentash lea
2018-10-29Merge pull request #798 from ThibG/glitch-soc/merge-upstreamThibG
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-29Bump version to 2.6.0rc3 (#9142)Eugen Rochko
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-29Update AUTHORS.md (#9141)Eugen Rochko
2018-10-29Bump sanitize from 4.6.6 to 5.0.0 (#9140)Eugen Rochko
2018-10-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-29Update i18n-tasks to master (#9139)Eugen Rochko
2018-10-29Improved grammar in German translation (#9092)Julian
2018-10-29Add Page AP type support (#9121)m.b
2018-10-29Weblate translations (2018-10-26) (#9113)Renato "Lond" Cerqueira
2018-10-29Bump parallel_tests from 2.25.0 to 2.26.0 (#9137)dependabot[bot]
2018-10-29Bump tzinfo-data from 1.2018.6 to 1.2018.7 (#9136)dependabot[bot]
2018-10-29Bump rubocop from 0.59.2 to 0.60.0 (#9135)dependabot[bot]
2018-10-29Bump doorkeeper from 5.0.1 to 5.0.2 (#9134)dependabot[bot]
2018-10-29Fix dimensions of preview cards, fix crash in web UI, fix warning (#9133)Eugen Rochko
2018-10-28Merge pull request #794 from ThibG/glitch-soc/merge-upstreamThibG
2018-10-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-28Update i18n-tasks and change CircleCI command (#9104)Eugen Rochko