about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-11-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-06[Security] Bump rack from 2.0.5 to 2.0.6 (#9214)dependabot[bot]
2018-11-05Bump active_model_serializers from 0.10.7 to 0.10.8 (#9209)dependabot[bot]
2018-11-05Temporarily hold timeline if mouse moved recently (fixes #8630) (#9200)Les Orchard
2018-11-05Update resolve_url_service.rb (#9188)m.b
2018-11-05Allow joining several hashtags in a single column (#8904)James Kiesel
2018-11-05Implement adding a user to a list from their profile (#9062)namelessGonbai
2018-11-05Check for empty "last_status" before sorting DM column (#9207)Steven Tappert
2018-11-05fix(reset): Property name for styled scrollbars (#9210)Sorin Davidoi
2018-11-05Bump rack-attack from 5.4.1 to 5.4.2 (#9186)dependabot[bot]
2018-11-03Bump redis from 4.0.2 to 4.0.3 (#9187)dependabot[bot]
2018-10-31Fix timestamp position in public pages with RTL languagesThibaut Girka
2018-10-31Fix styling of display names in public pagesThibaut Girka
2018-10-31Merge pull request #803 from ThibG/glitch-soc/merge-upstreamThibG
2018-10-31Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-10-31[Glitch] Port some of upstream's getting started footer linksThibaut Girka
2018-10-31Bump version to 2.6.1 (#9172)Eugen Rochko
2018-10-31Fix reducer error when conversation has no last status in web UI (#9173)Eugen Rochko
2018-10-31Revert "Fix FetchAtomService content type handling (#9132)" (#9171)Eugen Rochko
2018-10-30Bump version to 2.6.0 (#9149)Eugen Rochko
2018-10-30[i18n] Update for Occitan (#9169)Quentí
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