dependabot-preview[bot]
797b5836d6
Bump tty-prompt from 0.18.1 to 0.19.0 ( #10870 )
...
Bumps [tty-prompt](https://github.com/piotrmurach/tty-prompt ) from 0.18.1 to 0.19.0.
- [Release notes](https://github.com/piotrmurach/tty-prompt/releases )
- [Changelog](https://github.com/piotrmurach/tty-prompt/blob/master/CHANGELOG.md )
- [Commits](https://github.com/piotrmurach/tty-prompt/compare/v0.18.1...v0.19.0 )
2019-05-29 11:10:24 +09:00
mayaeh
7403b0ec05
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-29 11:09:59 +09:00
Aditoo17
d0dc7a60ab
I18n: Update Czech translation ( #10874 )
2019-05-29 09:52:41 +09:00
Thibaut Girka
7fb3fa16dd
Truncate long URLs while providing alt text for inline images
2019-05-28 19:33:43 +02:00
Thibaut Girka
d417a32290
Translate incoming remote img tags by a link
2019-05-28 19:33:43 +02:00
ThibG
96ac463f00
Merge pull request #1073 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-28 19:33:15 +02:00
Eugen Rochko
40117d908f
[Glitch] Use <use />
to render transparent SVG logo instead of inserting it
...
Port SCSS changes from c5234ac2aa
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-28 17:50:21 +02:00
Thibaut Girka
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
Hinaloe
ae5f2716a5
Fix undefined method error ( #10868 )
2019-05-28 15:31:51 +03:00
dependabot-preview[bot]
609677c28d
Bump ox from 2.10.0 to 2.10.1 ( #10869 )
...
Bumps [ox](https://github.com/ohler55/ox ) from 2.10.0 to 2.10.1.
- [Release notes](https://github.com/ohler55/ox/releases )
- [Changelog](https://github.com/ohler55/ox/blob/master/CHANGELOG.md )
- [Commits](https://github.com/ohler55/ox/compare/v2.10.0...v2.10.1 )
2019-05-28 20:26:36 +09:00
mayaeh
a08bfea202
Fix undefined method error. ( #10867 )
2019-05-28 05:42:04 +02:00
Alix Rossi
c84a0df608
Update simple_form.co.yml ( #10862 )
2019-05-28 10:21:30 +09:00
ThibG
31b8203887
Fix web push notifications for polls ( #10864 )
...
Fixes #10861
2019-05-28 00:26:08 +02:00
Eugen Rochko
7d2b4e9277
Refactor footers in web UI into a single component ( #10846 )
2019-05-27 21:58:41 +02:00
ThibG
875faa1da6
Improve rate limiting ( #10860 )
...
* Rate limit based on remote address IP, not on potential reverse proxy
* Limit rate of unauthenticated API requests further
* Rate-limit paging requests to one every 3 seconds
2019-05-27 21:57:49 +02:00
abcang
4c9d8f8ef9
Display notifications count on a new single column ( #10859 )
2019-05-27 21:56:29 +02:00
ThibG
5bc680070f
Merge pull request #1072 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-27 21:26:03 +02:00
Thibaut Girka
938edb44a1
Fix video player regressions introduced by blurhash merge
2019-05-27 19:43:15 +02:00
Thibaut Girka
c1619a5c24
[Glitch] Add keyboard shortcut to hide/show media
...
Port 7ee189fa60
and 9e238804ea
to glitch-soc
2019-05-27 19:43:15 +02:00
Eugen Rochko
c5234ac2aa
Use <use />
to render transparent SVG logo instead of inserting it ( #10845 )
2019-05-27 03:33:39 +02:00
Takeshi Umeda
03054b27e1
Fix poll visibility on public pages ( #10817 )
...
* 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.
2019-05-26 23:13:29 +02:00
Sandro Jäckel
7a8958b067
Docker: Remove dist-upgrade ( #10822 )
2019-05-26 22:26:45 +02:00
Thibaut Girka
d46668d34b
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”.
2019-05-26 15:41:40 +02:00
りんすき
c65b14059a
[Glitch] Fix composer route opening when not needed
...
Port 9ff2739fb5
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-26 13:50:15 +02:00
Neil Moore
139730e3db
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
2019-05-26 13:48:45 +02:00
Eugen Rochko
9e238804ea
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
2019-05-26 13:48:16 +02:00
Marek Ľach
16ae227935
Update simple_form.sk.yml ( #10842 )
2019-05-26 19:26:39 +09:00
Hanage999
66081c489f
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 )
2019-05-26 12:22:33 +02:00
Eugen Rochko
6d4af23a69
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
2019-05-26 02:55:37 +02:00
ThibG
7ee189fa60
Add a keyboard shortcut to hide/show media ( #10647 )
...
* Move control of media visibility to parent component
* Add keyboard shortcut to toggle media visibility
2019-05-25 23:20:51 +02:00
Sandro Jäckel
6ec47d8326
Docker: Keep /var/lib/apt/ to keep apt working ( #10830 )
2019-05-25 23:20:28 +02:00
Alfie John
3696497a20
Expand abbreviation to minimise confusion ( #10826 )
2019-05-25 23:20:18 +02:00
Mélanie Chauvel (ariasuni)
276c9e6e9e
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
2019-05-25 23:19:39 +02:00
Aditoo17
40f6439e03
I18n: Update Czech translation ( #10832 )
2019-05-26 05:34:40 +09:00
Eugen Rochko
a1bceb2cb6
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
2019-05-25 21:27:00 +02:00
ThibG
6024143baf
Merge pull request #1068 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-24 16:30:49 +02:00
Thibaut Girka
57911e10c5
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
...
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
2019-05-24 16:08:09 +02:00
Eugen Rochko
48abfb938f
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
2019-05-24 15:57:31 +02:00
Thibaut Girka
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
ThibG
7b1d582232
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
2019-05-24 15:21:42 +02:00
ThibG
4e953ee471
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 22:01:34 +02:00
Thibaut Girka
ce528d61b4
Do not share a single Redcarpet::Markdown object across threads
...
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
2019-05-23 21:19:44 +02:00
Thibaut Girka
630aafa3a7
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-23 21:18:27 +02:00
ThibG
8effca3e23
Merge pull request #1065 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 20:49:18 +02:00
Eugen Rochko
106cfa7553
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
2019-05-23 20:01:10 +02:00
ThibG
028fb2060b
Fix possible race condition when processing statuses ( #10815 )
2019-05-23 20:00:39 +02:00
nzws
3d860417a5
[Glitch] Fix stacking order of emoji picker
...
Port 1fbe5c2fec
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-23 19:16:42 +02:00
Thibaut Girka
d445d5833e
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`.
2019-05-23 19:01:30 +02:00
ThibG
f5637b174f
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
2019-05-23 15:22:39 +02:00
Yamagishi Kazutoshi
3371452f77
Add sponsor button to GitHub web UI ( #10814 )
...
- https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository
2019-05-23 15:00:54 +02:00