tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • be1c634b2b Fix public timelines being broken by new toots when they are not mounted (#10131) Eugen Rochko 2019-03-07 22:17:52 +01:00
  • 09c042aa10 Handle StaleObjectError when retrieving polls (#10208) ThibG 2019-03-07 15:52:38 +01:00
  • 38e9c66f34 Merge pull request #944 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-07 13:45:43 +01:00
  • 9c5e7805cc Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-07 13:24:30 +01:00
  • 637c952ccb Bump webpush from 0.3.6 to 0.3.7 (#10205) dependabot[bot] 2019-03-07 20:38:10 +09:00
  • 44475bbc9c i18n:🇵🇱 (#10199) marcin mikołajczak 2019-03-07 02:52:43 +01:00
  • 34f261e6af Avoid unnecessarily fetching the replies collection when it is empty (#10201) ThibG 2019-03-07 01:50:37 +01:00
  • dfb45374d2 Fix AddLockVersionToPolls migration (#10200) ThibG 2019-03-07 01:50:06 +01:00
  • f44091d653 Fix #10202 (#10203) rinsuki 2019-03-07 09:49:42 +09:00
  • 84c807a0dc Allow setting whether this is a single choice poll or multiple choices one Thibaut Girka 2019-03-06 14:18:29 +01:00
  • cb6e351f4d Disable file upload when there is a poll Thibaut Girka 2019-03-06 13:52:14 +01:00
  • 235be596bc Use server-provided poll limits instead of hardcoded ones Thibaut Girka 2019-03-06 13:42:48 +01:00
  • 3b1390dc78 Serialize poll limits in instance serializer and initial state Thibaut Girka 2019-03-06 13:36:09 +01:00
  • 8fe86cebaa [Glitch] Port polls creation UI from upstream Thibaut Girka 2019-03-06 12:30:11 +01:00
  • 3e5a0bc825 Fix AddLockVersionToPolls migration Thibaut Girka 2019-03-06 23:06:09 +01:00
  • da8ce25fa1 Merge pull request #942 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-06 22:59:07 +01:00
  • 6e295beab2 [Glitch] Disable the underlying button element when an ItemButton is disabled ThibG 2019-03-06 15:10:32 +01:00
  • cf4fd8bcfe Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-06 22:39:22 +01:00
  • 96f905f409 Add optimistic lock to avoid race conditions when handling votes (#10196) ThibG 2019-03-06 19:53:57 +01:00
  • b3668a79ec Disable the underlying button element when an ItemButton is disabled (#10194) ThibG 2019-03-06 15:10:32 +01:00
  • cb217444b8 Disable file upload when there is a poll (#10195) ThibG 2019-03-06 15:09:18 +01:00
  • 1bb23100b1 Add an icon to highlight polls behind a Content Warning Thibaut Girka 2019-03-06 12:21:18 +01:00
  • fefacb7b7a Merge pull request #939 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-06 12:20:17 +01:00
  • 94a0149ff3 Fix poll options not rendering text after vote/refresh Eugen Rochko 2019-03-06 05:35:52 +01:00
  • 94f1a751bf Avoid line breaks in poll options Eugen Rochko 2019-03-06 04:54:32 +01:00
  • 7f32d675b0 Render unicode emoji in polls using emoji pack Eugen Rochko 2019-03-06 03:57:46 +01:00
  • 4806232997 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-06 11:29:06 +01:00
  • ad6f7ea250 Bump active_record_query_trace from 1.5.4 to 1.6 (#10192) dependabot[bot] 2019-03-06 14:58:13 +09:00
  • fd128b9c7a Fix poll options not rendering text after vote/refresh (#10189) Eugen Rochko 2019-03-06 05:35:52 +01:00
  • 57643557b6 Avoid line breaks in poll options (#10188) Eugen Rochko 2019-03-06 04:54:32 +01:00
  • 5996be994d Fix poll validation issues (#10186) Eugen Rochko 2019-03-06 04:54:11 +01:00
  • d97cbb0da6 Add UI for creating polls (#10184) Eugen Rochko 2019-03-06 04:53:37 +01:00
  • 4407f07014 Render unicode emoji in polls using emoji pack (#10185) Eugen Rochko 2019-03-06 03:57:46 +01:00
  • e80fabfd84 Fix toots opening in dynamic column when trying to interact with them Thibaut Girka 2019-03-05 23:17:09 +01:00
  • bd3567b3f8 Merge pull request #938 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-06 00:20:30 +01:00
  • f108c6a042 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-06 00:03:46 +01:00
  • efd0fb8088 Fix newlines in OStatus and RSS serializations (#10183) ThibG 2019-03-05 23:58:58 +01:00
  • ff827c1f38 [Glitch] Perform deep comparison for card data when receiving new props Thibaut Girka 2019-03-05 22:51:23 +01:00
  • b5f119cfaf Minor update for Slovak tr (#10181) Marek Ľach 2019-03-05 22:42:37 +01:00
  • 772b4ba24c Merge pull request #935 from ThibG/glitch-soc/merge-upstream ThibG 2019-03-05 22:20:58 +01:00
  • 7be1d70411 I18n: Update Czech pluralization (#10182) Aditoo17 2019-03-05 22:13:04 +01:00
  • d604489b5e Weblate translations (2019-03-05) (#10180) Eugen Rochko 2019-03-05 21:52:40 +01:00
  • 866496ac16 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-05 21:40:28 +01:00
  • ba6ca3cd69 Fix various issues in polls Eugen Rochko 2019-03-05 03:51:18 +01:00
  • 7f27ee35a8 Display closed polls as such ThibG 2019-03-04 22:52:41 +01:00
  • 530151466e Fixes to the polls UI ThibG 2019-03-04 01:54:14 +01:00
  • f14eda23e9 Fix web UI crash on page load when detailed status has a poll Eugen Rochko 2019-03-03 23:45:02 +01:00
  • 2156765448 Insert polls in redux stores before statuses so it avoids crashes ThibG 2019-03-03 23:44:52 +01:00
  • 8d70a8a19b Add polls Eugen Rochko 2019-03-03 22:18:23 +01:00
  • 0d19fcc2fb Port upstream refactoring of reducers and actions Thibaut Girka 2019-03-05 20:15:43 +01:00
  • 636db1f54f When serializing polls over OStatus, serialize poll options to text (#10160) ThibG 2019-03-05 21:09:18 +01:00
  • cce1c3252f Fix home timeline perpetually reloading when empty Eugen Rochko 2019-03-01 11:11:35 +01:00
  • f513317ba2 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-03-05 19:23:16 +01:00
  • 7d5e2dda78 Bump version to 2.7.4 (#10179) Eugen Rochko 2019-03-05 18:22:46 +01:00
  • 0c43c320db Fix status creation API silently discarding invalid poll (#10171) Eugen Rochko 2019-03-05 15:21:31 +01:00
  • df5924a1db Do not error out on unsalvageable errors in FetchRepliesService (#10175) ThibG 2019-03-05 15:21:14 +01:00
  • d785497ba5 Fix suspended account's fields being set as empty dict instead of list (#10178) ThibG 2019-03-05 15:19:54 +01:00
  • ac99b3465e Fix NoMethodError in ActivityPub::NoteSerializer (#10172) Eugen Rochko 2019-03-05 05:09:01 +01:00
  • 4037b5eb1e Fix last_fetched_at not being set on polls (#10170) Eugen Rochko 2019-03-05 04:10:01 +01:00
  • a198add83b Fix various issues in polls (#10165) Eugen Rochko 2019-03-05 03:51:18 +01:00
  • 0a39c81dd8 Add test ensuring that unknown object types are rejected (#10166) Eugen Rochko 2019-03-05 03:46:36 +01:00
  • 5d3e7cee99 Fix featured tag form not failing on failed tag validations (#10167) Eugen Rochko 2019-03-05 03:46:24 +01:00
  • 05dfd632c7 Fix poll options not being stripped of surrounding whitespace on save (#10168) Eugen Rochko 2019-03-05 03:45:56 +01:00
  • cda6ece760 Display closed polls as such (#10156) ThibG 2019-03-04 22:52:41 +01:00
  • 833ffce2df Store remote votes URI (#10158) ThibG 2019-03-04 22:51:23 +01:00
  • 7a25bb858a Ensure only people allowed to see the poll can actually vote (#10161) ThibG 2019-03-04 22:47:47 +01:00
  • f2a1b8b96b Widen allowed time windows for polls (#10162) ThibG 2019-03-04 22:46:38 +01:00
  • 3de71887d8 Add non-JS fallback for polls on public pages (#10155) ThibG 2019-03-04 18:03:12 +01:00
  • 4ced609497 Fixes to the polls UI (#10150) ThibG 2019-03-04 01:54:14 +01:00
  • 1a7de769a3 Fix ActivityPub votes having nil IDs (#10151) Eugen Rochko 2019-03-04 01:53:58 +01:00
  • 0e6998da3c Add tests for ActivityPub poll processing (#10143) Eugen Rochko 2019-03-04 01:13:42 +01:00
  • 3cf98aac66 Fix missing in_reply_to in ActivityPub::VoteSerializer (#10148) Eugen Rochko 2019-03-04 01:06:19 +01:00
  • e6900b167b Fix another typo in ActivityPub::FetchRemotePollService (#10146) Eugen Rochko 2019-03-04 00:52:18 +01:00
  • 878a75ba21 Fix typo in ActivityPub::FetchRemotePollService (#10145) Eugen Rochko 2019-03-04 00:50:56 +01:00
  • ae1b9cf70a Fix remote poll expiration time (#10144) Eugen Rochko 2019-03-04 00:44:34 +01:00
  • f821eca3b3 Correctly make polls and media mutually exclusive (#10141) ThibG 2019-03-04 00:40:21 +01:00
  • e13d3792f3 Make sure the poll is created before storing its id (#10142) ThibG 2019-03-04 00:39:06 +01:00
  • 5dfa433698 Fix web UI crash on page load when detailed status has a poll (#10139) Eugen Rochko 2019-03-03 23:45:02 +01:00
  • 26c56d0c10 Insert polls in redux stores before statuses so it avoids crashes (#10140) ThibG 2019-03-03 23:44:52 +01:00
  • 8fe93b0701 Fix vote validation for polls with multiple choices (#10138) Eugen Rochko 2019-03-03 23:41:30 +01:00
  • 230a012f00 Add polls (#10111) Eugen Rochko 2019-03-03 22:18:23 +01:00
  • 99dc212ae5 Fix lists export (#10136) ThibG 2019-03-03 15:38:47 +01:00
  • 2a4ce7458a [Glitch] Fix errors found by eslint Mélanie Chauvel (ariasuni) 2019-02-27 13:38:27 +01:00
  • 282ac61500 [Glitch] Make the column header of profile view look like the others, too Mélanie Chauvel (ariasuni) 2019-02-27 13:36:40 +01:00
  • 12a0dd71be [Glitch] Make the column header of toot/thread view look like the others Mélanie Chauvel (ariasuni) 2019-02-27 13:47:27 +01:00
  • 3e0ed36e8e Fix home timeline perpetually reloading when empty (#10130) Eugen Rochko 2019-03-01 11:11:35 +01:00
  • 5ecbf4d4c0 Bump sidekiq-unique-jobs from 6.0.11 to 6.0.12 (#10132) dependabot[bot] 2019-03-01 15:08:37 +09:00
  • b969b150e8 Merge pull request #932 from ThibG/glitch-soc/merge-upstream ThibG 2019-02-28 22:02:36 +01:00
  • 2267eee356 Merge branch 'master' into glitch-soc/merge-upstream Thibaut Girka 2019-02-28 21:35:53 +01:00
  • ee7d79c0ce Fix serialization of boosts (#10129) ThibG 2019-02-28 21:35:16 +01:00
  • d8498b3983 Give the replies collection an identifier and enable pagination (#10128) ThibG 2019-02-28 18:16:34 +01:00
  • 9d3c6f1849 Improved remote thread fetching (#10106) ThibG 2019-02-28 15:22:21 +01:00
  • 6e8743d17a Fix direct timeline pagination in the WebUI (#10126) ThibG 2019-02-27 19:13:16 +01:00
  • 76ed481aa7 Port public page mastodon-light fixes from upstream Thibaut Girka 2019-02-19 11:35:13 +01:00
  • df01206703 Allow getting-started to scroll on short screens (#10075) trwnh 2019-02-27 08:03:28 -06:00
  • 34315fcda5 Bump capybara from 3.13.2 to 3.14.0 (#10119) dependabot[bot] 2019-02-27 15:02:57 +01:00
  • 74258ef77a Bump hamlit-rails from 0.2.1 to 0.2.2 (#10124) dependabot[bot] 2019-02-27 14:58:08 +01:00
  • 9edab46368 Fix mention processing for unknwon accounts on incoming ActivityPub Notes (#10125) ThibG 2019-02-27 14:57:14 +01:00
  • ff2270cd06 Merge pull request #930 from ThibG/glitch-soc/merge-upstream ThibG 2019-02-26 21:40:28 +01:00
  • 1e06ca1c0a Fix web UI not removing notifications after block (#10108) Eugen Rochko 2019-02-25 01:10:56 +01:00