2b35ddc80a
Fix display of alt-text when a media attachment is not available ( #10981 )
6 years ago
8bf8d6d9d9
Change preferences page into appearance, notifications, and other ( #10977 )
6 years ago
87f5646ec3
Add waiting time to list of pending accounts in admin UI ( #10985 )
6 years ago
e20f7876e8
Fix sass-lint config ( #10982 )
6 years ago
796b8e8d34
Fix overlap of emoji button on search popup ( #10978 )
6 years ago
2b54b78962
Fix CW field automatically getting the focus when it is always enabled
6 years ago
a36e4db82f
Fix not being able to directly switch between list timelines in web UI ( #10973 )
6 years ago
024ec0759c
Fix “mark as sensitive” not being used in delete & redraft ( #10980 )
6 years ago
88a04bf6c4
Fix emoji picker being always displayed ( #10979 )
...
* Fix emoji picker being always displayed
* Remove duplicate content with other pull-requests
6 years ago
91ae2d1275
Scroll to compose form when focus ( #10970 )
...
* Scroll to compose form when focus
* Get rid of constructor
6 years ago
806c2f8102
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
e80cb67ed7
Fix potential private status leak ( #10969 )
6 years ago
1fee4b0fe2
Fix refreshing featured toots when the new collection is empty ( #10971 )
...
Fixes #10945
6 years ago
be6e54a70c
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
b01b8521ec
Fix margins on profile metadata in single column mode ( #10961 )
6 years ago
a7952c3a54
Change reblogs counter to be updated when boosted privately ( #10964 )
6 years ago
57098a1b8d
Refactor all ActivityPub deliveries to be serialized and signed through one concern ( #10966 )
6 years ago
a76c660645
Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream
6 years ago
f3a02e70a8
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
4331f4948e
Add profile directory link to single column navigation panel ( #10963 )
6 years ago
ca61d7577a
Add missing Korean translations ( #10962 )
...
And change some word.
6 years ago
3d34bc17e2
[Glitch] Fix profile picture preview
...
Port 77375ad7df
6 years ago
c45a330824
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
a4e0071538
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
77375ad7df
Fix profile picture preview ( #10931 )
6 years ago
d691b1f7d3
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
1501b142d2
Fix expanding status from menu modal in glitch-soc
...
Fixes #1085
6 years ago
96ac52dabd
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
702dbf1622
Center 2-columns layout without side effect ( #10915 )
6 years ago
206d0ea6a2
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
6e1ad5a03f
Raise exception when attempting to serialize local-only statuses
6 years ago
fb0489022c
Fix incorrect PropType in Glitch AutosuggestInput
6 years ago
c12383e06c
Remove isRequired from Glitch ReplyIndicator status
...
This can be null under normal circumstances, which isRequired doesn't
like.
6 years ago
233a60f6a2
Change links in right panel to open in the same tab ( #10848 )
...
For Rambox compatibility
6 years ago
0162dc0c9c
Fix React warning about legacy lifecycle calls and sensitive status resetting ( #10872 )
6 years ago
9c174f4d02
Fix safari post field display issue in single column layout ( #10883 )
6 years ago
6f624f449e
i18n: Update Corsican front-end translation ( #10884 )
6 years ago
7403b0ec05
Update Japanese translations. ( #10875 )
...
run yarn manage:translations ja && i18n-tasks add-missing ja
6 years ago
d0dc7a60ab
I18n: Update Czech translation ( #10874 )
6 years ago
7fb3fa16dd
Truncate long URLs while providing alt text for inline images
6 years ago
d417a32290
Translate incoming remote img tags by a link
6 years ago
40117d908f
[Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
...
Port SCSS changes from c5234ac2aa
6 years ago
b9c5aed987
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
31b8203887
Fix web push notifications for polls ( #10864 )
...
Fixes #10861
6 years ago
7d2b4e9277
Refactor footers in web UI into a single component ( #10846 )
6 years ago
4c9d8f8ef9
Display notifications count on a new single column ( #10859 )
6 years ago
938edb44a1
Fix video player regressions introduced by blurhash merge
6 years ago
c1619a5c24
[Glitch] Add keyboard shortcut to hide/show media
...
Port 7ee189fa609e238804ea
6 years ago
c5234ac2aa
Use `<use />` to render transparent SVG logo instead of inserting it ( #10845 )
6 years ago
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.
6 years ago
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
4e953ee471
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ce528d61b4
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
630aafa3a7
Merge branch 'master' into glitch-soc/merge-upstream
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
028fb2060b
Fix possible race condition when processing statuses ( #10815 )
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
f5637b174f
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
4eaa4a649e
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
9a101b91ae
Make headers font size proportional
6 years ago
3117d0ac70
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
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
a93c6f708b
Fix local text/html toots not being sanitized
6 years ago
626844dfb1
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
a0b7246388
Refactor contentType selection in glitch composer
6 years ago
0bc9d4f6d3
Use glitch-soc's poll component instead of upstream's
6 years ago
d8e5268939
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
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
4ad004d2ef
Fix “invited by” not showing up for invited accounts in admin interface ( #10791 )
6 years ago
4de9bd3870
fix `isSubmitting` prop case ( #10785 )
6 years ago
fd5da4033e
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
8ec309ee64
add og:image:alt for media attachments in embeds ( #10779 )
6 years ago
3a4761c665
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
6 years ago
08a793cbd9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
1fec2ff78f
Prevent from publicly boosting one's own private toots ( #10775 )
6 years ago
d48d1ed534
Minor optimization
6 years ago
b83cdc9b02
Export fallback content type and use it as default in WebUI
6 years ago
3d03d084cd
Properly escape HTML in code blocks
6 years ago
7aece1eec5
Add option for default toot content-type
6 years ago
ee3dfdf6a1
Fix autolinking, and newlines in code blocks
...
Autolinking is now performed *after* the Markdown pass, by replacing HTML
tags with zero-width spaces and running the twitter-text extractor as usual,
except it does not auto-link URLs to avoid links in links…
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
91ab9e2e4f
Add API support for setting status content-type
6 years ago
20c98d7a27
Serialize content-type on Delete & Redraft
6 years ago
c9696ef8a5
Add support for HTML-formatted toots
6 years ago
8313ee07f6
Add support for markdown-formatted toots
6 years ago
105f03a988
Add database row to hold status content type
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
85a991cfa7
Minor performance improvements and cleanup in formatter ( #10765 )
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
f1a3135809
Record account suspend/silence time and keep track of domain blocks ( #10660 )
...
* Record account suspend/silence time and keep track of domain blocks
* Also unblock users who were suspended/silenced before dates were recorded
* Add tests
* Keep track of suspending date for users suspended through the CLI
* Show accurate number of accounts that would be affected by unsuspending an instance
* Change migration to set silenced_at and suspended_at
* Revert "Also unblock users who were suspended/silenced before dates were recorded"
This reverts commit a015c65d2d1e28c7b7cfab8b3f8cd5fb48b8b71c.
* Switch from using suspended and silenced to suspended_at and silenced_at
* Add post-deployment migration script to remove `suspended` and `silenced` columns
* Use Account#silence! and Account#suspend! instead of updating the underlying property
* Add silenced_at and suspended_at migration to post-migration
* Change account fabricator to translate suspended and silenced attributes
* Minor fixes
* Make unblocking domains always retroactive
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
d35f558b37
Use local time in audit log ( #10751 )
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
e55cf0042f
Fix media description confirmation modal
...
Fixes #1040
6 years ago
d225a952a8
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
6 years ago
5cf2f8c646
Add emoji suggestions to CW and poll option fields ( #10555 )
...
* Refactor selectComposeSuggestion so that different paths can be updated
* Add suggestions in CW field
* Add emoji suggestion to poll options
* Attempt to fix CSS
* Hide suggestions by default
They will be enabled if the input has focus
6 years ago
a571b07557
Prevent silenced local users from notifying remote users not following them ( #10575 )
...
* Prevent silenced local users from notifying remote users not following them
This is an attempt to extend the local restrictions of silenced users to the
federation.
* Add tests
* Add tests for making sure private status don't get sent over OStatus
6 years ago
4870d7f122
Add some caching for HTML versions of statuses pages ( #10701 )
6 years ago
fc40391743
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
6 years ago
5ad2a7b5dc
Record deleted(by mod) status to prevent re-appear ( #10732 )
...
* Record deleted(by mod) status to prevent re-appear
* Move to Tombstone
* Add missing migration script
6 years ago
3288f4a571
Bring back crossed eye icon on gallery ( #10715 )
6 years ago
e9f0c31dc6
Fix tabs bar on mobile
...
Fixes #1037
6 years ago
6b71076391
Fix some colors of high contrast theme ( #10711 )
...
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
6 years ago
40a480ea34
Fix front-end crash when a video has a blurhash and is hidden behind a CW
6 years ago
13244f7bb3
i18n Update Catalan translation ( #10719 )
...
* 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
6 years ago
139ef769f7
Add description on hover in media gallery ( #10713 )
6 years ago
5052b8c29f
Fix content warning button displaying a link icon when no status card is set
6 years ago
683a5ae765
i18n: Update Japanese translations ( #10706 )
...
* Update Japanese translations.
run yarn manage:translations
This commit includes translations by some users that were done at the transifex.
* Reduce translation text because it becomes two lines.
6 years ago
027f35c6a5
1 NL string update ( #10709 )
...
* 1 NL string update
No that weblate isn't used anymore, it would be fine if, or the english strings are update, or there is somewhere an explanation how to generate new strings for a language
* Update nl.json
6 years ago
1592cab613
fix pinned columns ’s Media-only button
...
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
6 years ago
83665f0357
[Glitch] Make sure the instance banner is never cropped
...
Port 05b2a77a6d
6 years ago
23829e09f5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
71fd62835e
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
6 years ago
05b2a77a6d
Make sure the instance banner is never cropped ( #10702 )
6 years ago
850f8195fd
Minor style fixes
6 years ago
5df7b98c2b
[Glitch] Change font weight of sensitive button to 500
...
Port f7879bbe08
6 years ago
8050f86d04
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port cc39785d45
6 years ago
ThibG
Eugen Rochko
Yamagishi Kazutoshi
Wenceslao Páez Chávez
Takeshi Umeda
Jeong Arm
Lady Lumb
Hanage999
slice
Alix Rossi
mayaeh
Aditoo17
abcang
りんすき
Neil Moore
Mélanie Chauvel (ariasuni)
nzws
dxwc
Paul Woolcock
trwnh
Hinaloe
Ben Lubar
Haelwenn (lanodan) Monnier
KokaKiwi
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
spla
jeroenpraat
Kirishima21
Baptiste Gelez