about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-03-05Fix web UI crash on page load when detailed status has a pollEugen Rochko
Port 5dfa4336985616cf5652de2f1cf794d8f740424e to glitch-soc
2019-03-05Insert polls in redux stores before statuses so it avoids crashesThibG
Port 26c56d0c10ca036291d8b08b34f971f981217e8c to glitch-soc
2019-03-05Add pollsEugen Rochko
Port front-end parts of 230a012f0090c496fc5cdb011bcc8ed732fd0f5c to glitch-soc
2019-03-05Port upstream refactoring of reducers and actionsThibaut Girka
Also includes 9e45b051cfea667f9ca3d3c72d13022259315090
2019-03-05When serializing polls over OStatus, serialize poll options to text (#10160)ThibG
* When serializing polls over OStatus, serialize poll options to text * Do the same for RSS feeds * Use “[ ] ” as a prefix for poll options instead of “- ”
2019-03-05Fix home timeline perpetually reloading when emptyEugen Rochko
Port 3e0ed36e8ede7f1994ab9c46c4cb86e613569440 to glitch-soc
2019-03-05Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/status.rb - db/schema.rb Both conflicts are caused by us having extra database columns.
2019-03-05Bump version to 2.7.4 (#10179)Eugen Rochko
2019-03-05Fix status creation API silently discarding invalid poll (#10171)Eugen Rochko
2019-03-05Do not error out on unsalvageable errors in FetchRepliesService (#10175)ThibG
* Do not error out on unsalvageable errors in FetchRepliesService Fixes #10152 * Fix FetchRepliesWorker erroring out on deleted statuses
2019-03-05Fix suspended account's fields being set as empty dict instead of list (#10178)ThibG
Fixes #10177
2019-03-05Fix NoMethodError in ActivityPub::NoteSerializer (#10172)Eugen Rochko
2019-03-05Fix last_fetched_at not being set on polls (#10170)Eugen Rochko
2019-03-05Fix various issues in polls (#10165)Eugen Rochko
* Fix ActivityPub poll results being serialized even with hide_totals * Fix poll refresh button having a different font size * Display poll in OpenGraph description * Fix NoMethodError when serializing votes Regression from #10158 * Fix polls on public pages being broken for non-logged-in users * Do not show time remaining if poll has no expiration date
2019-03-05Add test ensuring that unknown object types are rejected (#10166)Eugen Rochko
2019-03-05Fix featured tag form not failing on failed tag validations (#10167)Eugen Rochko
2019-03-05Fix poll options not being stripped of surrounding whitespace on save (#10168)Eugen Rochko
2019-03-04Display closed polls as such (#10156)ThibG
2019-03-04Store remote votes URI (#10158)ThibG
* Store remote votes URI * Add spec for accepting remote votes * Make poll vote id generation work the same way as follows
2019-03-04Ensure only people allowed to see the poll can actually vote (#10161)ThibG
2019-03-04Widen allowed time windows for polls (#10162)ThibG
2019-03-04Add non-JS fallback for polls on public pages (#10155)ThibG
2019-03-04Fixes to the polls UI (#10150)ThibG
* Allow unselecting choices in multiple choice polls * Properly disable checkboxes/radio buttons for polls in public pages * Visually differentiate checkboxes and radio buttons
2019-03-04Fix ActivityPub votes having nil IDs (#10151)Eugen Rochko
2019-03-04Add tests for ActivityPub poll processing (#10143)Eugen Rochko
2019-03-04Fix missing in_reply_to in ActivityPub::VoteSerializer (#10148)Eugen Rochko
2019-03-04Fix another typo in ActivityPub::FetchRemotePollService (#10146)Eugen Rochko
2019-03-04Fix typo in ActivityPub::FetchRemotePollService (#10145)Eugen Rochko
2019-03-04Fix remote poll expiration time (#10144)Eugen Rochko
2019-03-04Correctly make polls and media mutually exclusive (#10141)ThibG
2019-03-04Make sure the poll is created before storing its id (#10142)ThibG
* Make sure the poll is created before storing its id * Fix updating poll results * Support fetching Question activities from the search bar
2019-03-03Fix web UI crash on page load when detailed status has a poll (#10139)Eugen Rochko
2019-03-03Insert polls in redux stores before statuses so it avoids crashes (#10140)ThibG
2019-03-03Fix vote validation for polls with multiple choices (#10138)Eugen Rochko
2019-03-03Add polls (#10111)Eugen Rochko
* Add polls Fix #1629 * Add tests * Fixes * Change API for creating polls * Use name instead of content for votes * Remove poll validation for remote polls * Add polls to public pages * When updating the poll, update options just in case they were changed * Fix public pages showing both poll and other media
2019-03-03Fix lists export (#10136)ThibG
2019-03-01[Glitch] Fix errors found by eslintMélanie Chauvel (ariasuni)
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-03-01[Glitch] Make the column header of profile view look like the others, tooMélanie Chauvel (ariasuni)
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-03-01[Glitch] Make the column header of toot/thread view look like the othersMélanie Chauvel (ariasuni)
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-03-01Fix home timeline perpetually reloading when empty (#10130)Eugen Rochko
Regression from #6876
2019-03-01Bump sidekiq-unique-jobs from 6.0.11 to 6.0.12 (#10132)dependabot[bot]
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.11 to 6.0.12. - [Release notes](https://github.com/mhenrixon/sidekiq-unique-jobs/releases) - [Changelog](https://github.com/mhenrixon/sidekiq-unique-jobs/blob/master/CHANGELOG.md) - [Commits](https://github.com/mhenrixon/sidekiq-unique-jobs/compare/v6.0.11...v6.0.12) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-28Merge pull request #932 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-02-28Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-02-28Fix serialization of boosts (#10129)ThibG
The condition introduced by #9998 was wrong, serializing boosts that weren't self-boosts, and not serializing self-boosts.
2019-02-28Give the `replies` collection an identifier and enable pagination (#10128)ThibG
2019-02-28Improved remote thread fetching (#10106)ThibG
* Fetch up to 5 replies when discovering a new remote status This is used for resolving threads downwards. The originating server must add a “replies” attributes with such replies for it to be useful. * Add some tests for ActivityPub::FetchRepliesWorker * Add specs for ActivityPub::FetchRepliesService * Serialize up to 5 public self-replies for ActivityPub notes * Add specs for ActivityPub::NoteSerializer * Move exponential backoff logic to a worker concern * Fetch first page of paginated collections when fetching thread replies * Add specs for paginated collections in replies * Move Note replies serialization to a first CollectionPage The collection isn't actually paginable yet as it has no id nor a `next` field. This may come in another PR. * Use pluck(:uri) instead of map(&:uri) to improve performances * Fix fetching replies when they are in a CollectionPage
2019-02-27Fix direct timeline pagination in the WebUI (#10126)ThibG
The `hasMore` property of timelines in redux store was set whenever an API request returned only one page of results, *even* if the query only requested newer conversations (using `since_id`), causing `hasMore` to be incorrectly set to false whenever fetching new toots in the direct timeline, which happens each time the direct message column is opened. (Basically #9516 for direct messages)
2019-02-27Port public page mastodon-light fixes from upstreamThibaut Girka
2019-02-27Allow getting-started to scroll on short screens (#10075)trwnh
At 480px height, there is not enough space to fully display the footer.
2019-02-27Bump capybara from 3.13.2 to 3.14.0 (#10119)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.13.2 to 3.14.0. - [Release notes](https://github.com/teamcapybara/capybara/releases) - [Changelog](https://github.com/teamcapybara/capybara/blob/master/History.md) - [Commits](https://github.com/teamcapybara/capybara/compare/3.13.2...3.14.0) Signed-off-by: dependabot[bot] <support@dependabot.com>