Thibaut Girka
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
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Neil Moore
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
Eugen Rochko
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
Hanage999
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
Eugen Rochko
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
ThibG
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
Mélanie Chauvel (ariasuni)
276c9e6e9e
Avoid cutting bottom of letters of last paragraph of statuses ( #10821 )
6 years ago
Eugen Rochko
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
Thibaut Girka
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
Thibaut Girka
e8b45064b8
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- streaming/index.js
6 years ago
ThibG
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
ThibG
4e953ee471
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
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
Thibaut Girka
630aafa3a7
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
106cfa7553
Various improvements to single column layout ( #10809 )
...
- Add potential side panels to single column layout
- Hide FAB on large screens
6 years ago
ThibG
028fb2060b
Fix possible race condition when processing statuses ( #10815 )
6 years ago
nzws
3d860417a5
[Glitch] Fix stacking order of emoji picker
...
Port 1fbe5c2fec
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
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
ThibG
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
ThibG
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
Thibaut Girka
9a101b91ae
Make headers font size proportional
6 years ago
Thibaut Girka
3117d0ac70
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
6 years ago
Eugen Rochko
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
nzws
1fbe5c2fec
Fix stacking order of emoji picker ( #10801 )
6 years ago
dxwc
0a1ba7c14b
i18n: Complete frontend Bengali translation ( #10800 )
...
* i18n: Complete frontend Bengali translation
* run yarn manage:translations
6 years ago
Thibaut Girka
a93c6f708b
Fix local text/html toots not being sanitized
6 years ago
Paul Woolcock
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
Thibaut Girka
a0b7246388
Refactor contentType selection in glitch composer
6 years ago
Thibaut Girka
0bc9d4f6d3
Use glitch-soc's poll component instead of upstream's
6 years ago
trwnh
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
Thibaut Girka
e21662d370
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
4ad004d2ef
Fix “invited by” not showing up for invited accounts in admin interface ( #10791 )
6 years ago
Hinaloe
4de9bd3870
fix `isSubmitting` prop case ( #10785 )
6 years ago
Thibaut Girka
fd5da4033e
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Ben Lubar
8ec309ee64
add og:image:alt for media attachments in embeds ( #10779 )
6 years ago
Eugen Rochko
3a4761c665
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
6 years ago
Thibaut Girka
08a793cbd9
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
1fec2ff78f
Prevent from publicly boosting one's own private toots ( #10775 )
6 years ago
Thibaut Girka
d48d1ed534
Minor optimization
6 years ago
Thibaut Girka
b83cdc9b02
Export fallback content type and use it as default in WebUI
6 years ago
Thibaut Girka
3d03d084cd
Properly escape HTML in code blocks
6 years ago
Thibaut Girka
7aece1eec5
Add option for default toot content-type
6 years ago
Thibaut Girka
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
Thibaut Girka
dfeda8857f
Hide content-type dropdown by default
6 years ago
Haelwenn (lanodan) Monnier
76d58bf63e
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
8a49df8ede
Support proper content-type in Delete & Redraft
6 years ago
KokaKiwi
08a981dd25
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
91ab9e2e4f
Add API support for setting status content-type
6 years ago
Thibaut Girka
20c98d7a27
Serialize content-type on Delete & Redraft
6 years ago
Thibaut Girka
c9696ef8a5
Add support for HTML-formatted toots
6 years ago
Thibaut Girka
8313ee07f6
Add support for markdown-formatted toots
6 years ago
Thibaut Girka
105f03a988
Add database row to hold status content type
6 years ago
ThibG
38272bbeb1
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
Thibaut Girka
422dd06806
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG
85a991cfa7
Minor performance improvements and cleanup in formatter ( #10765 )
6 years ago
Neil Moore
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
ThibG
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
Thibaut Girka
d8e9a04354
Fix rich text style in reply indicator
6 years ago
Thibaut Girka
9f0ff9b6ea
Fix rich text styling on public pages
6 years ago
Thibaut Girka
6e625755a6
Fix text color of some formatted elements in notifications
6 years ago
nzws
f79d089b65
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
6 years ago
ThibG
cfb69164ad
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
6 years ago
ThibG
c8195e2da1
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 2a917031c9
to glitch-soc
6 years ago
Thibaut Girka
5262820fae
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
46b5085ced
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
6 years ago
ThibG
0bb3ba2406
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
6 years ago
ThibG
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
nzws
d35f558b37
Use local time in audit log ( #10751 )
6 years ago
Maciek Baron
e060819020
[Glitch] Improve poll link accessibility
...
Port fc40391743
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
nzws
f625501c05
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Aurélien Reeves
22541e98e2
[Glitch] Add confirm modal for unboosting toots
...
Port d225a952a8
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Alix Rossi
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
Alix Rossi
1959e4e5ec
i18n: Update Corsican translations ( #10746 )
...
* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml
6 years ago
ThibG
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
Thibaut Girka
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
e55cf0042f
Fix media description confirmation modal
...
Fixes #1040
6 years ago
Aurélien Reeves
d225a952a8
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
6 years ago
ThibG
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
ThibG
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
ThibG
4870d7f122
Add some caching for HTML versions of statuses pages ( #10701 )
6 years ago
Maciek Baron
fc40391743
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
6 years ago
Jeong Arm
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
Jeong Arm
3288f4a571
Bring back crossed eye icon on gallery ( #10715 )
6 years ago
Thibaut Girka
e9f0c31dc6
Fix tabs bar on mobile
...
Fixes #1037
6 years ago
nzws
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
Thibaut Girka
40a480ea34
Fix front-end crash when a video has a blurhash and is hidden behind a CW
6 years ago
spla
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
ThibG
139ef769f7
Add description on hover in media gallery ( #10713 )
6 years ago
Thibaut Girka
5052b8c29f
Fix content warning button displaying a link icon when no status card is set
6 years ago
mayaeh
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
jeroenpraat
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
Kirishima21
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
Baptiste Gelez
83665f0357
[Glitch] Make sure the instance banner is never cropped
...
Port 05b2a77a6d
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
23829e09f5
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Aditoo17
71fd62835e
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
6 years ago
Baptiste Gelez
05b2a77a6d
Make sure the instance banner is never cropped ( #10702 )
6 years ago
Thibaut Girka
850f8195fd
Minor style fixes
6 years ago
Eugen Rochko
5df7b98c2b
[Glitch] Change font weight of sensitive button to 500
...
Port f7879bbe08
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Eugen Rochko
8050f86d04
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port cc39785d45
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
167808363d
Add visibility icon back in media gallery
6 years ago
Thibaut Girka
43dc5ad0e5
Add back description on hover
6 years ago
ThibG
d0342a1a63
[Glitch] Fix transition: all
...
Port 9e044c9649
to glitch-soc
6 years ago
ThibG
09d6a2920d
[Glitch] Make the cursor icon consistant across media types in account media gallery
6 years ago
Thibaut Girka
5d6f4ef070
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko
52c09770fe
[Glitch] Add button to view context to media modal
...
Port 4aabc452d0
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Eugen Rochko
6138cad296
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 78f5b96bf6
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Eugen Rochko
3b9ff1fa34
[Glitch] Change account gallery in web UI
...
Port db73f8e585
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
Thibaut Girka
61b5fd518c
Minor CSS fixes
6 years ago
Eugen Rochko
87a7a9a4df
[Glitch] Add blurhash
...
Port front-end changes from a6d2fe7165
to glitch-soc
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
6 years ago
ThibG
9e044c9649
Fix transition: all ( #10699 )
6 years ago
ThibG
d5357fcbf2
Minor account media gallery fixes ( #10695 )
...
* Make the cursor icon consistant across media types in account media gallery
* Fix the video player modal causing scroll position to reset
6 years ago
ThibG
0f1d2f4d71
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 8c716f917f
6 years ago
Thibaut Girka
73bc58c656
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
6 years ago
ThibG
09ce4ea53c
Do not retry processing ActivityPub jobs raising validation errors ( #10614 )
...
* Do not retry processing ActivityPub jobs raising validation errors
Jobs yielding validation errors most probably won't ever be accepted,
so it makes sense not to clutter the queues with retries.
* Lower RecordInvalid error reporting to debug log level
* Remove trailing whitespace
6 years ago
Eugen Rochko
c3b1f6963b
Change e-mail whitelist/blacklist to not be checked when invited ( #10683 )
...
* Change e-mail whitelist/blacklist to not be checked when invited
And only when creating an account, not when updating it later
Fix #10648
* Fix test
6 years ago
Thibaut Girka
d20647fd94
Fix polls icon not showing in CW button in detailed statuses
6 years ago
Eugen Rochko
f7879bbe08
Change font weight of sensitive button to 500 ( #10682 )
6 years ago
ThibG
4c4f9d78fd
Explicitly disable storage of REST API results ( #10655 )
...
Fixes #10652
6 years ago
ThibG
8c716f917f
Provide a link to existing domain block when trying to block an already-blocked domain ( #10663 )
...
* When trying to block an already-blocked domain, provide a link to the block
* Fix styling for links in flash messages
* Allow blocks to be upgraded but not downgraded
6 years ago
Thibaut Girka
c15b1aa00c
Fix crash in onboarding modal
...
Fixes #1027
6 years ago
Eugen Rochko
4aabc452d0
Add button to view context to media modal ( #10676 )
...
* Add "view context" button to media modal when opened from gallery
* Add "view context" button to video modal
Allow closing the video modal by navigating back in the browser,
just like the media modal
6 years ago
ThibG
d8418c07c9
When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )
6 years ago
Eugen Rochko
cc39785d45
Make the "mark media as sensitive" button more obvious in web UI ( #10673 )
...
* Make the "mark media as sensitive" button more obvious in web UI
* Use eye-slash icon instead of eye icon to mean "hide"
6 years ago
Eugen Rochko
78f5b96bf6
Fix alignment of items in the account gallery in web UI and load more per page ( #10674 )
6 years ago
Eugen Rochko
db73f8e585
Change account gallery in web UI ( #10667 )
...
- 3 items per row instead of 2
- Use blurhash for previews
- Animate/hover-to-play GIFs and videos
- Open media modal instead of opening status
- Allow opening status instead with ctrl+click and open in new tab
6 years ago
ThibG
af3971a0e6
Check that an invite link is valid before bypassing approval mode ( #10657 )
...
* Check that an invite link is valid before bypassing approval mode
Fixes #10656
* Add tests
* Only consider valid invite links in registration controller
* fixup
6 years ago
Thibaut Girka
c4865cbd25
Add site-wide options to show reblogs and replies in local/public timelines
...
Fixes #1021
6 years ago
Thibaut Girka
e53b2a9c37
Make hi-color privacy icons opt-in instead of opt-out
6 years ago
Thibaut Girka
f5f0bd6c0a
Add high color privacy icons
...
Fixes #1015
6 years ago
Zac
826d926bb9
changed pinned status count operator
...
changed default pinned count to 5 to preserve default behavior
6 years ago
Zac
5a3d18a660
added documentation into .env.production.sample
...
moved max pin count into constant
6 years ago
Zac
41d3d17fe7
add env var for max pinned toots
6 years ago
Thibaut Girka
98732502f5
When selecting a toot via keyboard, ensure it is scrolled into view
...
Fixes detailed status column
6 years ago
Thibaut Girka
81c9377c7d
Add support for missing formatting tags
6 years ago
Thibaut Girka
02bd678944
Add keyboard shortcut to collapse/uncollapse toots
6 years ago
Thibaut Girka
7ed89e9178
Add hotkey for bookmarking a toot
6 years ago
partev
f843bdbd73
Update hy.json ( #10644 )
6 years ago
Eugen Rochko
b1e10ed1b3
Fix approved column being set to nil instead of false ( #10642 )
...
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619
6 years ago
Thibaut Girka
5a8b820767
Fix regression with textarea's caret position when selecting a suggestion
6 years ago
Eugen Rochko
a6d2fe7165
Add blurhash ( #10630 )
...
* Add blurhash
* Use fallback color for spoiler when blurhash missing
* Federate the blurhash and accept it as long as it's at most 5x5
* Display unknown media attachments as blurhash placeholders
* Improve style of embed actions and spoiler button
* Change blurhash resolution from 3x3 to 4x4
* Improve dependency definitions
* Fix code style issues
6 years ago
Thibaut Girka
b40841b488
Hide suggestions by default
...
They will be enabled if the input has focus
6 years ago
Thibaut Girka
e720f1eac2
Attempt to fix CSS
6 years ago
Thibaut Girka
4155a1556a
Add emoji suggestion to poll options
6 years ago
Thibaut Girka
b35b38f4ea
Add suggestions in CW field
6 years ago
Thibaut Girka
0541e4ad21
Refactor selectComposeSuggestion so that different paths can be updated
6 years ago
Eugen Rochko
be7bab1fd9
Fix LDAP/PAM/SAML/CAS users not being approved instantly ( #10621 )
6 years ago
Eugen Rochko
2ba12c8917
Fix not being able to save e-mail preference for new pending accounts ( #10622 )
6 years ago
ThibG
23e87a4742
Fix upload progressbar when image resizing is involved ( #10632 )
6 years ago
ThibG
140be28787
Reject follow requests of blocked users ( #10633 )
6 years ago
Thibaut Girka
642a298ceb
Do not ask to register web intent handler
6 years ago
Thibaut Girka
8942036345
Fix color of muted statuses content not wrapped in a p tag
6 years ago
Thibaut Girka
73f83ef399
Redesign blockquote styling
6 years ago
Thibaut Girka
f5ea016889
Better distinguish titles from text
6 years ago
Thibaut Girka
8003dd8849
Remove extra margin in paragraphs inside blockquotes
6 years ago
Thibaut Girka
a855f38086
Make bold text bolder
6 years ago
Thibaut Girka
ad30895262
Remove margins around `p` tags in lists
6 years ago
Thibaut Girka
ce2da44c2c
Rename status__text to status__content__text for consistency with upstream
6 years ago
Thibaut Girka
facc95f71a
Fix status header display in toot mobile menu
6 years ago
Thibaut Girka
b43cfd3eb3
Fix upload progressbar when image resizing is involved
6 years ago
Thibaut Girka
4a95bfe919
Hide media upload form if no media are attached
6 years ago
Thibaut Girka
0f97c82eac
Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka
07367bc6ec
Fix file upload
6 years ago
Thibaut Girka
86108e7af7
Fix settings modal
6 years ago
Eugen Rochko
72f3242a59
Fix sign up button not saying sign up when invite is used ( #10623 )
...
Fix #10616
6 years ago
Thibaut Girka
2d2eca5bda
Do not leak local-only toots to remote mentioned users
6 years ago
Thibaut Girka
2ad61962ae
Load custom CSS rules after standard ones
...
Fixes #933
Due to glitch-soc's theming system, JS and CSS files are imported in a slightly
different order, and custom CSS rules were loaded *before* everything else.
They will now be loaded *after* everything else, which is a bit different from
upstream but should work better overall.
6 years ago
Thibaut Girka
9aeb714b7a
Add support for lists in statuses
6 years ago
Thibaut Girka
fea727c61a
Do not switch to italic for status media buttons
6 years ago
Thibaut Girka
22ad8c89b2
Accept richer text from remote statuses
...
Support abbr, del, pre, blockquote, code, strong, b, em, i, and h1…h5
HTML elements in remote statuses, add corresponding CSS.
6 years ago
kedama
4ce6358787
[Glitch] Fix modal items cannot scroll on touch devices
...
Port 92ced1e94b
to glitch-soc
6 years ago
Thibaut Girka
6f85bb754b
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
Upstream cleaned up a bit, including on lines in which
we replaced the hardcoded 500 character limit with a maxChar
constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
Moved upstream's new animated avatar hover handling in
app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
Upstream made repo URL configurable, did the same, but
default to glitch-soc
6 years ago
Thibaut Girka
1b8d2af1f9
Fix ReferenceError in dropdown
6 years ago
Thibaut Girka
25cfabce26
Fix broken reference to handleSubmit
6 years ago
Thibaut Girka
041e27bd2d
Cleanup
6 years ago
Thibaut Girka
2ee26ba420
Move ComposerPublisher to Compose
6 years ago
Thibaut Girka
bf8b0394b7
Add OptionsContainer
6 years ago
Thibaut Girka
ef17da32f9
Move composer Dropdown from features/composer to features/compose
6 years ago
Thibaut Girka
a6bb49adf1
Move ComposerTextareaIcons to TextareaIcons
6 years ago
Thibaut Girka
08faf16d66
ComposerTextarea → AutosuggestTextarea
6 years ago
Thibaut Girka
513547ba57
ComposerUploadForm → UploadForm + UploadFormContainer
6 years ago
Thibaut Girka
f7d1772fc8
Move PollForm from features/composer to features/compose
6 years ago
Thibaut Girka
2021f14e8f
Inline spoiler input
6 years ago
Thibaut Girka
3529f6f4ae
ComposerReply → ReplyIndicator
6 years ago
Thibaut Girka
ad6166f0ef
Refactor Compose*Warning → ContainerWarning
...
Regression: only one warning at a time
6 years ago
Thibaut Girka
5e4588524b
features/composer/index.js → ComposeForm
6 years ago
Thibaut Girka
8ea0e64864
DrawerHeader → Header + HeaderContainer
6 years ago
Thibaut Girka
2f2381a400
DrawerAccount → NavigationBar + NavigationContainer
6 years ago
Eugen Rochko
7acc035cbe
[Glitch] Show suggested follows on search screen in mobile layout
...
Port 541fda5fc8
to glitch-soc
6 years ago
Thibaut Girka
4aee182cd3
DrawerResults → SearchResults + SearchResultsContainer
6 years ago
Thibaut Girka
7c2cc9d681
Rework DrawerResults to make them closer to upstream
6 years ago
Thibaut Girka
5264424b71
Move DrawerSearch to Search + SearchContainer
6 years ago
Thibaut Girka
7fa3320516
Inline DrawerSearchPopout in DrawerSearch
6 years ago
Thibaut Girka
a55e1c1d49
Refactor a bit DrawerSearch to make it closer to upstream
6 years ago
Thibaut Girka
e41c4ad61b
Rename flavours/glitch/features/drawer to flavours/glitch/features/compose
6 years ago
ThibG
eb80c3924f
Allow switching between singe-option and multiple-option polls ( #10603 )
6 years ago
kedama
92ced1e94b
Fix modal items cannot scroll on touch devices ( #10605 )
6 years ago
ThibG
3c6f8de45a
Minor code cleanup ( #10613 )
6 years ago
Ben Lubar
483aa50856
Default to the web domain (eg. mastodon.lubar.me) instead of the local domain (eg. lubar.me) for keybase proofs ( #10565 )
6 years ago
Yamagishi Kazutoshi
47c0af88f1
Add hi.json ( #10573 )
6 years ago