7778de467c
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
5bcd98172c
Fix clicking on the left side of a conversation not marking it as read ( #11041 )
5 years ago
fc6d27daf3
[Glitch] Fix RTL layout not being RTL within the columns area
...
Port 25f93f4097
5 years ago
59d214e54b
[Glitch] Change preferences page into appearance, notifications, and other
...
Port SCSS changes from 1db4117030
5 years ago
1b0ff4cd69
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
5 years ago
b45f555a0c
Minor cleanup
5 years ago
b551d8aa53
Fix unboost confirmation dialog not showing up on detailed statuses
5 years ago
ccfb48d3eb
Add option to display a warning before boosting toots lacking media descriptions
5 years ago
d61a6271c6
Add DM conversations mode similar to upstream
5 years ago
210fa3a94e
Fix emoji-button appearing above privacy-dropdown ( #11027 )
5 years ago
ce556333ce
Update fr.json ( #11024 )
5 years ago
9a281bac8d
i18n: Update Corsican front-end translation ( #11010 )
5 years ago
e5bdfd1640
Run yarn manage:translations ( #11008 )
5 years ago
9add88a920
Fix position of search icon ( #11003 )
5 years ago
6ecf1825ef
i18n: Update Catalan translations ( #10998 )
...
* Updated Catalan strings
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* Update simple_form.ca.yml
* bundle exec i18n-tasks
* Update ca.json
* Update simple_form.ca.yml
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translations
* i18n: Update Catalan translation
* i18n Update Catalan translation
* i18n: Update Catalan translations
* i18n: Update Catalan translations
5 years ago
241a8e7b5f
Fix more issues in the light theme ( #10996 )
...
* Fix tabs bar in light theme
* Fix borders on small screens in light theme
5 years ago
537e928186
I18n: Update Czech translation 🇨🇿 ( #10995 )
...
* I18n: Update Czech translation
* Fix
* Re-fix
* And also this
* The real fix now (hopefully)
5 years ago
e9ddd5a159
Put poll options behind content warnings ( #10983 )
...
* Put poll options behind CWs in WebUI
* Put polls behind CWs on public pages
* Add poll icon to public pages CWs
* Revert to not showing an icon in the CW button
5 years ago
20dda5cca0
Change full logo to use primary text color of the given theme ( #10994 )
...
* Change full logo to use primary text color of the given theme
* Fix colors of public layout header in light theme
5 years ago
f4bc77f290
Improve light theme ( #10992 )
5 years ago
25f93f4097
Fix RTL layout not being RTL within the columns area ( #10990 )
5 years ago
aec3fa35fd
[Glitch] Fix not being able to directly switch between list timelines in web UI
...
Port 5bfd802c57
5 years ago
417989ae34
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
...
Port 2657765d2a
5 years ago
b32a62fe95
[Glitch] Scroll to compose form when focus
...
Port 8f3c32e29c
5 years ago
cc8f6b3cda
Fix some React warnings ( #10989 )
5 years ago
01aae33a5f
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port d34a3a2cc7
5 years ago
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
5 years ago
8360019896
Fix display of alt-text when a media attachment is not available
5 years ago
cdb420862e
Fix display of alt-text when a media attachment is not available ( #10981 )
5 years ago
1db4117030
Change preferences page into appearance, notifications, and other ( #10977 )
5 years ago
c672676c03
Fix sass-lint config ( #10982 )
5 years ago
fe3bf3b0fc
Fix overlap of emoji button on search popup ( #10978 )
5 years ago
a7f6e72b30
Fix CW field automatically getting the focus when it is always enabled
5 years ago
5bfd802c57
Fix not being able to directly switch between list timelines in web UI ( #10973 )
5 years ago
2657765d2a
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
5 years ago
c402c291f4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
5 years ago
8f3c32e29c
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
5 years ago
d34a3a2cc7
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
5 years ago
ed19f33440
Fix margins on profile metadata in single column mode ( #10961 )
5 years ago
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
5 years ago
6077eca240
Add profile directory link to single column navigation panel ( #10963 )
5 years ago
a1e96b2d8a
Add missing Korean translations ( #10962 )
...
And change some word.
5 years ago
8eb7c3304e
[Glitch] Fix profile picture preview
...
Port e13e4b28db
5 years ago
76918554a6
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
...
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
5 years ago
e13e4b28db
Fix profile picture preview ( #10931 )
5 years ago
5b92910664
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
5 years ago
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
5 years ago
7c1ca0c37b
Center 2-columns layout without side effect ( #10915 )
5 years ago
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
22130a0947
Fix incorrect PropType in Glitch AutosuggestInput
5 years ago
e04724296b
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
5 years ago
8d9755e5f5
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
5 years ago
3333250ede
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
5 years ago
7f203f7c49
Fix safari post field display issue in single column layout ( #10883 )
5 years ago
33ec9c5095
i18n: Update Corsican front-end translation ( #10884 )
5 years ago
c6e1229a82
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
5 years ago
0c2ca1bd38
I18n: Update Czech translation ( #10874 )
5 years ago
56d8faab18
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from 8d5dcc9301
5 years ago
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
451e5980b6
Refactor footers in web UI into a single component ( #10846 )
5 years ago
3593b85423
Display notifications count on a new single column ( #10859 )
5 years ago
6d60701bfa
Fix video player regressions introduced by blurhash merge
5 years ago
b4d4138cf9
[Glitch] Add keyboard shortcut to hide/show media
...
Port a472190729988342a56c
5 years ago
8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
5 years ago
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.
5 years ago
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”.
5 years ago
fdb3952b20
[Glitch] Fix composer route opening when not needed
...
Port c1e77b56a9
5 years ago
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
5 years ago
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
5 years ago
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 )
5 years ago
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
5 years ago
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
5 years ago
4168aeb234
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
5 years ago
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
5 years ago
7fb76999af
Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token
...
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
5 years ago
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
5 years ago
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
5 years ago
84dc21d55d
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
5 years ago
a1143a19c0
[Glitch] Fix stacking order of emoji picker
...
Port 8a378d4c3d
5 years ago
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`.
5 years ago
0744d6e571
Make headers font size proportional
5 years ago
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
5 years ago
8a378d4c3d
Fix stacking order of emoji picker ( #10801 )
5 years ago
ee0e68e97a
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
5 years ago
4fbce23992
Refactor contentType selection in glitch composer
5 years ago
2cd7bfac23
Use glitch-soc's poll component instead of upstream's
6 years ago
08a2af27c3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
bb9d7fad9f
fix `isSubmitting` prop case ( #10785 )
6 years ago
f509815379
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6fe474837c
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
6 years ago
56245a2a72
Export fallback content type and use it as default in WebUI
6 years ago
9df1ef87c2
Hide content-type dropdown by default
6 years ago
c2fa36bbae
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
93d98f62a8
Support proper content-type in Delete & Redraft
6 years ago
f34a402a94
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
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.
6 years ago
4bab7d7640
Fix rich text style in reply indicator
6 years ago
87d16698c2
Fix rich text styling on public pages
6 years ago
Thibaut Girka
Eugen Rochko
mayaeh
manuelviens
Alix Rossi
spla
Aditoo17
Jeong Arm
Yamagishi Kazutoshi
Wenceslao Páez Chávez
Takeshi Umeda
Hanage999
slice
abcang
りんすき
Neil Moore
Mélanie Chauvel (ariasuni)
nzws
dxwc
Hinaloe
Haelwenn (lanodan) Monnier
KokaKiwi