Thibaut Girka
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
Thibaut Girka
8360019896
Fix display of alt-text when a media attachment is not available
6 years ago
Yamagishi Kazutoshi
c672676c03
Fix sass-lint config ( #10982 )
6 years ago
Wenceslao Páez Chávez
fe3bf3b0fc
Fix overlap of emoji button on search popup ( #10978 )
6 years ago
Thibaut Girka
a7f6e72b30
Fix CW field automatically getting the focus when it is always enabled
6 years ago
Eugen Rochko
5bfd802c57
Fix not being able to directly switch between list timelines in web UI ( #10973 )
6 years ago
ThibG
2657765d2a
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
6 years ago
Takeshi Umeda
c402c291f4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
6 years ago
Jeong Arm
8f3c32e29c
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
6 years ago
ThibG
d34a3a2cc7
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
6 years ago
Eugen Rochko
ed19f33440
Fix margins on profile metadata in single column mode ( #10961 )
6 years ago
Thibaut Girka
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
6077eca240
Add profile directory link to single column navigation panel ( #10963 )
6 years ago
Jeong Arm
a1e96b2d8a
Add missing Korean translations ( #10962 )
...
And change some word.
6 years ago
Jeong Arm
8eb7c3304e
[Glitch] Fix profile picture preview
...
Port e13e4b28db
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
6 years ago
Jeong Arm
e13e4b28db
Fix profile picture preview ( #10931 )
6 years ago
Thibaut Girka
5b92910664
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
6 years ago
Takeshi Umeda
d93b82af87
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
6 years ago
Hanage999
7c1ca0c37b
Center 2-columns layout without side effect ( #10915 )
6 years ago
Thibaut Girka
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
slice
22130a0947
Fix incorrect PropType in Glitch AutosuggestInput
6 years ago
slice
e04724296b
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
6 years ago
Eugen Rochko
8d9755e5f5
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
6 years ago
ThibG
3333250ede
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
6 years ago
Takeshi Umeda
7f203f7c49
Fix safari post field display issue in single column layout ( #10883 )
6 years ago
Alix Rossi
33ec9c5095
i18n: Update Corsican front-end translation ( #10884 )
6 years ago
mayaeh
c6e1229a82
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
6 years ago
Aditoo17
0c2ca1bd38
I18n: Update Czech translation ( #10874 )
6 years ago
Eugen Rochko
56d8faab18
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from 8d5dcc9301
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
451e5980b6
Refactor footers in web UI into a single component ( #10846 )
6 years ago
abcang
3593b85423
Display notifications count on a new single column ( #10859 )
6 years ago
Thibaut Girka
6d60701bfa
Fix video player regressions introduced by blurhash merge
6 years ago
Thibaut Girka
b4d4138cf9
[Glitch] Add keyboard shortcut to hide/show media
...
Port a472190729
and 988342a56c
to glitch-soc
6 years ago
Eugen Rochko
8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
6 years ago
Takeshi Umeda
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.
6 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”.
6 years ago
りんすき
fdb3952b20
[Glitch] Fix composer route opening when not needed
...
Port c1e77b56a9
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 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
6 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
6 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 )
6 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
6 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
6 years ago
Mélanie Chauvel (ariasuni)
4168aeb234
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
6 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
6 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
6 years ago
Thibaut Girka
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
6 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
6 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
6 years ago