b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-28 17:45:06 +02:00
7d2b4e9277
Refactor footers in web UI into a single component ( #10846 )
2019-05-27 21:58:41 +02:00
4c9d8f8ef9
Display notifications count on a new single column ( #10859 )
2019-05-27 21:56:29 +02:00
938edb44a1
Fix video player regressions introduced by blurhash merge
2019-05-27 19:43:15 +02:00
c1619a5c24
[Glitch] Add keyboard shortcut to hide/show media
...
Port 7ee189fa609e238804ea
2019-05-27 19:43:15 +02:00
c5234ac2aa
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
2019-05-27 03:33:39 +02:00
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
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
2019-05-26 13:50:15 +02:00
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
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
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
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
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
276c9e6e9e
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
2019-05-25 23:19:39 +02:00
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
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
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
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
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
3d860417a5
[Glitch] Fix stacking order of emoji picker
...
Port 1fbe5c2fec
2019-05-23 19:16:42 +02:00
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
9a101b91ae
Make headers font size proportional
2019-05-23 12:41:38 +02:00
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
1fbe5c2fec
Fix stacking order of emoji picker ( #10801 )
2019-05-22 18:00:34 +02:00
0a1ba7c14b
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
2019-05-22 10:00:58 +09:00
a0b7246388
Refactor contentType selection in glitch composer
2019-05-20 10:27:31 +02:00
0bc9d4f6d3
Use glitch-soc's poll component instead of upstream's
2019-05-19 23:24:53 +02:00
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 21:53:44 +02:00
4de9bd3870
fix `isSubmitting` prop case ( #10785 )
2019-05-19 18:41:41 +02:00
fd5da4033e
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-19 17:46:31 +02:00
3a4761c665
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
2019-05-18 14:41:16 +02:00
b83cdc9b02
Export fallback content type and use it as default in WebUI
2019-05-17 23:51:14 +02:00
dfeda8857f
Hide content-type dropdown by default
2019-05-17 23:51:14 +02:00
76d58bf63e
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
8a49df8ede
Support proper content-type in Delete & Redraft
2019-05-17 23:51:14 +02:00
08a981dd25
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
38272bbeb1
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-15 18:44:21 +02:00
422dd06806
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-15 17:11:40 +02:00
59f6637559
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.
2019-05-15 06:53:23 +02:00
d8e9a04354
Fix rich text style in reply indicator
2019-05-13 17:13:02 +02:00
9f0ff9b6ea
Fix rich text styling on public pages
2019-05-13 17:13:02 +02:00
6e625755a6
Fix text color of some formatted elements in notifications
2019-05-12 19:23:32 +02:00
f79d089b65
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
2019-05-12 05:15:42 +02:00
cfb69164ad
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
2019-05-11 23:56:07 +02:00
c8195e2da1
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 2a917031c9
2019-05-11 21:46:23 +02:00
5262820fae
Merge branch 'master' into glitch-soc/merge-upstream
2019-05-11 18:23:46 +02:00
46b5085ced
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
2019-05-11 12:35:38 +02:00
0bb3ba2406
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
2019-05-11 12:35:25 +02:00
2a917031c9
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
2019-05-11 06:46:43 +02:00
Thibaut Girka