about summary refs log tree commit diff
AgeCommit message (Expand)Author
2019-03-10Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-10Reject existing Follows when suspending a remote account (#10230)ThibG
2019-03-10Fix SSL configuration regression in streaming API (#10225)Eugen Rochko
2019-03-10Add clearer error when/if gpg fails to install (#10228)Armand Fardeau
2019-03-09Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on a...Aditoo17
2019-03-08Merge pull request #947 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-08Fix min/max duration poll limits being invertedThibaut Girka
2019-03-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-08Fix setting up fields of a previously suspended account (#10222)ThibG
2019-03-08Re-organize Dockerfile to improve incremental builds. (#10212)Ben Lubar
2019-03-08config: add DB_SSLMODE for managed/remote PG (#10210)Sascha
2019-03-08Bump pkg-config from 1.3.4 to 1.3.5 (#10218)dependabot[bot]
2019-03-08Merge pull request #945 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-08[Glitch] Fix NaN in Poll componentEugen Rochko
2019-03-08[Glitch] Fix public timelines being broken by new toots when they are not mou...Eugen Rochko
2019-03-08Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-08Do not allow adding votes to expired polls (#10214)ThibG
2019-03-07Immediately display poll results to poll author (#10187)Eugen Rochko
2019-03-07Fix NaN in Poll component (#10213)Eugen Rochko
2019-03-07Fix public timelines being broken by new toots when they are not mounted (#10...Eugen Rochko
2019-03-07Handle StaleObjectError when retrieving polls (#10208)ThibG
2019-03-07Merge pull request #944 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-07Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-07Bump webpush from 0.3.6 to 0.3.7 (#10205)dependabot[bot]
2019-03-07i18n:🇵🇱 (#10199)marcin mikołajczak
2019-03-07Avoid unnecessarily fetching the replies collection when it is empty (#10201)ThibG
2019-03-07Fix AddLockVersionToPolls migration (#10200)ThibG
2019-03-07Fix #10202 (#10203)rinsuki
2019-03-06Allow setting whether this is a single choice poll or multiple choices oneThibaut Girka
2019-03-06Disable file upload when there is a pollThibaut Girka
2019-03-06Use server-provided poll limits instead of hardcoded onesThibaut Girka
2019-03-06Serialize poll limits in instance serializer and initial stateThibaut Girka
2019-03-06[Glitch] Port polls creation UI from upstreamThibaut Girka
2019-03-06Fix AddLockVersionToPolls migrationThibaut Girka
2019-03-06Merge pull request #942 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-06[Glitch] Disable the underlying button element when an ItemButton is disabledThibG
2019-03-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-06Add optimistic lock to avoid race conditions when handling votes (#10196)ThibG
2019-03-06Disable the underlying button element when an ItemButton is disabled (#10194)ThibG
2019-03-06Disable file upload when there is a poll (#10195)ThibG
2019-03-06Add an icon to highlight polls behind a Content WarningThibaut Girka
2019-03-06Merge pull request #939 from ThibG/glitch-soc/merge-upstreamThibG
2019-03-06Fix poll options not rendering text after vote/refreshEugen Rochko
2019-03-06Avoid line breaks in poll optionsEugen Rochko
2019-03-06Render unicode emoji in polls using emoji packEugen Rochko
2019-03-06Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-03-06Bump active_record_query_trace from 1.5.4 to 1.6 (#10192)dependabot[bot]
2019-03-06Fix poll options not rendering text after vote/refresh (#10189)Eugen Rochko
2019-03-06Avoid line breaks in poll options (#10188)Eugen Rochko
2019-03-06Fix poll validation issues (#10186)Eugen Rochko