Commit Graph

6610 Commits (d417a322902419dab664a1381e410707a0945504)

Author SHA1 Message Date
Thibaut Girka b83cdc9b02 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka 3d03d084cd Properly escape HTML in code blocks 2019-05-17 23:51:14 +02:00
Thibaut Girka 7aece1eec5 Add option for default toot content-type 2019-05-17 23:51:14 +02:00
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…
2019-05-17 23:51:14 +02:00
Thibaut Girka dfeda8857f Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier 76d58bf63e Content-Type Dropdown: use the selected option icon for the menu
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
Thibaut Girka 8a49df8ede Support proper content-type in Delete & Redraft 2019-05-17 23:51:14 +02:00
KokaKiwi 08a981dd25 Add status content type dropdown to compose box.
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-17 23:51:14 +02:00
Thibaut Girka 91ab9e2e4f Add API support for setting status content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka 20c98d7a27 Serialize content-type on Delete & Redraft 2019-05-17 23:51:14 +02:00
Thibaut Girka c9696ef8a5 Add support for HTML-formatted toots 2019-05-17 23:51:14 +02:00
Thibaut Girka 8313ee07f6 Add support for markdown-formatted toots 2019-05-17 23:51:14 +02:00
Thibaut Girka 105f03a988 Add database row to hold status content type 2019-05-17 23:51:14 +02:00
ThibG 38272bbeb1 Merge pull request #1049 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-05-15 18:44:21 +02:00
Thibaut Girka 422dd06806 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
ThibG 85a991cfa7 Minor performance improvements and cleanup in formatter (#10765) 2019-05-15 06:54:06 +02:00
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.
2019-05-15 06:53:23 +02:00
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
2019-05-14 19:05:02 +02:00
Thibaut Girka d8e9a04354 Fix rich text style in reply indicator 2019-05-13 17:13:02 +02:00
Thibaut Girka 9f0ff9b6ea Fix rich text styling on public pages 2019-05-13 17:13:02 +02:00
Thibaut Girka 6e625755a6 Fix text color of some formatted elements in notifications 2019-05-12 19:23:32 +02:00
nzws f79d089b65 Fix some colors in light theme (#10754)
* Fix typo in light theme

* Fix background color of empty column
2019-05-12 05:15:42 +02:00
ThibG cfb69164ad Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 2019-05-11 23:56:07 +02:00
ThibG c8195e2da1 [Glitch] Use raw content if available on Delete & Redraft
Port front-end changes from 2a917031c9 to glitch-soc
2019-05-11 21:46:23 +02:00
Thibaut Girka 5262820fae Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Thibaut Girka 46b5085ced Use a checkbox for the “Mark media as sensitive” composer button
Fixes #1039
2019-05-11 12:35:38 +02:00
ThibG 0bb3ba2406 Merge pull request #1043 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-05-11 12:35:25 +02:00
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
2019-05-11 06:46:43 +02:00
nzws d35f558b37 Use local time in audit log (#10751) 2019-05-11 06:46:01 +02:00
Maciek Baron e060819020 [Glitch] Improve poll link accessibility
Port fc40391743 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 19:05:57 +02:00
nzws f625501c05 [Glitch] Fix some colors of high contrast theme
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 18:59:12 +02:00
Aurélien Reeves 22541e98e2 [Glitch] Add confirm modal for unboosting toots
Port d225a952a8 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-10 18:56:01 +02:00
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
2019-05-10 18:09:46 +02:00
Alix Rossi 1959e4e5ec i18n: Update Corsican translations (#10746)
* i18n: Update Corsican translations

* Update co.yml

* Fix a translation in co.yml
2019-05-10 18:09:34 +02:00
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
2019-05-10 17:59:57 +02:00
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
2019-05-10 17:09:12 +02:00
Thibaut Girka e55cf0042f Fix media description confirmation modal
Fixes #1040
2019-05-10 11:49:00 +02:00
Aurélien Reeves d225a952a8 Add confirm modal for unboosting toots (#10287)
[#3815]

Display the boost modal also when unboosting toots.
2019-05-09 22:39:26 +02:00
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
2019-05-09 22:10:27 +02:00
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
2019-05-09 22:05:43 +02:00
ThibG 4870d7f122 Add some caching for HTML versions of statuses pages (#10701) 2019-05-09 22:03:44 +02:00
Maciek Baron fc40391743 Improve poll link accessibility (#10720)
* Add distinction between hover and active/focus states
* Resolves #10198
2019-05-09 22:03:32 +02:00
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
2019-05-09 22:03:02 +02:00
Jeong Arm 3288f4a571 Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
Thibaut Girka e9f0c31dc6 Fix tabs bar on mobile
Fixes #1037
2019-05-08 00:32:53 +02:00
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
2019-05-07 23:53:58 +02:00
Thibaut Girka 40a480ea34 Fix front-end crash when a video has a blurhash and is hidden behind a CW 2019-05-07 22:33:37 +02:00
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
2019-05-07 00:55:37 +09:00
ThibG 139ef769f7 Add description on hover in media gallery (#10713) 2019-05-06 05:33:56 +02:00
Thibaut Girka 5052b8c29f Fix content warning button displaying a link icon when no status card is set 2019-05-05 21:47:05 +02:00
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.
2019-05-06 04:34:32 +09:00
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
2019-05-06 04:33:24 +09:00
Kirishima21 1592cab613 fix pinned columns ’s Media-only button
Media-only toggles could not be used on pinned columns.
The commit fixes this problem.
2019-05-05 20:54:21 +02:00
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>
2019-05-05 12:29:06 +02:00
Thibaut Girka 23829e09f5 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Aditoo17 71fd62835e I18n: Update Czech translation 🇨🇿 (#10704)
* I18n: Update Czech translation

* Tiny fix
2019-05-05 15:33:33 +09:00
Baptiste Gelez 05b2a77a6d Make sure the instance banner is never cropped (#10702) 2019-05-05 01:07:15 +02:00
Thibaut Girka 850f8195fd Minor style fixes 2019-05-04 23:05:43 +02:00
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>
2019-05-04 20:41:21 +02:00
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>
2019-05-04 20:41:21 +02:00
Thibaut Girka 167808363d Add visibility icon back in media gallery 2019-05-04 20:06:17 +02:00
Thibaut Girka 43dc5ad0e5 Add back description on hover 2019-05-04 20:03:37 +02:00
ThibG d0342a1a63 [Glitch] Fix transition: all
Port 9e044c9649 to glitch-soc
2019-05-04 19:53:09 +02:00
ThibG 09d6a2920d [Glitch] Make the cursor icon consistant across media types in account media gallery 2019-05-04 19:16:51 +02:00
Thibaut Girka 5d6f4ef070 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 19:15:50 +02:00
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>
2019-05-04 19:10:24 +02:00
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>
2019-05-04 18:59:11 +02:00
Eugen Rochko 3b9ff1fa34 [Glitch] Change account gallery in web UI
Port db73f8e585 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04 18:54:57 +02:00
Thibaut Girka 61b5fd518c Minor CSS fixes 2019-05-04 18:18:15 +02:00
Eugen Rochko 87a7a9a4df [Glitch] Add blurhash
Port front-end changes from a6d2fe7165 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-04 18:07:44 +02:00
ThibG 9e044c9649 Fix transition: all (#10699) 2019-05-04 17:39:53 +02:00
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
2019-05-04 17:36:43 +02:00
ThibG 0f1d2f4d71 Fix glitch SCSS for links in error messages in admin interface
Port SCSS changes from 8c716f917f
2019-05-04 16:43:08 +02:00
Thibaut Girka 73bc58c656 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
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
2019-05-03 23:45:37 +02:00
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
2019-05-03 23:44:44 +02:00
Thibaut Girka d20647fd94 Fix polls icon not showing in CW button in detailed statuses 2019-05-03 21:55:50 +02:00
Eugen Rochko f7879bbe08 Change font weight of sensitive button to 500 (#10682) 2019-05-03 20:44:20 +02:00
ThibG 4c4f9d78fd Explicitly disable storage of REST API results (#10655)
Fixes #10652
2019-05-03 20:39:19 +02:00
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
2019-05-03 20:36:36 +02:00
Thibaut Girka c15b1aa00c Fix crash in onboarding modal
Fixes #1027
2019-05-03 19:24:54 +02:00
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
2019-05-03 16:16:30 +02:00
ThibG d8418c07c9 When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
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"
2019-05-03 04:34:55 +02:00
Eugen Rochko 78f5b96bf6 Fix alignment of items in the account gallery in web UI and load more per page (#10674) 2019-05-03 04:02:55 +02:00
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
2019-05-02 08:34:32 +02:00
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
2019-05-02 04:30:12 +02:00
Thibaut Girka c4865cbd25 Add site-wide options to show reblogs and replies in local/public timelines
Fixes #1021
2019-05-01 22:33:09 +02:00
Thibaut Girka e53b2a9c37 Make hi-color privacy icons opt-in instead of opt-out 2019-05-01 20:23:25 +02:00
Thibaut Girka f5f0bd6c0a Add high color privacy icons
Fixes #1015
2019-05-01 16:38:01 +02:00
Zac 826d926bb9 changed pinned status count operator
changed default pinned count to 5 to preserve default behavior
2019-04-29 20:52:53 +02:00
Zac 5a3d18a660 added documentation into .env.production.sample
moved max pin count into constant
2019-04-29 20:52:53 +02:00
Zac 41d3d17fe7 add env var for max pinned toots 2019-04-29 20:52:53 +02:00
Thibaut Girka 98732502f5 When selecting a toot via keyboard, ensure it is scrolled into view
Fixes detailed status column
2019-04-29 20:28:38 +02:00
Thibaut Girka 81c9377c7d Add support for missing formatting tags 2019-04-29 19:31:09 +02:00
Thibaut Girka 02bd678944 Add keyboard shortcut to collapse/uncollapse toots 2019-04-28 20:23:04 +02:00
Thibaut Girka 7ed89e9178 Add hotkey for bookmarking a toot 2019-04-28 20:23:04 +02:00
partev f843bdbd73 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Eugen Rochko b1e10ed1b3 Fix approved column being set to nil instead of false (#10642)
Fix https://github.com/tootsuite/mastodon/pull/10621#issuecomment-487316619
2019-04-27 23:55:16 +02:00
Thibaut Girka 5a8b820767 Fix regression with textarea's caret position when selecting a suggestion 2019-04-27 21:40:42 +02:00