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”.
6 years ago
c65b14059a
[Glitch] Fix composer route opening when not needed
...
Port 9ff2739fb5
6 years ago
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
6 years ago
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
6 years ago
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 )
6 years ago
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
6 years ago
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
6 years ago
276c9e6e9e
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
6 years ago
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
6 years ago
57911e10c5
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
...
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
6 years ago
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
6 years ago
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
6 years ago
106cfa7553
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
6 years ago
3d860417a5
[Glitch] Fix stacking order of emoji picker
...
Port 1fbe5c2fec
6 years ago
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`.
6 years ago
9a101b91ae
Make headers font size proportional
6 years ago
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
6 years ago
1fbe5c2fec
Fix stacking order of emoji picker ( #10801 )
6 years ago
0a1ba7c14b
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
6 years ago
a0b7246388
Refactor contentType selection in glitch composer
6 years ago
0bc9d4f6d3
Use glitch-soc's poll component instead of upstream's
6 years ago
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4de9bd3870
fix `isSubmitting` prop case ( #10785 )
6 years ago
fd5da4033e
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
3a4761c665
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
6 years ago
b83cdc9b02
Export fallback content type and use it as default in WebUI
6 years ago
dfeda8857f
Hide content-type dropdown by default
6 years ago
76d58bf63e
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
8a49df8ede
Support proper content-type in Delete & Redraft
6 years ago
08a981dd25
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
38272bbeb1
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
422dd06806
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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.
6 years ago
d8e9a04354
Fix rich text style in reply indicator
6 years ago
9f0ff9b6ea
Fix rich text styling on public pages
6 years ago
6e625755a6
Fix text color of some formatted elements in notifications
6 years ago
f79d089b65
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
6 years ago
cfb69164ad
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
6 years ago
c8195e2da1
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 2a917031c9
6 years ago
5262820fae
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
46b5085ced
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
6 years ago
0bb3ba2406
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
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
6 years ago
e060819020
[Glitch] Improve poll link accessibility
...
Port fc40391743
6 years ago
f625501c05
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
22541e98e2
[Glitch] Add confirm modal for unboosting toots
...
Port d225a952a8
6 years ago
062684bcf8
i18n: Update French translations ( #10747 )
...
* Update French JSON
* i18n: Update fr.yml
* i18n: Update simple_form.fr.yml
* Update simple_form.fr.yml
* Update fr.yml
6 years ago
1959e4e5ec
i18n: Update Corsican translations ( #10746 )
...
* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml
6 years ago
01ba6c5d83
Change icon and label depending on whether media is marked as sensitive ( #10748 )
...
* Change icon and label depending on whether media is marked as sensitive
* WiP use a checkbox
6 years ago
1bf48b01e3
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
minor conflict because of glitch-soc's theming system
6 years ago
Thibaut Girka
りんすき
Neil Moore
Eugen Rochko
Hanage999
Mélanie Chauvel (ariasuni)
nzws
dxwc
Hinaloe
Haelwenn (lanodan) Monnier
KokaKiwi
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi