about summary refs log tree commit diff
AgeCommit message (Collapse)Author
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>
2019-02-27Bump hamlit-rails from 0.2.1 to 0.2.2 (#10124)dependabot[bot]
Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.1 to 0.2.2. - [Release notes](https://github.com/mfung/hamlit-rails/releases) - [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.1...v0.2.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-27Fix mention processing for unknwon accounts on incoming ActivityPub Notes ↵ThibG
(#10125) `::FetchRemoteAccountService` is not `ActivityPub::FetchRemoteAccountService`, its second argument is the pre-fetched body. Passing `id: false` actually passed a `Hash` as the prefetched body, instead of properly resolving unknown remote accounts.
2019-02-26Merge pull request #930 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-02-26Fix web UI not removing notifications after block (#10108)Eugen Rochko
Regression from #7311
2019-02-26Keep notification when muting_notifications is true (#7311)abcang
* Keep notification when muting_notifications is true * Retrun mute object * Fix test
2019-02-26Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - Dockerfile Took upstream version and reverted f13ebd02c91776ddb88b5178bf9015c6e0f1ca80. Hopefuly it's not needed anymore. - app/controllers/api/v1/search_controller.rb The conflict was due to us raising the number of results returned. Upstream raised it further, so took it. - config/locales/de.yml Took upstream changes to theme translation strings. - config/locales/gl.yml Took upstream changes to theme translation strings. - config/locales/nl.yml Took upstream changes to theme translation strings. - config/locales/sk.yml Took upstream changes to theme translation strings.
2019-02-26Improve account media query (#10121)abcang
2019-02-26Add type, limit, offset, min_id, max_id, account_id to search API (#10091)Eugen Rochko
* Add type, limit, offset, min_id, max_id, account_id to search API Fix #8939 * Make the offset work on accounts and hashtags search as well * Assure brakeman we are not doing mass assignment here * Do not allow paginating unless a type is chosen * Fix search query and index id field on statuses instead of created_at
2019-02-26Bump hamlit-rails from 0.2.0 to 0.2.1 (#10120)dependabot[bot]
Bumps [hamlit-rails](https://github.com/mfung/hamlit-rails) from 0.2.0 to 0.2.1. - [Release notes](https://github.com/mfung/hamlit-rails/releases) - [Commits](https://github.com/mfung/hamlit-rails/compare/v0.2.0...v0.2.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-26Bump bootsnap from 1.4.0 to 1.4.1 (#10118)dependabot[bot]
Bumps [bootsnap](https://github.com/Shopify/bootsnap) from 1.4.0 to 1.4.1. - [Release notes](https://github.com/Shopify/bootsnap/releases) - [Changelog](https://github.com/Shopify/bootsnap/blob/master/CHANGELOG.md) - [Commits](https://github.com/Shopify/bootsnap/compare/v1.4.0...v1.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-25Bump rubocop from 0.64.0 to 0.65.0 (#10112)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.64.0 to 0.65.0. - [Release notes](https://github.com/rubocop-hq/rubocop/releases) - [Changelog](https://github.com/rubocop-hq/rubocop/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop-hq/rubocop/compare/v0.64.0...v0.65.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-25Bump dotenv-rails from 2.6.0 to 2.7.1 (#10114)dependabot[bot]
Bumps [dotenv-rails](https://github.com/bkeepers/dotenv) from 2.6.0 to 2.7.1. - [Release notes](https://github.com/bkeepers/dotenv/releases) - [Changelog](https://github.com/bkeepers/dotenv/blob/master/Changelog.md) - [Commits](https://github.com/bkeepers/dotenv/compare/v2.6.0...v2.7.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-25Bump sidekiq-unique-jobs from 6.0.9 to 6.0.11 (#10113)dependabot[bot]
Bumps [sidekiq-unique-jobs](https://github.com/mhenrixon/sidekiq-unique-jobs) from 6.0.9 to 6.0.11. - [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.9...v6.0.11) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-02-25Avoid redundant HTTP request on some error cases (#10115)ThibG
2019-02-25Fix fail health check due to missing wget (#10110)mohemohe
2019-02-25Fix web UI not removing notifications after block (#10108)Eugen Rochko
Regression from #7311
2019-02-24Switch to Ubuntu for docker (#10100)Sir-Boops
2019-02-24Skip some methods in BatchedRemoveStatusService when account is nil (#10095)NOGISAKA Sadata
* Skip some methods in BatchedRemoveStatusService when account is nil Sometimes `bin/tootctl accounts cull` fails with below error: undefined method `followers_for_local_distribution' for nil:NilClass (NoMethodError) This commit makes BatchedRemoveStatusService to skip below methods when `account` is nil: - unpush_from_home_timelines() - unpush_from_list_timelines() - batch_stream_entries() * Fix rubocop error: Use `next` to skip iteration.
2019-02-23I18n: Add language options for Kazakh and Lithuanian (#10104)Aditoo17