fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 06:46:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
9738 commits 135 branches 266 tags 982 MiB
Commit graph

6790 commits

Author SHA1 Message Date
ThibG 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
 2019-06-05 14:02:59 +02:00
ThibG 7fa23ec697 Fix potential private status leak (#10969) 2019-06-05 13:40:20 +02:00
ThibG d34a3a2cc7 Fix refreshing featured toots when the new collection is empty (#10971) 
Fixes #10945
 2019-06-05 13:39:59 +02:00
ThibG 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
 2019-06-04 23:24:31 +02:00
Eugen Rochko ed19f33440
Fix margins on profile metadata in single column mode (#10961) 2019-06-04 23:11:57 +02:00
Eugen Rochko 6a9a759f40
Change reblogs counter to be updated when boosted privately (#10964) 2019-06-04 23:11:44 +02:00
Eugen Rochko f2b743e715
Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966) 2019-06-04 23:11:18 +02:00
Thibaut Girka 02b56c7e1a Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
Eugen Rochko 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
 2019-06-04 20:10:26 +02:00
Eugen Rochko 6077eca240
Add profile directory link to single column navigation panel (#10963) 2019-06-04 19:50:38 +02:00
Jeong Arm a1e96b2d8a Add missing Korean translations (#10962) 
And change some word.
 2019-06-04 18:00:09 +02:00
Jeong Arm 8eb7c3304e [Glitch] Fix profile picture preview 
Port e13e4b28db to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-06-03 20:20:33 +02:00
ThibG 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`.
 2019-06-03 20:04:00 +02:00
Thibaut Girka 76918554a6 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- config/webpack/rules/css.js
- package.json
- yarn.lock
 2019-06-03 14:54:30 +02:00
Jeong Arm e13e4b28db Fix profile picture preview (#10931) 2019-06-02 18:04:41 +02:00
Lady Lumb 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.
 2019-06-02 14:38:13 +02:00
Thibaut Girka 5b92910664 Fix expanding status from menu modal in glitch-soc 
Fixes #1085
 2019-06-02 14:11:32 +02:00
Takeshi Umeda 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
 2019-06-02 10:05:54 +02:00
Hanage999 7c1ca0c37b Center 2-columns layout without side effect (#10915) 2019-06-01 07:59:21 +03:00
Thibaut Girka 06036081a0 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
Thibaut Girka 6c0428b7d8 Raise exception when attempting to serialize local-only statuses 2019-05-30 09:04:12 +02:00
slice 22130a0947 Fix incorrect PropType in Glitch AutosuggestInput 2019-05-30 09:04:00 +02:00
slice e04724296b Remove isRequired from Glitch ReplyIndicator status 
This can be null under normal circumstances, which isRequired doesn't
like.
 2019-05-30 09:04:00 +02:00
Eugen Rochko 8d9755e5f5
Change links in right panel to open in the same tab (#10848) 
For Rambox compatibility
 2019-05-29 17:33:35 +03:00
ThibG 3333250ede Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872) 2019-05-29 17:33:15 +03:00
Takeshi Umeda 7f203f7c49 Fix safari post field display issue in single column layout (#10883) 2019-05-29 12:03:56 +03:00
Alix Rossi 33ec9c5095 i18n: Update Corsican front-end translation (#10884) 2019-05-29 17:57:08 +09:00
mayaeh c6e1229a82 Update Japanese translations. (#10875) 
run yarn manage:translations ja && i18n-tasks add-missing ja
 2019-05-29 11:09:59 +09:00
Aditoo17 0c2ca1bd38 I18n: Update Czech translation (#10874) 2019-05-29 09:52:41 +09:00
Thibaut Girka 07d4ecfe5e Truncate long URLs while providing alt text for inline images 2019-05-28 19:33:43 +02:00
Thibaut Girka 18b77224d3 Translate incoming remote img tags by a link 2019-05-28 19:33:43 +02:00
Eugen Rochko 56d8faab18 [Glitch] Use <use /> to render transparent SVG logo instead of inserting it 
Port SCSS changes from 8d5dcc9301 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-28 17:50:21 +02:00
Thibaut Girka 3d73d76e55 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-28 17:45:06 +02:00
ThibG fe3b863926 Fix web push notifications for polls (#10864) 
Fixes #10861
 2019-05-28 00:26:08 +02:00
Eugen Rochko 451e5980b6
Refactor footers in web UI into a single component (#10846) 2019-05-27 21:58:41 +02:00
abcang 3593b85423 Display notifications count on a new single column (#10859) 2019-05-27 21:56:29 +02:00
Thibaut Girka 6d60701bfa Fix video player regressions introduced by blurhash merge 2019-05-27 19:43:15 +02:00
Thibaut Girka b4d4138cf9 [Glitch] Add keyboard shortcut to hide/show media 
Port a472190729 and 988342a56c to glitch-soc
 2019-05-27 19:43:15 +02:00
Eugen Rochko 8d5dcc9301
Use <use /> to render transparent SVG logo instead of inserting it (#10845) 2019-05-27 03:33:39 +02:00
Takeshi Umeda 3b9c02506d Fix poll visibility on public pages (#10817) 
* Fix poll visibility on public pages

* Revert "Fix poll visibility on public pages"

This reverts commit 54a9608add.

* Revert "Change poll options to alphabetic letters when status text is hidden"

This reverts commit c53d673262.
 2019-05-26 23:13:29 +02:00
Thibaut Girka 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”.
 2019-05-26 15:41:40 +02:00
りんすき fdb3952b20 [Glitch] Fix composer route opening when not needed 
Port c1e77b56a9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-26 13:50:15 +02:00
Neil Moore 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
 2019-05-26 13:48:45 +02:00
Eugen Rochko 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
 2019-05-26 13:48:16 +02:00
Hanage999 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)
 2019-05-26 12:22:33 +02:00
Eugen Rochko 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
 2019-05-26 02:55:37 +02:00
ThibG 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
 2019-05-25 23:20:51 +02:00
Mélanie Chauvel (ariasuni) 4168aeb234 Avoid cutting bottom of letters of last paragraph of statuses (#10821) 2019-05-25 23:19:39 +02:00
Eugen Rochko 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
 2019-05-25 21:27:00 +02:00
Thibaut Girka 7fb76999af Use Sec-WebSocket-Protocol instead of query string to pass WebSocket token 
Inspired by https://github.com/kubevirt/kubevirt/issues/1242
 2019-05-24 16:08:09 +02:00
Thibaut Girka 652147a3f4 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- streaming/index.js
 2019-05-24 15:23:52 +02:00
ThibG 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
 2019-05-24 15:21:42 +02:00
ThibG 72bf354e97
Merge pull request #1067 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-23 22:01:34 +02:00
Thibaut Girka d6a7d62dc6 Do not share a single Redcarpet::Markdown object across threads 
There are apparently thread-safety issues: https://github.com/vmg/redcarpet/pull/672
 2019-05-23 21:19:44 +02:00
Thibaut Girka bf988123ba Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 21:18:27 +02:00
Eugen Rochko 84dc21d55d
Various improvements to single column layout (#10809) 
- Add potential side panels to single column layout
- Hide FAB on large screens
 2019-05-23 20:01:10 +02:00
ThibG 9a5561a5b8 Fix possible race condition when processing statuses (#10815) 2019-05-23 20:00:39 +02:00
nzws a1143a19c0 [Glitch] Fix stacking order of emoji picker 
Port 8a378d4c3d to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-23 19:16:42 +02:00
Thibaut Girka 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`.
 2019-05-23 19:01:30 +02:00
ThibG 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
 2019-05-23 15:22:39 +02:00
ThibG 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.
 2019-05-23 15:00:30 +02:00
Thibaut Girka 0744d6e571 Make headers font size proportional 2019-05-23 12:41:38 +02:00
Thibaut Girka 7c609bdab9 Allow rel=tag in status text 
Fixes tag links in local Markdown or HTML-authored statuses
 2019-05-23 12:28:33 +02:00
Eugen Rochko 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
 2019-05-23 01:35:22 +02:00
nzws 8a378d4c3d Fix stacking order of emoji picker (#10801) 2019-05-22 18:00:34 +02:00
dxwc ee0e68e97a i18n: Complete frontend Bengali translation (#10800) 
* i18n: Complete frontend Bengali translation

* run yarn manage:translations
 2019-05-22 10:00:58 +09:00
Thibaut Girka 2332b3f146 Fix local text/html toots not being sanitized 2019-05-21 23:12:43 +02:00
Paul Woolcock 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
 2019-05-21 13:28:49 +02:00
Thibaut Girka 4fbce23992 Refactor contentType selection in glitch composer 2019-05-20 10:27:31 +02:00
Thibaut Girka 2cd7bfac23 Use glitch-soc's poll component instead of upstream's 2019-05-19 23:24:53 +02:00
trwnh 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
 2019-05-19 22:51:44 +02:00
Thibaut Girka 08a2af27c3 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
ThibG ae18386558 Fix “invited by” not showing up for invited accounts in admin interface (#10791) 2019-05-19 21:40:36 +02:00
Hinaloe bb9d7fad9f fix isSubmitting prop case (#10785) 2019-05-19 18:41:41 +02:00
Thibaut Girka f509815379 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Ben Lubar 2f3e4a64be add og:image:alt for media attachments in embeds (#10779) 2019-05-18 20:57:45 +02:00
Eugen Rochko 6fe474837c
Change poll options to alphabetic letters when status text is hidden (#10685) 
Fix #10569
 2019-05-18 14:41:16 +02:00
Thibaut Girka 6e227ecb04 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
ThibG a1519a8ef5 Prevent from publicly boosting one's own private toots (#10775) 2019-05-18 00:28:51 +02:00
Thibaut Girka 9ca21e93cc Minor optimization 2019-05-17 23:51:14 +02:00
Thibaut Girka 56245a2a72 Export fallback content type and use it as default in WebUI 2019-05-17 23:51:14 +02:00
Thibaut Girka dd5bf40b97 Properly escape HTML in code blocks 2019-05-17 23:51:14 +02:00
Thibaut Girka a6b7c23f6f Add option for default toot content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka 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…
 2019-05-17 23:51:14 +02:00
Thibaut Girka 9df1ef87c2 Hide content-type dropdown by default 2019-05-17 23:51:14 +02:00
Haelwenn (lanodan) Monnier c2fa36bbae 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 93d98f62a8 Support proper content-type in Delete & Redraft 2019-05-17 23:51:14 +02:00
KokaKiwi f34a402a94 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 14d7ddcb1c Add API support for setting status content-type 2019-05-17 23:51:14 +02:00
Thibaut Girka b3e68de4d2 Serialize content-type on Delete & Redraft 2019-05-17 23:51:14 +02:00
Thibaut Girka d7520f8175 Add support for HTML-formatted toots 2019-05-17 23:51:14 +02:00
Thibaut Girka 94aef563b9 Add support for markdown-formatted toots 2019-05-17 23:51:14 +02:00
Thibaut Girka bfc509f44a Add database row to hold status content type 2019-05-17 23:51:14 +02:00
ThibG c1cf8c1636
Merge pull request #1049 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-15 18:44:21 +02:00
Thibaut Girka 6badf2d252 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-15 17:11:40 +02:00
ThibG c1c8c7b2c8 Minor performance improvements and cleanup in formatter (#10765) 2019-05-15 06:54:06 +02:00
Neil Moore 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.
 2019-05-15 06:53:23 +02:00
ThibG 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 a015c65d2d.

* 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 4bab7d7640 Fix rich text style in reply indicator 2019-05-13 17:13:02 +02:00
Thibaut Girka 87d16698c2 Fix rich text styling on public pages 2019-05-13 17:13:02 +02:00
Thibaut Girka cd534830ad Fix text color of some formatted elements in notifications 2019-05-12 19:23:32 +02:00
nzws 3e15a845c1 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 dd118449c2 Fix incorrect reference to raw_content (it is raw_text instead) (#10753) 2019-05-11 23:56:07 +02:00
ThibG 93085c273c [Glitch] Use raw content if available on Delete & Redraft 
Port front-end changes from 6d44f2441b to glitch-soc
 2019-05-11 21:46:23 +02:00
Thibaut Girka 2b97d9d780 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-11 18:23:46 +02:00
Thibaut Girka 3ea5c045d7 Use a checkbox for the “Mark media as sensitive” composer button 
Fixes #1039
 2019-05-11 12:35:38 +02:00
ThibG fe00f7a7e4
Merge pull request #1043 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2019-05-11 12:35:25 +02:00
ThibG 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
 2019-05-11 06:46:43 +02:00
nzws be851321c0 Use local time in audit log (#10751) 2019-05-11 06:46:01 +02:00
Maciek Baron 14d855c429 [Glitch] Improve poll link accessibility 
Port 0402c52f28 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 19:05:57 +02:00
nzws 78ff7e3821 [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 96f0747afe [Glitch] Add confirm modal for unboosting toots 
Port fe8a8f779e to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-10 18:56:01 +02:00
Alix Rossi 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
 2019-05-10 18:09:46 +02:00
Alix Rossi d25e358f9f 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 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
 2019-05-10 17:59:57 +02:00
Thibaut Girka 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
 2019-05-10 17:09:12 +02:00
Thibaut Girka d4d4e84324 Fix media description confirmation modal 
Fixes #1040
 2019-05-10 11:49:00 +02:00
Aurélien Reeves fe8a8f779e 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 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
 2019-05-09 22:10:27 +02:00
ThibG 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
 2019-05-09 22:05:43 +02:00
ThibG 26fc21c188 Add some caching for HTML versions of statuses pages (#10701) 2019-05-09 22:03:44 +02:00
Maciek Baron 0402c52f28 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 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
 2019-05-09 22:03:02 +02:00
Jeong Arm 09eea46631 Bring back crossed eye icon on gallery (#10715) 2019-05-08 18:01:33 +02:00
Thibaut Girka 3191c3b349 Fix tabs bar on mobile 
Fixes #1037
 2019-05-08 00:32:53 +02:00
nzws 5c82d660d1 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 2c767f44bf 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 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
 2019-05-07 00:55:37 +09:00
ThibG b2f5b1045f Add description on hover in media gallery (#10713) 2019-05-06 05:33:56 +02:00
Thibaut Girka 89d2859296 Fix content warning button displaying a link icon when no status card is set 2019-05-05 21:47:05 +02:00
mayaeh 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.
 2019-05-06 04:34:32 +09:00
jeroenpraat 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
 2019-05-06 04:33:24 +09:00
Kirishima21 8383222026 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 eef8802325 [Glitch] Make sure the instance banner is never cropped 
Port 21209c2b52 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-05 12:29:06 +02:00
Thibaut Girka 832cf92c74 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-05 12:28:10 +02:00
Aditoo17 b7741ed732 I18n: Update Czech translation 🇨🇿 (#10704) 
* I18n: Update Czech translation

* Tiny fix
 2019-05-05 15:33:33 +09:00
Baptiste Gelez 21209c2b52 Make sure the instance banner is never cropped (#10702) 2019-05-05 01:07:15 +02:00
Thibaut Girka f2cf8144b4 Minor style fixes 2019-05-04 23:05:43 +02:00
Eugen Rochko 9b1ef58c95 [Glitch] Change font weight of sensitive button to 500 
Port 63b1388fef to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Eugen Rochko f59973cc85 [Glitch] Make the "mark media as sensitive" button more obvious in web UI 
Port 05ef3462ba to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 20:41:21 +02:00
Thibaut Girka b1ab4d5ebe Add visibility icon back in media gallery 2019-05-04 20:06:17 +02:00
Thibaut Girka cbda1b8b66 Add back description on hover 2019-05-04 20:03:37 +02:00
ThibG 8e221cd22b [Glitch] Fix transition: all 
Port 7aa749ab46 to glitch-soc
 2019-05-04 19:53:09 +02:00
ThibG b7f69beebe [Glitch] Make the cursor icon consistant across media types in account media gallery 2019-05-04 19:16:51 +02:00
Thibaut Girka 52a4284fe5 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-04 19:15:50 +02:00
Eugen Rochko bc97fd641f [Glitch] Add button to view context to media modal 
Port eb63217210 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 19:10:24 +02:00
Eugen Rochko 209c080280 [Glitch] Fix alignment of items in the account gallery in web UI and load more per page 
Port 967e419f8f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:59:11 +02:00
Eugen Rochko a5da59f140 [Glitch] Change account gallery in web UI 
Port 3f143606fa to glitch-soc

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
 2019-05-04 18:07:44 +02:00
ThibG 7aa749ab46 Fix transition: all (#10699) 2019-05-04 17:39:53 +02:00
ThibG 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
 2019-05-04 17:36:43 +02:00
ThibG 1149ddd3da Fix glitch SCSS for links in error messages in admin interface 
Port SCSS changes from 011b032300
 2019-05-04 16:43:08 +02:00
Thibaut Girka 33c80e0783 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/models/media_attachment.rb
 2019-05-04 16:37:26 +02:00
ThibG 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
 2019-05-03 23:45:37 +02:00
Eugen Rochko 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
 2019-05-03 23:44:44 +02:00
Thibaut Girka 9f25ab9792 Fix polls icon not showing in CW button in detailed statuses 2019-05-03 21:55:50 +02:00
Eugen Rochko 63b1388fef
Change font weight of sensitive button to 500 (#10682) 2019-05-03 20:44:20 +02:00
ThibG 91634947f8 Explicitly disable storage of REST API results (#10655) 
Fixes #10652
 2019-05-03 20:39:19 +02:00
ThibG 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
 2019-05-03 20:36:36 +02:00
Thibaut Girka 7617f78359 Fix crash in onboarding modal 
Fixes #1027
 2019-05-03 19:24:54 +02:00
Eugen Rochko 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
 2019-05-03 16:16:30 +02:00
ThibG 5121d9c12f When selecting a toot via keyboard, ensure it is scrolled into view (#10593) 2019-05-03 06:20:35 +02:00
Eugen Rochko 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"
 2019-05-03 04:34:55 +02:00
Eugen Rochko 967e419f8f
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 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
 2019-05-02 08:34:32 +02:00
ThibG 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
 2019-05-02 04:30:12 +02:00
Thibaut Girka fcbf557bd2 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 cc5a81b7d8 Make hi-color privacy icons opt-in instead of opt-out 2019-05-01 20:23:25 +02:00
Thibaut Girka ac54292d69 Add high color privacy icons 
Fixes #1015
 2019-05-01 16:38:01 +02:00
Zac be6ef1947e changed pinned status count operator 
changed default pinned count to 5 to preserve default behavior
 2019-04-29 20:52:53 +02:00
Zac 5616200ed4 added documentation into .env.production.sample 
moved max pin count into constant
 2019-04-29 20:52:53 +02:00
Zac a36affb9d6 add env var for max pinned toots 2019-04-29 20:52:53 +02:00
Thibaut Girka d4c95e6a8a 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 3e095cab83 Add support for missing formatting tags 2019-04-29 19:31:09 +02:00
Thibaut Girka 67fb9a8679 Add keyboard shortcut to collapse/uncollapse toots 2019-04-28 20:23:04 +02:00
Thibaut Girka f3acf8f414 Add hotkey for bookmarking a toot 2019-04-28 20:23:04 +02:00
partev 5e79dd3f17 Update hy.json (#10644) 2019-04-28 12:51:20 +09:00
Eugen Rochko e18786dec7
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 cd9a284702 Fix regression with textarea's caret position when selecting a suggestion 2019-04-27 21:40:42 +02:00
Eugen Rochko 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
 2019-04-27 03:24:09 +02:00
Thibaut Girka aa1832ac4d Hide suggestions by default 
They will be enabled if the input has focus
 2019-04-26 22:38:03 +02:00
Thibaut Girka fddd8251dd Attempt to fix CSS 2019-04-26 22:38:03 +02:00
Thibaut Girka d7e4be285a Add emoji suggestion to poll options 2019-04-26 22:38:03 +02:00
Thibaut Girka df52004fe6 Add suggestions in CW field 2019-04-26 22:38:03 +02:00
Thibaut Girka 3a671470ec Refactor selectComposeSuggestion so that different paths can be updated 2019-04-26 22:38:03 +02:00
Eugen Rochko e451ba0e83
Fix LDAP/PAM/SAML/CAS users not being approved instantly (#10621) 2019-04-25 02:49:25 +02:00
Eugen Rochko f27d709351
Fix not being able to save e-mail preference for new pending accounts (#10622) 2019-04-25 02:49:06 +02:00
ThibG 852ccea676 Fix upload progressbar when image resizing is involved (#10632) 2019-04-25 02:48:54 +02:00
ThibG b1a0322a06 Reject follow requests of blocked users (#10633) 2019-04-25 02:47:33 +02:00
Thibaut Girka 1c0402c103 Do not ask to register web intent handler 2019-04-24 23:05:11 +02:00
Thibaut Girka b13c90f3e3 Fix color of muted statuses content not wrapped in a p tag 2019-04-24 22:40:17 +02:00
Thibaut Girka e4b65e6349 Redesign blockquote styling 2019-04-24 22:40:17 +02:00
Thibaut Girka 8753e5317f Better distinguish titles from text 2019-04-24 22:40:17 +02:00
Thibaut Girka 3631c3314a Remove extra margin in paragraphs inside blockquotes 2019-04-24 22:40:17 +02:00
Thibaut Girka 9b86707b1e Make bold text bolder 2019-04-24 22:40:17 +02:00
Thibaut Girka 5a8495dabe Remove margins around p tags in lists 2019-04-24 22:40:17 +02:00
Thibaut Girka ef249a2718 Rename status__text to status__content__text for consistency with upstream 2019-04-24 22:40:17 +02:00
Thibaut Girka adbb174c9c Fix status header display in toot mobile menu 2019-04-24 20:21:19 +02:00
Thibaut Girka ef1504d625 Fix upload progressbar when image resizing is involved 2019-04-24 20:19:23 +02:00