Age | Commit message (Collapse) | Author |
|
Port e13e4b28db7e066d1f6f21e306aa95b97c3ccd99 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
|
|
|
|
I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.
|
|
Fixes #1085
|
|
* Improvement variable height of compose and navigation panel in single column layout
* Fix wrong quotes and missing commas
|
|
|
|
|
|
|
|
|
|
This can be null under normal circumstances, which isRequired doesn't
like.
|
|
For Rambox compatibility
|
|
resetting (#10872)
|
|
|
|
|
|
run yarn manage:translations ja && i18n-tasks add-missing ja
|
|
|
|
|
|
|
|
Port SCSS changes from 8d5dcc9301c422f131167574da550f8cdaedb73f to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
|
|
Fixes #10861
|
|
|
|
|
|
|
|
Port a472190729782f31731674c626c07af483fe9c7f and 988342a56cb58da9ac660eec3e55c3bcbbd6269b to glitch-soc
|
|
|
|
* Fix poll visibility on public pages
* Revert "Fix poll visibility on public pages"
This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.
* Revert "Change poll options to alphabetic letters when status text is hidden"
This reverts commit c53d67326201b2061990b1874a3547c3647f50d2.
|
|
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”.
|
|
Port c1e77b56a92fc075f000af9c263c72ba6bdbe5f7 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
This click handler only activates on left-click, resolving #10798.
This matches behavior in status_content.js, as added in #536
|
|
* 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
|
|
* 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)
|
|
* 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
|
|
* Move control of media visibility to parent component
* Add keyboard shortcut to toggle media visibility
|
|
|
|
* 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
|
|
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
|
|
Conflicts:
- streaming/index.js
|
|
* 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
|
|
Merge upstream changes
|
|
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
|
|
|
|
- Add potential side panels to single column layout
- Hide FAB on large screens
|
|
|
|
Port 8a378d4c3d8bd74f3070af0b70725da4a6d10375 to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
|
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`.
|
|
* 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
|
|
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.
|
|
|