9416 Commits (1b0ce85e3da4b5c1941f65da7d73258da6eed6d0)

 

All Branches   

Search

Author	SHA1	Message	Date
ThibG	1b0ce85e3d	Merge pull request #1072 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	7 years ago
Thibaut Girka	6d60701bfa	Fix video player regressions introduced by blurhash merge	7 years ago
Thibaut Girka	b4d4138cf9	[Glitch] Add keyboard shortcut to hide/show media ... Port a472190729 and 988342a56c to glitch-soc	7 years ago
Thibaut Girka	20d01a954e	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/settings/preferences_controller.rb - app/lib/user_settings_decorator.rb - app/models/user.rb Conflicts due to the addition of a new preference upstream, “advanced layout”.	7 years ago
りんすき	fdb3952b20	[Glitch] Fix composer route opening when not needed ... Port c1e77b56a9 to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	7 years ago
Neil Moore	63483ee543	Create new click handler for status__expand area in status (#10837) ... This click handler only activates on left-click, resolving #10798. This matches behavior in status_content.js, as added in #536	7 years ago
Eugen Rochko	988342a56c	Fix null error in status component when determining showMedia state (#10838) ... * Fix null error in status component when determining showMedia state Also update the showMedia value if the status passed to the component changes * Refactor media visibility computation into a defaultMediaVisibility function * Fix default media visibility with reblogs	7 years ago
Marek Ľach	3d219c5956	Update simple_form.sk.yml (#10842)	7 years ago
Hanage999	4a818ac2de	Fix wrong redirect from getting started to home in advanced Web UI (#10839) ... * update Ruby to 2.5.3 * Link to Getting Started will not redirect to Home in multi-column UI (https://github.com/tootsuite/mastodon/pull/10835)	7 years ago
Eugen Rochko	0e445ebb13	Improvements to the single column layout (#10835) ... * Improvements to the single column layout - Add follows and followers link to the right panel - Increase margins around separators in right panel - Add follow requests link with counter when account is locked to right panel * Redirect from getting started to home when navigation panel is visible	7 years ago
ThibG	a472190729	Add a keyboard shortcut to hide/show media (#10647) ... * Move control of media visibility to parent component * Add keyboard shortcut to toggle media visibility	7 years ago
Sandro Jäckel	c90f3b9865	Docker: Keep /var/lib/apt/ to keep apt working (#10830)	7 years ago
Alfie John	0852e643b7	Expand abbreviation to minimise confusion (#10826)	7 years ago
Mélanie Chauvel (ariasuni)	4168aeb234	Avoid cutting bottom of letters of last paragraph of statuses (#10821)	7 years ago
Aditoo17	d55d8a611b	I18n: Update Czech translation (#10832)	7 years ago
Eugen Rochko	1e5532e693	Add responsive panels to the single-column layout (#10820) ... * Add responsive panels to the single-column layout * Fixes * Fix not being able to save the preference * Fix code style issues * Set max-height on the compose textarea and add a link to relationship manager	7 years ago
ThibG	fd0487c04f	Merge pull request #1068 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	7 years ago
Thibaut Girka	7fb76999af	Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token ... Inspired by https://github.com/kubevirt/kubevirt/issues/1242	7 years ago
Eugen Rochko	5cdb4c483f	Forward port version bumps to 2.8.3 and 2.8.4 (#10819) ... * Bump version to 2.8.3 * Bump version to 2.8.4	7 years ago
Thibaut Girka	652147a3f4	Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - streaming/index.js	7 years ago
ThibG	d63c3c0cef	Improve streaming server security (#10818) ... * 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	7 years ago
ThibG	72bf354e97	Merge pull request #1067 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	7 years ago
Thibaut Girka	d6a7d62dc6	Do not share a single Redcarpet::Markdown object across threads ... There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672	7 years ago
Thibaut Girka	bf988123ba	Merge branch 'master' into glitch-soc/merge-upstream	7 years ago
ThibG	c394d3cb25	Merge pull request #1065 from ThibG/glitch-soc/merge-upstream ... Merge upstream changes	7 years ago
Eugen Rochko	84dc21d55d	Various improvements to single column layout (#10809) ... - Add potential side panels to single column layout - Hide FAB on large screens	7 years ago
ThibG	9a5561a5b8	Fix possible race condition when processing statuses (#10815)	7 years ago
nzws	a1143a19c0	[Glitch] Fix stacking order of emoji picker ... Port 8a378d4c3d to glitch-soc Signed-off-by: Thibaut Girka <thib@sitedethib.com>	7 years ago
Thibaut Girka	c0dc247bce	Merge branch 'master' into glitch-soc/merge-upstream ... 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`.	7 years ago
ThibG	89d600bedb	Move signature verification stoplight to the requests themselves (#10813) ... * 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	7 years ago
Yamagishi Kazutoshi	369eb63321	Add sponsor button to GitHub web UI (#10814) ... - https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository	7 years ago
ThibG	9efcca3c54	Retry ActivityPub inbox delivery on HTTP 401 and 408 errors (#10812) ... 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.	7 years ago
Thibaut Girka	0744d6e571	Make headers font size proportional	7 years ago
Thibaut Girka	7c609bdab9	Allow rel=tag in status text ... Fixes tag links in local Markdown or HTML-authored statuses	7 years ago
Eugen Rochko	9ddeb30f90	Add `forceSingleColumn` prop to `<UI />` (#10807) ... * 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	7 years ago
abcang	ca6c93a2f5	Migrate from uws to cws (#10805)	7 years ago
nzws	8a378d4c3d	Fix stacking order of emoji picker (#10801)	7 years ago
dependabot[bot]	ce8de3a6e5	Bump aws-sdk-s3 from 1.39.0 to 1.40.0 (#10803) ... 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>	7 years ago
dependabot[bot]	bc23de458e	Bump rubocop from 0.69.0 to 0.70.0 (#10802) ... 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>	7 years ago
dxwc	ee0e68e97a	i18n: Complete frontend Bengali translation (#10800) ... * i18n: Complete frontend Bengali translation * run yarn manage:translations	7 years ago
Thibaut Girka	2332b3f146	Fix local text/html toots not being sanitized	7 years ago
trwnh	e3b39ea4a4	Update remote bio test from 160 to 500 (#10799)	7 years ago
Paul Woolcock	0c933c1b8c	Add `account_id` param to `GET /api/v1/notifications` (#10796) ... * 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	7 years ago
dependabot[bot]	4d65740663	Bump httplog from 1.2.2 to 1.3.0 (#10795) ... 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>	7 years ago
Thibaut Girka	4fbce23992	Refactor contentType selection in glitch composer	7 years ago
Marek Ľach	f261dadefa	Update sk.yml (#10788) ... * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * Update sk.yml * normalize	7 years ago
dependabot[bot]	77e2b68b66	Bump lograge from 0.11.0 to 0.11.1 (#10793) ... 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>	7 years ago
dependabot[bot]	ace6bd3570	Bump capybara from 3.20.0 to 3.20.2 (#10794) ... 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>	7 years ago
Thibaut Girka	2cd7bfac23	Use glitch-soc's poll component instead of upstream's	7 years ago
trwnh	a6caf919e2	Change bio limit from 160 to 500 (#10790) ... * 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	7 years ago