about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-12-11GlitchCafe?pluralcafe-docker
2018-12-11Merge branch 'glitch'pluralcafe-docker
2018-12-11Revert "Add profile directory (#9427)"pluralcafe-docker
2018-12-09Merge pull request #849 from ThibG/glitch-soc/merge-upstreamThibG
2018-12-09Fix directory controller in glitch-socThibaut Girka
2018-12-09[Glitch] Fix various things in the directoryThibaut Girka
2018-12-09Port directory CSS changes from upstreamThibaut Girka
2018-12-09Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-09Add setting to not aggregate reblogs (#9248)ThibG
2018-12-08Cache hashtag sample accounts, and exclude ineligible ones (#9465)Eugen Rochko
2018-12-08Make notification time smaller and reduce contrast (#9464)Eugen Rochko
2018-12-07i18n: Update Polish translation (#9459)Marcin Mikołajczak
2018-12-07Remove pending spec (#9453)ysksn
2018-12-07Bump rubocop from 0.61.0 to 0.61.1 (#9451)dependabot[bot]
2018-12-07Escape HTML in profile name preview in profile settings (#9446)Paweł Ngei
2018-12-07Add specs for ActivityPub::InboxesController (#9456)ysksn
2018-12-07Add specs for Admin::AccountModerationNotesHelper (#9455)ysksn
2018-12-07Remove pending spec (#9454)ysksn
2018-12-07Add specs for AccountTagStat model (#9452)ysksn
2018-12-07Fix various things in the directory (#9449)Eugen Rochko
2018-12-07Fix tag mb_chars comparison of profile directory (#9448)Takeshi Umeda
2018-12-06Add profile directory (#9427)Eugen Rochko
2018-12-06Merge branch 'glitch'Reverite
2018-12-06Merge pull request #848 from ThibG/glitch-soc/merge-upstreamThibG
2018-12-06Add profile directory (#9427)Eugen Rochko
2018-12-06Fix mention links in detailed statuses not opening in the WebUIThibaut Girka
2018-12-06Revert "Add database statement timeout of 60s (#9382)"Thibaut Girka
2018-12-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-06Remove pending spec (#9442)ysksn
2018-12-06Add spec for Identity.find_for_oauth (#9441)ysksn
2018-12-06Bump rails from 5.2.1.1 to 5.2.2 (#9430)dependabot[bot]
2018-12-06Bump rails-controller-testing from 1.0.3 to 1.0.4 (#9440)dependabot[bot]
2018-12-06Bump rubocop from 0.60.0 to 0.61.0 (#9439)dependabot[bot]
2018-12-05Attempt fixing deadlocks by moving account stats update outside transaction (...ThibG
2018-12-05Add visible dates for notifications in Notification column (#9423)Paweł Ngei
2018-12-05Merge branch 'glitch'pluralcafe-docker
2018-12-05Fix thread depth computation in statuses_controller (#9426)ThibG
2018-12-04Bump capybara from 3.11.1 to 3.12.0 (#9388)dependabot[bot]
2018-12-04Bump rails-controller-testing from 1.0.2 to 1.0.3 (#9417)dependabot[bot]
2018-12-04Bump pry-rails from 0.3.7 to 0.3.8 (#9418)dependabot[bot]
2018-12-03Add database statement timeout of 60s (#9382)Eugen Rochko
2018-12-03Improve account suspension speed and completeness (#9290)Eugen Rochko
2018-12-02Merge pull request #838 from ThibG/glitch-soc/features/reply-all-streaming-en...David Yip
2018-12-02Merge pull request #842 from ThibG/glitch-soc/merge-upstreamThibG
2018-12-02Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-02Bump version to 2.6.5 (#9413)Eugen Rochko
2018-12-02Preload common JSON-LD contexts (#9412)ThibG
2018-12-02Merge pull request #840 from ThibG/glitch-soc/merge-upstreamThibG
2018-12-02Merge branch 'glitch'pluralcafe-docker
2018-12-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka