Commit graph

3327 commits

Author SHA1 Message Date
Jeong Arm
3d34bc17e2 [Glitch] Fix profile picture preview
Port 77375ad7df to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-03 20:20:33 +02:00
Thibaut Girka
a4e0071538 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
2019-06-03 14:54:30 +02:00
Jeong Arm
77375ad7df Fix profile picture preview (#10931) 2019-06-02 18:04:41 +02:00
Thibaut Girka
1501b142d2 Fix expanding status from menu modal in glitch-soc
Fixes #1085
2019-06-02 14:11:32 +02:00
Takeshi Umeda
96ac52dabd Improvement variable height in single column layout (#10917)
* Improvement variable height of compose and navigation panel in single column layout

* Fix wrong quotes and missing commas
2019-06-02 10:05:54 +02:00
Hanage999
702dbf1622 Center 2-columns layout without side effect (#10915) 2019-06-01 07:59:21 +03:00
Thibaut Girka
206d0ea6a2 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
slice
fb0489022c Fix incorrect PropType in Glitch AutosuggestInput 2019-05-30 09:04:00 +02:00
slice
c12383e06c Remove isRequired from Glitch ReplyIndicator status
This can be null under normal circumstances, which isRequired doesn't
like.
2019-05-30 09:04:00 +02:00
Eugen Rochko
233a60f6a2 Change links in right panel to open in the same tab (#10848)
For Rambox compatibility
2019-05-29 17:33:35 +03:00
ThibG
0162dc0c9c Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872) 2019-05-29 17:33:15 +03:00
Takeshi Umeda
9c174f4d02 Fix safari post field display issue in single column layout (#10883) 2019-05-29 12:03:56 +03:00
Alix Rossi
6f624f449e i18n: Update Corsican front-end translation (#10884) 2019-05-29 17:57:08 +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
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
Eugen Rochko
7d2b4e9277 Refactor footers in web UI into a single component (#10846) 2019-05-27 21:58:41 +02:00
abcang
4c9d8f8ef9 Display notifications count on a new single column (#10859) 2019-05-27 21:56:29 +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
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
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
Mélanie Chauvel (ariasuni)
276c9e6e9e Avoid cutting bottom of letters of last paragraph of statuses (#10821) 2019-05-25 23:19:39 +02: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
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
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
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
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
Thibaut Girka
9a101b91ae Make headers font size proportional 2019-05-23 12:41:38 +02:00
Eugen Rochko
f9ca3d62b6 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
2019-05-23 01:35:22 +02:00
nzws
1fbe5c2fec Fix stacking order of emoji picker (#10801) 2019-05-22 18:00:34 +02:00
dxwc
0a1ba7c14b i18n: Complete frontend Bengali translation (#10800)
* i18n: Complete frontend Bengali translation

* run yarn manage:translations
2019-05-22 10:00:58 +09:00
Thibaut Girka
a0b7246388 Refactor contentType selection in glitch composer 2019-05-20 10:27:31 +02:00
Thibaut Girka
0bc9d4f6d3 Use glitch-soc's poll component instead of upstream's 2019-05-19 23:24:53 +02:00
Thibaut Girka
e21662d370 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
Hinaloe
4de9bd3870 fix isSubmitting prop case (#10785) 2019-05-19 18:41:41 +02:00
Thibaut Girka
fd5da4033e Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Eugen Rochko
3a4761c665 Change poll options to alphabetic letters when status text is hidden (#10685)
Fix #10569
2019-05-18 14:41:16 +02:00
Thibaut Girka
b83cdc9b02 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka
dfeda8857f Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00