Commit graph

  • 05aa8b9303 Reject existing Follows when suspending a remote account (#10230) ThibG 2019-03-10 16:18:58 +0100
  • c11dff5049 Reject existing Follows when suspending a remote account (#10230) ThibG 2019-03-10 16:18:58 +0100
  • d182fec01a Fix SSL configuration regression in streaming API (#10225) Eugen Rochko 2019-03-10 16:00:54 +0100
  • dbeab5a036
    Fix SSL configuration regression in streaming API (#10225) Eugen Rochko 2019-03-10 16:00:54 +0100
  • 31c7cd0942 Add clearer error when/if gpg fails to install (#10228) Armand Fardeau 2019-03-10 16:00:22 +0100
  • b6bc98c480 Add clearer error when/if gpg fails to install (#10228) Armand Fardeau 2019-03-10 16:00:22 +0100
  • caa40e9d9b Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server (#10224) Aditoo17 2019-03-09 17:07:59 +0100
  • 6c0a96912a Change joinmastodon.org to joinmastodon.org/#getting-started for sign up on another server (#10224) Aditoo17 2019-03-09 17:07:59 +0100
  • dad42ecee0 Merge pull request #947 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-08 20:43:51 +0100
  • 42cc93e892
    Merge pull request #947 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-08 20:43:51 +0100
  • 96e7f430de Fix min/max duration poll limits being inverted Thibaut Girka 2019-03-08 20:20:40 +0100
  • 93daa97fc3 Fix min/max duration poll limits being inverted Thibaut Girka 2019-03-08 20:20:40 +0100
  • bed7758022 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-08 20:15:57 +0100
  • 674fe32f97 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-08 20:15:57 +0100
  • 32f0cc5ccd Fix setting up fields of a previously suspended account (#10222) ThibG 2019-03-08 19:59:08 +0100
  • 3f4a6d44fe Fix setting up fields of a previously suspended account (#10222) ThibG 2019-03-08 19:59:08 +0100
  • f461d0a193 Re-organize Dockerfile to improve incremental builds. (#10212) Ben Lubar 2019-03-08 09:12:48 -0600
  • d36fcb54c4 Re-organize Dockerfile to improve incremental builds. (#10212) Ben Lubar 2019-03-08 09:12:48 -0600
  • 291fbe21c2 config: add DB_SSLMODE for managed/remote PG (#10210) Sascha 2019-03-08 14:36:28 +0100
  • 42e733681a config: add DB_SSLMODE for managed/remote PG (#10210) Sascha 2019-03-08 14:36:28 +0100
  • 51faba7b59 Bump pkg-config from 1.3.4 to 1.3.5 (#10218) dependabot[bot] 2019-03-08 19:16:55 +0900
  • 9e33a71efa Bump pkg-config from 1.3.4 to 1.3.5 (#10218) dependabot[bot] 2019-03-08 19:16:55 +0900
  • 5baae3d9c0 Merge pull request #945 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-08 01:47:36 +0100
  • 29a09858f6
    Merge pull request #945 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-08 01:47:36 +0100
  • b9a799c343 [Glitch] Fix NaN in Poll component Eugen Rochko 2019-03-07 22:18:05 +0100
  • ca45198ccb [Glitch] Fix NaN in Poll component Eugen Rochko 2019-03-07 22:18:05 +0100
  • 7565b8afa3 [Glitch] Fix public timelines being broken by new toots when they are not mounted Eugen Rochko 2019-03-07 22:17:52 +0100
  • 6fe48dd050 [Glitch] Fix public timelines being broken by new toots when they are not mounted Eugen Rochko 2019-03-07 22:17:52 +0100
  • 9b093dfcde Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-08 00:57:13 +0100
  • 5528719bc9 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-08 00:57:13 +0100
  • dcbe6c16ba Do not allow adding votes to expired polls (#10214) ThibG 2019-03-08 00:54:50 +0100
  • 3aaac4f134 Do not allow adding votes to expired polls (#10214) ThibG 2019-03-08 00:54:50 +0100
  • b7a8a52bc5 Immediately display poll results to poll author (#10187) Eugen Rochko 2019-03-07 22:53:47 +0100
  • 054bbb3da2
    Immediately display poll results to poll author (#10187) Eugen Rochko 2019-03-07 22:53:47 +0100
  • 19cccea89a Fix NaN in Poll component (#10213) Eugen Rochko 2019-03-07 22:18:05 +0100
  • 75cb93676b
    Fix NaN in Poll component (#10213) Eugen Rochko 2019-03-07 22:18:05 +0100
  • 8e9db67a6a Fix public timelines being broken by new toots when they are not mounted (#10131) Eugen Rochko 2019-03-07 22:17:52 +0100
  • be1c634b2b
    Fix public timelines being broken by new toots when they are not mounted (#10131) Eugen Rochko 2019-03-07 22:17:52 +0100
  • 641384d288 Handle StaleObjectError when retrieving polls (#10208) ThibG 2019-03-07 15:52:38 +0100
  • 09c042aa10 Handle StaleObjectError when retrieving polls (#10208) ThibG 2019-03-07 15:52:38 +0100
  • 51e37e9d6a Merge pull request #944 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-07 13:45:43 +0100
  • 38e9c66f34
    Merge pull request #944 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-07 13:45:43 +0100
  • d8d8c64965 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-07 13:24:30 +0100
  • 9c5e7805cc Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-07 13:24:30 +0100
  • adc68b7a2e Bump webpush from 0.3.6 to 0.3.7 (#10205) dependabot[bot] 2019-03-07 20:38:10 +0900
  • 637c952ccb Bump webpush from 0.3.6 to 0.3.7 (#10205) dependabot[bot] 2019-03-07 20:38:10 +0900
  • 5232eccc5c i18n:🇵🇱 (#10199) marcin mikołajczak 2019-03-07 02:52:43 +0100
  • 44475bbc9c i18n:🇵🇱 (#10199) marcin mikołajczak 2019-03-07 02:52:43 +0100
  • db21a6c5ee Avoid unnecessarily fetching the replies collection when it is empty (#10201) ThibG 2019-03-07 01:50:37 +0100
  • 34f261e6af Avoid unnecessarily fetching the replies collection when it is empty (#10201) ThibG 2019-03-07 01:50:37 +0100
  • 401a3cfdf0 Fix AddLockVersionToPolls migration (#10200) ThibG 2019-03-07 01:50:06 +0100
  • dfb45374d2 Fix AddLockVersionToPolls migration (#10200) ThibG 2019-03-07 01:50:06 +0100
  • ed3d470069 Fix #10202 (#10203) rinsuki 2019-03-07 09:49:42 +0900
  • f44091d653 Fix #10202 (#10203) rinsuki 2019-03-07 09:49:42 +0900
  • a9597fd8a6 Allow setting whether this is a single choice poll or multiple choices one Thibaut Girka 2019-03-06 14:18:29 +0100
  • 84c807a0dc Allow setting whether this is a single choice poll or multiple choices one Thibaut Girka 2019-03-06 14:18:29 +0100
  • 81a92465f2 Disable file upload when there is a poll Thibaut Girka 2019-03-06 13:52:14 +0100
  • cb6e351f4d Disable file upload when there is a poll Thibaut Girka 2019-03-06 13:52:14 +0100
  • 49c4e57973 Use server-provided poll limits instead of hardcoded ones Thibaut Girka 2019-03-06 13:42:48 +0100
  • 235be596bc Use server-provided poll limits instead of hardcoded ones Thibaut Girka 2019-03-06 13:42:48 +0100
  • 9f06da948b Serialize poll limits in instance serializer and initial state Thibaut Girka 2019-03-06 13:36:09 +0100
  • 3b1390dc78 Serialize poll limits in instance serializer and initial state Thibaut Girka 2019-03-06 13:36:09 +0100
  • e2d56cc90d [Glitch] Port polls creation UI from upstream Thibaut Girka 2019-03-06 12:30:11 +0100
  • 8fe86cebaa [Glitch] Port polls creation UI from upstream Thibaut Girka 2019-03-06 12:30:11 +0100
  • 8124b60a99 Fix AddLockVersionToPolls migration Thibaut Girka 2019-03-06 23:06:09 +0100
  • 3e5a0bc825 Fix AddLockVersionToPolls migration Thibaut Girka 2019-03-06 23:06:09 +0100
  • cff221b519 Merge pull request #942 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-06 22:59:07 +0100
  • da8ce25fa1
    Merge pull request #942 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-06 22:59:07 +0100
  • 6b4eb1ac96 [Glitch] Disable the underlying button element when an ItemButton is disabled ThibG 2019-03-06 15:10:32 +0100
  • 6e295beab2 [Glitch] Disable the underlying button element when an ItemButton is disabled ThibG 2019-03-06 15:10:32 +0100
  • f123b809a7 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-06 22:39:22 +0100
  • cf4fd8bcfe Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-06 22:39:22 +0100
  • 4f2eb43d8a Add optimistic lock to avoid race conditions when handling votes (#10196) ThibG 2019-03-06 19:53:57 +0100
  • 96f905f409 Add optimistic lock to avoid race conditions when handling votes (#10196) ThibG 2019-03-06 19:53:57 +0100
  • 365f875f57 Disable the underlying button element when an ItemButton is disabled (#10194) ThibG 2019-03-06 15:10:32 +0100
  • b3668a79ec Disable the underlying button element when an ItemButton is disabled (#10194) ThibG 2019-03-06 15:10:32 +0100
  • 0b7c53937f Disable file upload when there is a poll (#10195) ThibG 2019-03-06 15:09:18 +0100
  • cb217444b8 Disable file upload when there is a poll (#10195) ThibG 2019-03-06 15:09:18 +0100
  • 8d82e153f3 Add an icon to highlight polls behind a Content Warning Thibaut Girka 2019-03-06 12:21:18 +0100
  • 1bb23100b1 Add an icon to highlight polls behind a Content Warning Thibaut Girka 2019-03-06 12:21:18 +0100
  • 1397836898 Merge pull request #939 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-06 12:20:17 +0100
  • fefacb7b7a
    Merge pull request #939 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-06 12:20:17 +0100
  • 9844b44e99 Fix poll options not rendering text after vote/refresh Eugen Rochko 2019-03-06 05:35:52 +0100
  • 94a0149ff3 Fix poll options not rendering text after vote/refresh Eugen Rochko 2019-03-06 05:35:52 +0100
  • 31017d18a5 Avoid line breaks in poll options Eugen Rochko 2019-03-06 04:54:32 +0100
  • 94f1a751bf Avoid line breaks in poll options Eugen Rochko 2019-03-06 04:54:32 +0100
  • 3ce4d88e6c Render unicode emoji in polls using emoji pack Eugen Rochko 2019-03-06 03:57:46 +0100
  • 7f32d675b0 Render unicode emoji in polls using emoji pack Eugen Rochko 2019-03-06 03:57:46 +0100
  • 3ebbc1f017 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-06 11:29:06 +0100
  • 4806232997 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-06 11:29:06 +0100
  • 67764e36f9 Bump active_record_query_trace from 1.5.4 to 1.6 (#10192) dependabot[bot] 2019-03-06 14:58:13 +0900
  • ad6f7ea250 Bump active_record_query_trace from 1.5.4 to 1.6 (#10192) dependabot[bot] 2019-03-06 14:58:13 +0900
  • 9cae3a3b48 Fix poll options not rendering text after vote/refresh (#10189) Eugen Rochko 2019-03-06 05:35:52 +0100
  • fd128b9c7a
    Fix poll options not rendering text after vote/refresh (#10189) Eugen Rochko 2019-03-06 05:35:52 +0100
  • 0d8890f073 Avoid line breaks in poll options (#10188) Eugen Rochko 2019-03-06 04:54:32 +0100
  • 57643557b6
    Avoid line breaks in poll options (#10188) Eugen Rochko 2019-03-06 04:54:32 +0100
  • 1441046fdf Fix poll validation issues (#10186) Eugen Rochko 2019-03-06 04:54:11 +0100
  • 5996be994d
    Fix poll validation issues (#10186) Eugen Rochko 2019-03-06 04:54:11 +0100
  • a15b0dc600 Add UI for creating polls (#10184) Eugen Rochko 2019-03-06 04:53:37 +0100
  • d97cbb0da6
    Add UI for creating polls (#10184) Eugen Rochko 2019-03-06 04:53:37 +0100