about summary refs log tree commit diff
AgeCommit message (Expand)Author
2018-12-07Fix tag mb_chars comparison of profile directory (#9448)Takeshi Umeda
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-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-01Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-12-01Fix since_idThibaut Girka
2018-12-01Fix last_status parameter for notifications and conversations (#9407)ThibG
2018-12-01[i18n] update and corrections for Occitan locale (#9404)Quentí
2018-12-01Add a tooltip explaining what a locked account is (#9403)Paweł Ngei
2018-11-30Merge pull request #837 from ThibG/glitch-soc/merge-upstreamThibG
2018-11-30Scroll to selected toot even if the ancestors happen to be loadedThibaut Girka
2018-11-30Scroll to detailed status when new ancestors get insertedThibaut Girka
2018-11-30[Glitch] Fix bug in order of conversations in web UIThibaut Girka
2018-11-30[Glitch] Replace recursion in status mapStateToPropsThibaut Girka
2018-11-30[Glitch] Fix context building in the reducerThibaut Girka
2018-11-30[Glitch] Introduce flat layout to contexts reducerThibaut Girka
2018-11-30Display a double reply arrow on public pages for toots that are repliesThibaut Girka
2018-11-30Bump version to 2.6.4 (#9402)Eugen Rochko
2018-11-30Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-30Fix that translation is not applied to "joining hashtags" (#9397)mayaeh
2018-11-30Remove npm-run-all dependency (#9401)Eugen Rochko
2018-11-30Bump oj from 3.7.1 to 3.7.4 (#9393)dependabot[bot]
2018-11-30Bump fastimage from 2.1.4 to 2.1.5 (#9395)dependabot[bot]
2018-11-30Bump version to 2.6.3 (#9391)Eugen Rochko
2018-11-29Merge pull request #835 from ThibG/glitch-soc/merge-upstreamThibG
2018-11-29Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2018-11-29Improve detailed status component lifecycleThibaut Girka
2018-11-29Swap avatar and header input fields in profile page (#9271)ThibG
2018-11-28Do not hardcode preferences link, pleroma doesn't have itThibaut Girka