72bf354e97
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 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
5 years ago
bf988123ba
Merge branch 'master' into glitch-soc/merge-upstream
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
9a5561a5b8
Fix possible race condition when processing statuses ( #10815 )
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
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
5 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.
5 years ago
0744d6e571
Make headers font size proportional
5 years ago
7c609bdab9
Allow rel=tag in status text
...
Fixes tag links in local Markdown or HTML-authored statuses
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
2332b3f146
Fix local text/html toots not being sanitized
5 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
5 years ago
4fbce23992
Refactor contentType selection in glitch composer
5 years ago
2cd7bfac23
Use glitch-soc's poll component instead of upstream's
5 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
5 years ago
08a2af27c3
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ae18386558
Fix “invited by” not showing up for invited accounts in admin interface ( #10791 )
5 years ago
bb9d7fad9f
fix `isSubmitting` prop case ( #10785 )
5 years ago
f509815379
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
2f3e4a64be
add og:image:alt for media attachments in embeds ( #10779 )
5 years ago
6fe474837c
Change poll options to alphabetic letters when status text is hidden ( #10685 )
...
Fix #10569
5 years ago
6e227ecb04
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
a1519a8ef5
Prevent from publicly boosting one's own private toots ( #10775 )
5 years ago
9ca21e93cc
Minor optimization
5 years ago
56245a2a72
Export fallback content type and use it as default in WebUI
5 years ago
dd5bf40b97
Properly escape HTML in code blocks
5 years ago
a6b7c23f6f
Add option for default toot content-type
5 years ago
0be93820f3
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…
5 years ago
9df1ef87c2
Hide content-type dropdown by default
5 years ago
c2fa36bbae
Content-Type Dropdown: use the selected option icon for the menu
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
93d98f62a8
Support proper content-type in Delete & Redraft
5 years ago
f34a402a94
Add status content type dropdown to compose box.
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
14d7ddcb1c
Add API support for setting status content-type
5 years ago
b3e68de4d2
Serialize content-type on Delete & Redraft
5 years ago
d7520f8175
Add support for HTML-formatted toots
5 years ago
94aef563b9
Add support for markdown-formatted toots
5 years ago
bfc509f44a
Add database row to hold status content type
5 years ago
c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
6badf2d252
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
c1c8c7b2c8
Minor performance improvements and cleanup in formatter ( #10765 )
5 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.
5 years ago
14f6ce2885
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
5 years ago
4bab7d7640
Fix rich text style in reply indicator
5 years ago
87d16698c2
Fix rich text styling on public pages
5 years ago
cd534830ad
Fix text color of some formatted elements in notifications
5 years ago
3e15a845c1
Fix some colors in light theme ( #10754 )
...
* Fix typo in light theme
* Fix background color of empty column
5 years ago
dd118449c2
Fix incorrect reference to raw_content (it is raw_text instead) ( #10753 )
5 years ago
93085c273c
[Glitch] Use raw content if available on Delete & Redraft
...
Port front-end changes from 6d44f2441b
5 years ago
2b97d9d780
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
3ea5c045d7
Use a checkbox for the “Mark media as sensitive” composer button
...
Fixes #1039
5 years ago
fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
...
Merge upstream changes
5 years ago
6d44f2441b
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
5 years ago
be851321c0
Use local time in audit log ( #10751 )
5 years ago
14d855c429
[Glitch] Improve poll link accessibility
...
Port 0402c52f28
5 years ago
78ff7e3821
[Glitch] Fix some colors of high contrast theme
...
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
5 years ago
96f0747afe
[Glitch] Add confirm modal for unboosting toots
...
Port fe8a8f779e
5 years ago
775ee63b71
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
5 years ago
d25e358f9f
i18n: Update Corsican translations ( #10746 )
...
* i18n: Update Corsican translations
* Update co.yml
* Fix a translation in co.yml
5 years ago
6dc9baad2a
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
5 years ago
68629f2773
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
5 years ago
d4d4e84324
Fix media description confirmation modal
...
Fixes #1040
5 years ago
fe8a8f779e
Add confirm modal for unboosting toots ( #10287 )
...
[#3815 ]
Display the boost modal also when unboosting toots.
5 years ago
f2be71c293
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
5 years ago
62f5235b6f
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
5 years ago
26fc21c188
Add some caching for HTML versions of statuses pages ( #10701 )
5 years ago
0402c52f28
Improve poll link accessibility ( #10720 )
...
* Add distinction between hover and active/focus states
* Resolves #10198
5 years ago
ce8635605c
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
5 years ago
09eea46631
Bring back crossed eye icon on gallery ( #10715 )
5 years ago
3191c3b349
Fix tabs bar on mobile
...
Fixes #1037
5 years ago
5c82d660d1
Fix some colors of high contrast theme ( #10711 )
...
* Fix "nothing here" text color of high contrast
* Fix counter border color of high contrast
5 years ago
2c767f44bf
Fix front-end crash when a video has a blurhash and is hidden behind a CW
5 years ago
7562602df8
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
5 years ago
b2f5b1045f
Add description on hover in media gallery ( #10713 )
5 years ago
89d2859296
Fix content warning button displaying a link icon when no status card is set
5 years ago
1eb14ef774
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.
5 years ago
e742bff19b
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
5 years ago
8383222026
fix pinned columns ’s Media-only button
...
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
5 years ago
eef8802325
[Glitch] Make sure the instance banner is never cropped
...
Port 21209c2b52
5 years ago
832cf92c74
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
b7741ed732
I18n: Update Czech translation 🇨🇿 ( #10704 )
...
* I18n: Update Czech translation
* Tiny fix
5 years ago
21209c2b52
Make sure the instance banner is never cropped ( #10702 )
5 years ago
f2cf8144b4
Minor style fixes
5 years ago
9b1ef58c95
[Glitch] Change font weight of sensitive button to 500
...
Port 63b1388fef
5 years ago
f59973cc85
[Glitch] Make the "mark media as sensitive" button more obvious in web UI
...
Port 05ef3462ba
5 years ago
b1ab4d5ebe
Add visibility icon back in media gallery
5 years ago
cbda1b8b66
Add back description on hover
5 years ago
8e221cd22b
[Glitch] Fix transition: all
...
Port 7aa749ab46
5 years ago
b7f69beebe
[Glitch] Make the cursor icon consistant across media types in account media gallery
5 years ago
52a4284fe5
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
bc97fd641f
[Glitch] Add button to view context to media modal
...
Port eb63217210
5 years ago
209c080280
[Glitch] Fix alignment of items in the account gallery in web UI and load more per page
...
Port 967e419f8f
5 years ago
a5da59f140
[Glitch] Change account gallery in web UI
...
Port 3f143606fa
5 years ago
373dd1fdf1
Minor CSS fixes
5 years ago
ccf4f3240a
[Glitch] Add blurhash
...
Port front-end changes from fba96c808d
5 years ago
7aa749ab46
Fix transition: all ( #10699 )
5 years ago
4f73cde4e1
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
5 years ago
1149ddd3da
Fix glitch SCSS for links in error messages in admin interface
...
Port SCSS changes from 011b032300
5 years ago
33c80e0783
Merge branch 'master' into glitch-soc/merge-upstream
...
Conflicts:
- app/models/media_attachment.rb
5 years ago
b85f216cbc
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
5 years ago
7cb369d4c6
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
5 years ago
9f25ab9792
Fix polls icon not showing in CW button in detailed statuses
5 years ago
63b1388fef
Change font weight of sensitive button to 500 ( #10682 )
5 years ago
91634947f8
Explicitly disable storage of REST API results ( #10655 )
...
Fixes #10652
5 years ago
011b032300
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
5 years ago
7617f78359
Fix crash in onboarding modal
...
Fixes #1027
5 years ago
eb63217210
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
5 years ago
5121d9c12f
When selecting a toot via keyboard, ensure it is scrolled into view ( #10593 )
5 years ago
05ef3462ba
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"
5 years ago
967e419f8f
Fix alignment of items in the account gallery in web UI and load more per page ( #10674 )
5 years ago
3f143606fa
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
5 years ago
21a73c52a7
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
5 years ago
fcbf557bd2
Add site-wide options to show reblogs and replies in local/public timelines
...
Fixes #1021
5 years ago
cc5a81b7d8
Make hi-color privacy icons opt-in instead of opt-out
5 years ago
ac54292d69
Add high color privacy icons
...
Fixes #1015
5 years ago
be6ef1947e
changed pinned status count operator
...
changed default pinned count to 5 to preserve default behavior
5 years ago
5616200ed4
added documentation into .env.production.sample
...
moved max pin count into constant
5 years ago
a36affb9d6
add env var for max pinned toots
5 years ago
d4c95e6a8a
When selecting a toot via keyboard, ensure it is scrolled into view
...
Fixes detailed status column
5 years ago
3e095cab83
Add support for missing formatting tags
5 years ago
67fb9a8679
Add keyboard shortcut to collapse/uncollapse toots
5 years ago
f3acf8f414
Add hotkey for bookmarking a toot
5 years ago
5e79dd3f17
Update hy.json ( #10644 )
5 years ago
e18786dec7
Fix approved column being set to nil instead of false ( #10642 )
...
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619
5 years ago
cd9a284702
Fix regression with textarea's caret position when selecting a suggestion
5 years ago
fba96c808d
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
5 years ago
aa1832ac4d
Hide suggestions by default
...
They will be enabled if the input has focus
5 years ago
fddd8251dd
Attempt to fix CSS
5 years ago
d7e4be285a
Add emoji suggestion to poll options
5 years ago
df52004fe6
Add suggestions in CW field
5 years ago
3a671470ec
Refactor selectComposeSuggestion so that different paths can be updated
5 years ago
e451ba0e83
Fix LDAP/PAM/SAML/CAS users not being approved instantly ( #10621 )
5 years ago
f27d709351
Fix not being able to save e-mail preference for new pending accounts ( #10622 )
5 years ago
852ccea676
Fix upload progressbar when image resizing is involved ( #10632 )
5 years ago
b1a0322a06
Reject follow requests of blocked users ( #10633 )
5 years ago
1c0402c103
Do not ask to register web intent handler
5 years ago
b13c90f3e3
Fix color of muted statuses content not wrapped in a p tag
5 years ago
e4b65e6349
Redesign blockquote styling
5 years ago
8753e5317f
Better distinguish titles from text
5 years ago
3631c3314a
Remove extra margin in paragraphs inside blockquotes
5 years ago
9b86707b1e
Make bold text bolder
5 years ago
5a8495dabe
Remove margins around `p` tags in lists
5 years ago
ef249a2718
Rename status__text to status__content__text for consistency with upstream
5 years ago
adbb174c9c
Fix status header display in toot mobile menu
5 years ago
ef1504d625
Fix upload progressbar when image resizing is involved
5 years ago
ffab9d626a
Hide media upload form if no media are attached
5 years ago
7783ec921b
Merge branch 'master' into glitch-soc/merge-upstream
5 years ago
ThibG
Eugen Rochko
nzws
dxwc
Paul Woolcock
trwnh
Hinaloe
Ben Lubar
Haelwenn (lanodan) Monnier
KokaKiwi
Neil Moore
Maciek Baron
nzws
Aurélien Reeves
Alix Rossi
Jeong Arm
spla
mayaeh
jeroenpraat
Kirishima21
Baptiste Gelez
Aditoo17
Zac
partev