about summary refs log tree commit diff
AgeCommit message (Collapse)Author
2019-05-24Use Sec-WebSocket-Protocol instead of query string to pass WebSocket tokenThibaut Girka
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-24Forward port version bumps to 2.8.3 and 2.8.4 (#10819)Eugen Rochko
* Bump version to 2.8.3 * Bump version to 2.8.4
2019-05-24Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - streaming/index.js
2019-05-24Improve streaming server security (#10818)ThibG
* Check OAuth token scopes in the streaming API * Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-23Merge pull request #1067 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-23Do not share a single Redcarpet::Markdown object across threadsThibaut Girka
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
2019-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-23Merge pull request #1065 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-23Various improvements to single column layout (#10809)Eugen Rochko
- Add potential side panels to single column layout - Hide FAB on large screens
2019-05-23Fix possible race condition when processing statuses (#10815)ThibG
2019-05-23[Glitch] Fix stacking order of emoji pickernzws
Port 8a378d4c3d8bd74f3070af0b70725da4a6d10375 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-23Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`.
2019-05-23Move signature verification stoplight to the requests themselves (#10813)ThibG
* Move signature verification stoplight to the requests themselves This avoids blocking messages from known keys for 5 minutes when only one fails… * Put the stoplight on the actual client IP, not a potential reverse proxy
2019-05-23Add sponsor button to GitHub web UI (#10814)Yamagishi Kazutoshi
- https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
2019-05-23Retry ActivityPub inbox delivery on HTTP 401 and 408 errors (#10812)ThibG
HTTP 401 responses returned by Mastodon's inbox controller may be temporary if, for instance, the requesting user's actor/key json could not be retrieved in a timely fashion. This changes allow retries instead of dropping the message entirely. Also added HTTP 408 as that error is by nature temporary.
2019-05-23Make headers font size proportionalThibaut Girka
2019-05-23Allow rel=tag in status textThibaut Girka
Fixes tag links in local Markdown or HTML-authored statuses
2019-05-23Add `forceSingleColumn` prop to `<UI />` (#10807)Eugen Rochko
* Move TabsBar rendering logic from CSS to the ColumnsArea component * Add forceSingleColumn mode * Add unread notifications counter to tabs bar * Add toggle to control `forceSingleColumn` * Increase paddings in mobile layout responsively at large sizes
2019-05-22Migrate from uws to cws (#10805)abcang
2019-05-22Fix stacking order of emoji picker (#10801)nzws
2019-05-22Bump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803)dependabot[bot]
Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.39.0 to 1.40.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/compare/v1.39.0...v1.40.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-22Bump rubocop from 0.69.0 to 0.70.0 (#10802)dependabot[bot]
Bumps [rubocop](https://github.com/rubocop-hq/rubocop) from 0.69.0 to 0.70.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.69.0...v0.70.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-22i18n: Complete frontend Bengali translation (#10800)dxwc
* i18n: Complete frontend Bengali translation * run yarn manage:translations
2019-05-21Fix local text/html toots not being sanitizedThibaut Girka
2019-05-21Update remote bio test from 160 to 500 (#10799)trwnh
2019-05-21Add `account_id` param to `GET /api/v1/notifications` (#10796)Paul Woolcock
* Add `from_account` to notifications API this adds the ability to filter notifications by the account they originated from * passing a non-existent user should cause none to be returned * Fix codeclimate warnings * fix more codeclimate warnings * make requested changes: * use account id instead of user@domain * name the param `account_id` instead of `from_account` * Don't use `return` in a lambda
2019-05-21Bump httplog from 1.2.2 to 1.3.0 (#10795)dependabot[bot]
Bumps [httplog](https://github.com/trusche/httplog) from 1.2.2 to 1.3.0. - [Release notes](https://github.com/trusche/httplog/releases) - [Changelog](https://github.com/trusche/httplog/blob/master/CHANGELOG.md) - [Commits](https://github.com/trusche/httplog/commits/v1.3.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-20Refactor contentType selection in glitch composerThibaut Girka
2019-05-20Update sk.yml (#10788)Marek Ľach
* Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * normalize
2019-05-20Bump lograge from 0.11.0 to 0.11.1 (#10793)dependabot[bot]
Bumps [lograge](https://github.com/roidrage/lograge) from 0.11.0 to 0.11.1. - [Release notes](https://github.com/roidrage/lograge/releases) - [Changelog](https://github.com/roidrage/lograge/blob/master/CHANGELOG.md) - [Commits](https://github.com/roidrage/lograge/compare/v0.11.0...v0.11.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-20Bump capybara from 3.20.0 to 3.20.2 (#10794)dependabot[bot]
Bumps [capybara](https://github.com/teamcapybara/capybara) from 3.20.0 to 3.20.2. - [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.20.0...3.20.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
2019-05-19Use glitch-soc's poll component instead of upstream'sThibaut Girka
2019-05-19Change bio limit from 160 to 500 (#10790)trwnh
* Change note_length validator from 160 to 500 * Change input maxlength from 160 to 500 * update bio test from 160 to 500 * Multiply a string 30 times instead of 10
2019-05-19Merge pull request #1055 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-19Merge pull request #1054 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-19Fix “invited by” not showing up for invited accounts in admin interface ↵ThibG
(#10791)
2019-05-20sk.yml grammar update (#10786)Marek Ľach
* sk.yml grammar update * bundle exec i18n-tasks normalize
2019-05-19fix `isSubmitting` prop case (#10785)Hinaloe
2019-05-19Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-19Small corrections for sk translation (#10784)Marek Ľach
2019-05-19Add post-deployment migration script to delete ↵ThibG
public-boosts-of-private-toots (#10783)
2019-05-19Upgrade redis in docker-compose.yml from 4 to 5 (#9063)Shlee
2019-05-19I18n: Update Czech translation (#10781)Aditoo17
2019-05-18add og:image:alt for media attachments in embeds (#10779)Ben Lubar
2019-05-18Change poll options to alphabetic letters when status text is hidden (#10685)Eugen Rochko
Fix #10569
2019-05-18Remove 'Weblate' from CONTRIBUTING.md (#10778)Yusuke Nakamura
The mastodon project no longer used weblate to translate UI sentences. (ref #10385)
2019-05-18Merge pull request #1053 from ThibG/glitch-soc/merge-upstreamThibG
Merge upstream changes
2019-05-18Merge branch 'master' into glitch-soc/merge-upstreamThibaut Girka
2019-05-18Prevent from publicly boosting one's own private toots (#10775)ThibG
generated by cgit-pink (git 2.37.1) at 2024-12-27 11:06:44 +0000