1e5d214d19
Add Dependabot config ( #10876 )
2019-05-29 09:00:51 +03:00
61ab5b0c83
Bump capybara from 3.20.2 to 3.21.0 ( #10854 )
...
Bumps [capybara](https://github.com/teamcapybara/capybara ) from 3.20.2 to 3.21.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.20.2...3.21.0 )
2019-05-29 11:21:22 +09:00
0b1c7150da
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
c6e1229a82
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-29 11:09:59 +09:00
0c2ca1bd38
I18n: Update Czech translation ( #10874 )
2019-05-29 09:52:41 +09:00
07d4ecfe5e
Truncate long URLs while providing alt text for inline images
2019-05-28 19:33:43 +02:00
18b77224d3
Translate incoming remote img tags by a link
2019-05-28 19:33:43 +02:00
2f83ffa1bd
Merge pull request #1073 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-28 19:33:15 +02:00
56d8faab18
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from 8d5dcc9301
2019-05-28 17:50:21 +02:00
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
b793722d7d
Fix undefined method error ( #10868 )
2019-05-28 15:31:51 +03:00
b1133f1ff9
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
afb17b7045
Fix undefined method error. ( #10867 )
2019-05-28 05:42:04 +02:00
e2c0d05538
Update simple_form.co.yml ( #10862 )
2019-05-28 10:21:30 +09:00
fe3b863926
Fix web push notifications for polls ( #10864 )
...
Fixes #10861
2019-05-28 00:26:08 +02:00
451e5980b6
Refactor footers in web UI into a single component ( #10846 )
2019-05-27 21:58:41 +02:00
0e9b8be18a
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
3593b85423
Display notifications count on a new single column ( #10859 )
2019-05-27 21:56:29 +02:00
1b0ce85e3d
Merge pull request #1072 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-27 21:26:03 +02:00
6d60701bfa
Fix video player regressions introduced by blurhash merge
2019-05-27 19:43:15 +02:00
b4d4138cf9
[Glitch] Add keyboard shortcut to hide/show media
...
Port a472190729988342a56c
2019-05-27 19:43:15 +02:00
8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
2019-05-27 03:33:39 +02:00
3b9c02506d
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
1e6a1ea075
Docker: Remove dist-upgrade ( #10822 )
2019-05-26 22:26:45 +02:00
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”.
2019-05-26 15:41:40 +02:00
fdb3952b20
[Glitch] Fix composer route opening when not needed
...
Port c1e77b56a9
2019-05-26 13:50:15 +02:00
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
2019-05-26 13:48:45 +02:00
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
2019-05-26 13:48:16 +02:00
3d219c5956
Update simple_form.sk.yml ( #10842 )
2019-05-26 19:26:39 +09:00
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 )
2019-05-26 12:22:33 +02:00
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
2019-05-26 02:55:37 +02:00
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
2019-05-25 23:20:51 +02:00
c90f3b9865
Docker: Keep /var/lib/apt/ to keep apt working ( #10830 )
2019-05-25 23:20:28 +02:00
0852e643b7
Expand abbreviation to minimise confusion ( #10826 )
2019-05-25 23:20:18 +02:00
4168aeb234
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
2019-05-25 23:19:39 +02:00
d55d8a611b
I18n: Update Czech translation ( #10832 )
2019-05-26 05:34:40 +09:00
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
2019-05-25 21:27:00 +02:00
fd0487c04f
Merge pull request #1068 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-24 16:30:49 +02:00
7fb76999af
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
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
2019-05-24 15:57:31 +02:00
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
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
2019-05-24 15:21:42 +02:00
72bf354e97
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 22:01:34 +02:00
d6a7d62dc6
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
bf988123ba
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-23 21:18:27 +02:00
c394d3cb25
Merge pull request #1065 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-23 20:49:18 +02:00
84dc21d55d
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
9a5561a5b8
Fix possible race condition when processing statuses ( #10815 )
2019-05-23 20:00:39 +02:00
a1143a19c0
[Glitch] Fix stacking order of emoji picker
...
Port 8a378d4c3d
2019-05-23 19:16:42 +02:00
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`.
2019-05-23 19:01:30 +02:00
Yamagishi Kazutoshi