Commit Graph

3311 Commits (3d73d76e551193a9beffec7a8cdf67e3d18978cf)

Author SHA1 Message Date
Thibaut Girka 3d73d76e55 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
Eugen Rochko 451e5980b6
Refactor footers in web UI into a single component (#10846) 7 years ago
abcang 3593b85423 Display notifications count on a new single column (#10859) 7 years ago
Thibaut Girka 6d60701bfa Fix video player regressions introduced by blurhash merge 7 years ago
Thibaut Girka b4d4138cf9 [Glitch] Add keyboard shortcut to hide/show media
Port a472190729 and 988342a56c to glitch-soc
7 years ago
Eugen Rochko 8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it (#10845) 7 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 54a9608add.

* Revert "Change poll options to alphabetic letters when status text is hidden"

This reverts commit c53d673262.
7 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”.
7 years ago
りんすき fdb3952b20 [Glitch] Fix composer route opening when not needed
Port c1e77b56a9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
7 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
7 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
7 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)
7 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
7 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
7 years ago
Mélanie Chauvel (ariasuni) 4168aeb234 Avoid cutting bottom of letters of last paragraph of statuses (#10821) 7 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
7 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
7 years ago
Thibaut Girka 652147a3f4 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- streaming/index.js
7 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
7 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
7 years ago
nzws a1143a19c0 [Glitch] Fix stacking order of emoji picker
Port 8a378d4c3d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
7 years ago
Thibaut Girka 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`.
7 years ago
Thibaut Girka 0744d6e571 Make headers font size proportional 7 years ago
Eugen Rochko 9ddeb30f90
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
7 years ago
nzws 8a378d4c3d Fix stacking order of emoji picker (#10801) 7 years ago
dxwc ee0e68e97a i18n: Complete frontend Bengali translation (#10800)
* i18n: Complete frontend Bengali translation

* run yarn manage:translations
7 years ago
Thibaut Girka 4fbce23992 Refactor contentType selection in glitch composer 7 years ago
Thibaut Girka 2cd7bfac23 Use glitch-soc's poll component instead of upstream's 7 years ago
Thibaut Girka 08a2af27c3 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
Hinaloe bb9d7fad9f fix `isSubmitting` prop case (#10785) 7 years ago
Thibaut Girka f509815379 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
Eugen Rochko 6fe474837c
Change poll options to alphabetic letters when status text is hidden (#10685)
Fix #10569
7 years ago
Thibaut Girka 56245a2a72 Export fallback content type and use it as default in WebUI 7 years ago
Thibaut Girka 9df1ef87c2 Hide content-type dropdown by default 7 years ago
Haelwenn (lanodan) Monnier c2fa36bbae Content-Type Dropdown: use the selected option icon for the menu
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
7 years ago
Thibaut Girka 93d98f62a8 Support proper content-type in Delete & Redraft 7 years ago
KokaKiwi f34a402a94 Add status content type dropdown to compose box.
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
7 years ago
ThibG c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
7 years ago
Thibaut Girka 6badf2d252 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
Neil Moore 4ab094d35e Adds click-able div that expands status (#10733) (#10766)
The clickable div is positioned under the account avatar and covers
all empty space below it to the end of the status.
7 years ago
Thibaut Girka 4bab7d7640 Fix rich text style in reply indicator 7 years ago
Thibaut Girka 87d16698c2 Fix rich text styling on public pages 7 years ago
Thibaut Girka cd534830ad Fix text color of some formatted elements in notifications 7 years ago
nzws 3e15a845c1 Fix some colors in light theme (#10754)
* Fix typo in light theme

* Fix background color of empty column
7 years ago
ThibG dd118449c2 Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 7 years ago
ThibG 93085c273c [Glitch] Use raw content if available on Delete & Redraft
Port front-end changes from 6d44f2441b to glitch-soc
7 years ago
Thibaut Girka 2b97d9d780 Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
Thibaut Girka 3ea5c045d7 Use a checkbox for the “Mark media as sensitive” composer button
Fixes #1039
7 years ago
ThibG fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
7 years ago
ThibG 6d44f2441b Add toot source to delete result to ease Delete & Redraft (#10669)
* Return Status with raw text in raw_content when deleting a status

* Use raw content if available on delete & redraft

* Rename raw_content to text; do not serialize formatted content when source is requested
7 years ago