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
6 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
6 years ago
f4bc77f290
Improve light theme ( #10992 )
6 years ago
25f93f4097
Fix RTL layout not being RTL within the columns area ( #10990 )
6 years ago
aec3fa35fd
[Glitch] Fix not being able to directly switch between list timelines in web UI
...
Port 5bfd802c57
6 years ago
417989ae34
[Glitch] Fix “mark as sensitive” not being used in delete & redraft
...
Port 2657765d2a
6 years ago
b32a62fe95
[Glitch] Scroll to compose form when focus
...
Port 8f3c32e29c
6 years ago
cc8f6b3cda
Fix some React warnings ( #10989 )
6 years ago
01aae33a5f
[Glitch] Fix refreshing featured toots when the new collection is empty
...
Port d34a3a2cc7
6 years ago
34b8346e7f
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
6 years ago
560ec24e58
Change /settings/preferences to redirect to appearance, add /settings/preferences/other ( #10988 )
6 years ago
8360019896
Fix display of alt-text when a media attachment is not available
6 years ago
cdb420862e
Fix display of alt-text when a media attachment is not available ( #10981 )
6 years ago
1db4117030
Change preferences page into appearance, notifications, and other ( #10977 )
6 years ago
a60364ca7d
Add waiting time to list of pending accounts in admin UI ( #10985 )
6 years ago
c672676c03
Fix sass-lint config ( #10982 )
6 years ago
fe3bf3b0fc
Fix overlap of emoji button on search popup ( #10978 )
6 years ago
a7f6e72b30
Fix CW field automatically getting the focus when it is always enabled
6 years ago
5bfd802c57
Fix not being able to directly switch between list timelines in web UI ( #10973 )
6 years ago
2657765d2a
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
6 years ago
c402c291f4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
6 years ago
8f3c32e29c
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
6 years ago
cac9110533
Cleanup various controllers ( #10972 )
...
* Remove skip_session! as it is not supported in Rails 5
* Minor cleanup in StreamEntriesController
* Remove redundant mark_cacheable! calls
6 years ago
7fa23ec697
Fix potential private status leak ( #10969 )
6 years ago
d34a3a2cc7
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
6 years ago
6c464cd424
Do not misattribute inlined boosts if `attributedTo` isn't present ( #10967 )
...
* Do not misattribute inlined boosts if `attributedTo` isn't present
Fixes #10950
* Fix tests
6 years ago
ed19f33440
Fix margins on profile metadata in single column mode ( #10961 )
6 years ago
6a9a759f40
Change reblogs counter to be updated when boosted privately ( #10964 )
6 years ago
f2b743e715
Refactor all ActivityPub deliveries to be serialized and signed through one concern ( #10966 )
6 years ago
02b56c7e1a
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
48fee1a800
Fix poll API not requiring authentication on non-public polls ( #10960 )
...
* Fix poll API not requiring authentication on non-public polls
That API does not reveal the content of the status, i.e. the question
itself, nor who the author is, nor which status it belongs to, but it
does reveal the poll options and how many answers they got
Fix #10959
* Add test
6 years ago
6077eca240
Add profile directory link to single column navigation panel ( #10963 )
6 years ago
a1e96b2d8a
Add missing Korean translations ( #10962 )
...
And change some word.
6 years ago
8eb7c3304e
[Glitch] Fix profile picture preview
...
Port e13e4b28db
6 years ago
3a84bacf86
Handle blank poll options more gracefully ( #10946 )
...
Pleroma currently allows (erroneously imho) empty poll options, that is,
options with an empty (but existing) `name`.
6 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
6 years ago
e13e4b28db
Fix profile picture preview ( #10931 )
6 years ago
f9514b08f2
Added env variables for max image and video size.
...
I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.
6 years ago
5b92910664
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
6 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
6 years ago
7c1ca0c37b
Center 2-columns layout without side effect ( #10915 )
6 years ago
06036081a0
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6c0428b7d8
Raise exception when attempting to serialize local-only statuses
6 years ago
22130a0947
Fix incorrect PropType in Glitch AutosuggestInput
6 years ago
e04724296b
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
6 years ago
8d9755e5f5
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
6 years ago
3333250ede
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
6 years ago
7f203f7c49
Fix safari post field display issue in single column layout ( #10883 )
6 years ago
33ec9c5095
i18n: Update Corsican front-end translation ( #10884 )
6 years ago
c6e1229a82
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
6 years ago
0c2ca1bd38
I18n: Update Czech translation ( #10874 )
6 years ago
07d4ecfe5e
Truncate long URLs while providing alt text for inline images
6 years ago
18b77224d3
Translate incoming remote img tags by a link
6 years ago
56d8faab18
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from 8d5dcc9301
6 years ago
3d73d76e55
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
fe3b863926
Fix web push notifications for polls ( #10864 )
...
Fixes #10861
6 years ago
451e5980b6
Refactor footers in web UI into a single component ( #10846 )
6 years ago
3593b85423
Display notifications count on a new single column ( #10859 )
6 years ago
6d60701bfa
Fix video player regressions introduced by blurhash merge
6 years ago
b4d4138cf9
[Glitch] Add keyboard shortcut to hide/show media
...
Port a472190729988342a56c
6 years ago
8d5dcc9301
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
6 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.
6 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”.
6 years ago
fdb3952b20
[Glitch] Fix composer route opening when not needed
...
Port c1e77b56a9
6 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
6 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
6 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 )
6 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
6 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
6 years ago
4168aeb234
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
6 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
6 years ago
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
652147a3f4
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
6 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
6 years ago
72bf354e97
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
d6a7d62dc6
Do not share a single Redcarpet::Markdown object across threads
...
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
6 years ago
bf988123ba
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
84dc21d55d
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
6 years ago
9a5561a5b8
Fix possible race condition when processing statuses ( #10815 )
6 years ago
a1143a19c0
[Glitch] Fix stacking order of emoji picker
...
Port 8a378d4c3d
6 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`.
6 years ago
89d600bedb
Move signature verification stoplight to the requests themselves ( #10813 )
...
* Move signature verification stoplight to the requests themselves
This avoids blocking messages from known keys for 5 minutes when only one fails…
* Put the stoplight on the actual client IP, not a potential reverse proxy
6 years ago
9efcca3c54
Retry ActivityPub inbox delivery on HTTP 401 and 408 errors ( #10812 )
...
HTTP 401 responses returned by Mastodon's inbox controller may
be temporary if, for instance, the requesting user's actor/key json
could not be retrieved in a timely fashion. This changes allow retries
instead of dropping the message entirely.
Also added HTTP 408 as that error is by nature temporary.
6 years ago
0744d6e571
Make headers font size proportional
6 years ago
7c609bdab9
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
6 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
6 years ago
8a378d4c3d
Fix stacking order of emoji picker ( #10801 )
6 years ago
ee0e68e97a
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
6 years ago
2332b3f146
Fix local text/html toots not being sanitized
6 years ago
0c933c1b8c
Add `account_id` param to `GET /api/v1/notifications` ( #10796 )
...
* Add `from_account` to notifications API
this adds the ability to filter notifications by the account they
originated from
* passing a non-existent user should cause none to be returned
* Fix codeclimate warnings
* fix more codeclimate warnings
* make requested changes:
* use account id instead of user@domain
* name the param `account_id` instead of `from_account`
* Don't use `return` in a lambda
6 years ago
4fbce23992
Refactor contentType selection in glitch composer
6 years ago
2cd7bfac23
Use glitch-soc's poll component instead of upstream's
6 years ago
a6caf919e2
Change bio limit from 160 to 500 ( #10790 )
...
* Change note_length validator from 160 to 500
* Change input maxlength from 160 to 500
* update bio test from 160 to 500
* Multiply a string 30 times instead of 10
6 years ago
08a2af27c3
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ae18386558
Fix “invited by” not showing up for invited accounts in admin interface ( #10791 )
6 years ago
bb9d7fad9f
fix `isSubmitting` prop case ( #10785 )
6 years ago
f509815379
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
2f3e4a64be
add og:image:alt for media attachments in embeds ( #10779 )
6 years ago
6fe474837c
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
6 years ago
6e227ecb04
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
Eugen Rochko
Jeong Arm
Yamagishi Kazutoshi
Wenceslao Páez Chávez
Takeshi Umeda
Lady Lumb
Hanage999
slice
Alix Rossi
mayaeh
Aditoo17
abcang
りんすき
Neil Moore
Mélanie Chauvel (ariasuni)
nzws
dxwc
Paul Woolcock
trwnh
Hinaloe
Ben Lubar