Commit Graph

6835 Commits (67d1b0c9973fb54a3ad10bc7af499c011391821e)

Author SHA1 Message Date
唐宗勛 cca89f3e06 update zh-CN translations (#11046) 2019-06-11 13:08:40 +09:00
Eugen Rochko cbaff2bf53 Fix list not being automatically unpinned when it returns 404 in web UI (#11045) 2019-06-11 02:26:37 +02:00
Eugen Rochko f03dd5728a Add German translations (#11043) 2019-06-10 21:36:20 +02:00
Thibaut Girka 403ab873d4 Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 20:09:05 +02:00
ThibG 17ee16cbfe Fix clicking on the left side of a conversation not marking it as read (#11041) 2019-06-10 19:27:10 +02:00
ふるふる cf7950977a Fix can't save preference other (#11042) 2019-06-10 19:26:43 +02:00
Eugen Rochko d0f90c3e9d [Glitch] Fix RTL layout not being RTL within the columns area
Port b44ae7d284 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-10 18:59:59 +02:00
Eugen Rochko abb2700350 [Glitch] Change preferences page into appearance, notifications, and other
Port SCSS changes from 8bf8d6d9d9 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-10 18:59:59 +02:00
Thibaut Girka 5a158899bc Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb
2019-06-10 18:59:53 +02:00
Thibaut Girka 765b25f1cf Minor cleanup 2019-06-10 16:24:09 +02:00
Thibaut Girka 2fe493ba25 Fix unboost confirmation dialog not showing up on detailed statuses 2019-06-10 16:24:09 +02:00
Thibaut Girka 6819b3333e Add option to display a warning before boosting toots lacking media descriptions 2019-06-10 16:24:09 +02:00
Thibaut Girka 7dd32100c3 Add DM conversations mode similar to upstream 2019-06-10 16:23:42 +02:00
Eugen Rochko 75ef673216 Fix login sometimes redirecting to paths that are not pages (#11019)
Fix #11016
2019-06-10 12:28:13 +02:00
mayaeh 42a53e57d7 Fix emoji-button appearing above privacy-dropdown (#11027) 2019-06-10 12:27:17 +02:00
manuelviens efe4ef1b20 Update fr.json (#11024) 2019-06-10 13:07:11 +09:00
Alix Rossi 6d44010dd4 i18n: Update Corsican front-end translation (#11010) 2019-06-09 23:23:30 +09:00
Eugen Rochko 035755bf96 Run yarn manage:translations (#11008) 2019-06-09 15:52:42 +02:00
Eugen Rochko aed4fa02f1 Change priority of delete activity forwards for replies and reblogs (#11002)
Fix #11001
2019-06-09 12:47:33 +02:00
Eugen Rochko f698e28803 Fix position of search icon (#11003) 2019-06-09 01:59:42 +02:00
spla df11f10efd i18n: Update Catalan translations (#10998)
* 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

* i18n: Update Catalan translations

* i18n: Update Catalan translations
2019-06-09 08:32:22 +09:00
Eugen Rochko 0984e09538 Fix more issues in the light theme (#10996)
* Fix tabs bar in light theme

* Fix borders on small screens in light theme
2019-06-08 22:32:59 +02:00
Aditoo17 2d601a278c I18n: Update Czech translation 🇨🇿 (#10995)
* I18n: Update Czech translation

* Fix

* Re-fix

* And also this

* The real fix now (hopefully)
2019-06-08 17:58:40 +02:00
ThibG 21acf681d2 Put poll options behind content warnings (#10983)
* Put poll options behind CWs in WebUI

* Put polls behind CWs on public pages

* Add poll icon to public pages CWs

* Revert to not showing an icon in the CW button
2019-06-08 17:40:59 +02:00
Eugen Rochko 73e610790e Change full logo to use primary text color of the given theme (#10994)
* Change full logo to use primary text color of the given theme

* Fix colors of public layout header in light theme
2019-06-08 15:30:06 +02:00
Eugen Rochko c7feecc715 Improve light theme (#10992) 2019-06-08 10:23:41 +02:00
Eugen Rochko b44ae7d284 Fix RTL layout not being RTL within the columns area (#10990) 2019-06-07 23:35:26 +02:00
Eugen Rochko f8e1c0da75 [Glitch] Fix not being able to directly switch between list timelines in web UI
Port a36e4db82f to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07 17:39:46 +02:00
ThibG c15ff07c69 [Glitch] Fix “mark as sensitive” not being used in delete & redraft
Port 024ec0759c to glitch-soc
2019-06-07 17:39:46 +02:00
Jeong Arm a473a7912b [Glitch] Scroll to compose form when focus
Port 91ae2d1275 to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-07 17:39:46 +02:00
Eugen Rochko 5c1a46bdcf Fix some React warnings (#10989) 2019-06-07 17:15:18 +02:00
Thibaut Girka 2c240378b2 [Glitch] Fix refreshing featured toots when the new collection is empty
Port 1fee4b0fe2 to glitch-soc
2019-06-07 17:05:32 +02:00
Thibaut Girka 00552d2f79 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/statuses_controller.rb
- app/controllers/stream_entries_controller.rb
2019-06-07 17:00:36 +02:00
Eugen Rochko b788e58ea4 Change /settings/preferences to redirect to appearance, add /settings/preferences/other (#10988) 2019-06-07 16:51:08 +02:00
Thibaut Girka 390f22ab44 Fix display of alt-text when a media attachment is not available 2019-06-07 16:39:07 +02:00
ThibG 2b35ddc80a Fix display of alt-text when a media attachment is not available (#10981) 2019-06-07 12:41:08 +02:00
Eugen Rochko 8bf8d6d9d9 Change preferences page into appearance, notifications, and other (#10977) 2019-06-07 03:39:24 +02:00
Eugen Rochko 87f5646ec3 Add waiting time to list of pending accounts in admin UI (#10985) 2019-06-07 03:24:10 +02:00
Yamagishi Kazutoshi e20f7876e8 Fix sass-lint config (#10982) 2019-06-06 18:51:46 +02:00
Wenceslao Páez Chávez 796b8e8d34 Fix overlap of emoji button on search popup (#10978) 2019-06-06 13:40:17 +02:00
Thibaut Girka 2b54b78962 Fix CW field automatically getting the focus when it is always enabled 2019-06-06 13:26:42 +02:00
Eugen Rochko a36e4db82f Fix not being able to directly switch between list timelines in web UI (#10973) 2019-06-06 13:04:49 +02:00
ThibG 024ec0759c Fix “mark as sensitive” not being used in delete & redraft (#10980) 2019-06-06 13:04:34 +02:00
Takeshi Umeda 88a04bf6c4 Fix emoji picker being always displayed (#10979)
* Fix emoji picker being always displayed

* Remove duplicate content with other pull-requests
2019-06-06 12:30:14 +02:00
Jeong Arm 91ae2d1275 Scroll to compose form when focus (#10970)
* Scroll to compose form when focus

* Get rid of constructor
2019-06-05 15:29:45 +02:00
ThibG 806c2f8102 Cleanup various controllers (#10972)
* Remove skip_session! as it is not supported in Rails 5

* Minor cleanup in StreamEntriesController

* Remove redundant mark_cacheable! calls
2019-06-05 14:02:59 +02:00
ThibG e80cb67ed7 Fix potential private status leak (#10969) 2019-06-05 13:40:20 +02:00
ThibG 1fee4b0fe2 Fix refreshing featured toots when the new collection is empty (#10971)
Fixes #10945
2019-06-05 13:39:59 +02:00
ThibG be6e54a70c Do not misattribute inlined boosts if `attributedTo` isn't present (#10967)
* Do not misattribute inlined boosts if `attributedTo` isn't present

Fixes #10950

* Fix tests
2019-06-04 23:24:31 +02:00
Eugen Rochko b01b8521ec Fix margins on profile metadata in single column mode (#10961) 2019-06-04 23:11:57 +02:00
Eugen Rochko a7952c3a54 Change reblogs counter to be updated when boosted privately (#10964) 2019-06-04 23:11:44 +02:00
Eugen Rochko 57098a1b8d Refactor all ActivityPub deliveries to be serialized and signed through one concern (#10966) 2019-06-04 23:11:18 +02:00
Thibaut Girka a76c660645 Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 2019-06-04 20:40:19 +02:00
Eugen Rochko f3a02e70a8 Fix poll API not requiring authentication on non-public polls (#10960)
* Fix poll API not requiring authentication on non-public polls

That API does not reveal the content of the status, i.e. the question
itself, nor who the author is, nor which status it belongs to, but it
does reveal the poll options and how many answers they got

Fix #10959

* Add test
2019-06-04 20:10:26 +02:00
Eugen Rochko 4331f4948e Add profile directory link to single column navigation panel (#10963) 2019-06-04 19:50:38 +02:00
Jeong Arm ca61d7577a Add missing Korean translations (#10962)
And change some word.
2019-06-04 18:00:09 +02:00
Jeong Arm 3d34bc17e2 [Glitch] Fix profile picture preview
Port 77375ad7df to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-06-03 20:20:33 +02:00
ThibG c45a330824 Handle blank poll options more gracefully (#10946)
Pleroma currently allows (erroneously imho) empty poll options, that is,
options with an empty (but existing) `name`.
2019-06-03 20:04:00 +02:00
Thibaut Girka a4e0071538 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 77375ad7df Fix profile picture preview (#10931) 2019-06-02 18:04:41 +02:00
Lady Lumb d691b1f7d3 Added env variables for max image and video size.
I changed the IMAGE_LIMIT and VIDEO_LIMIT variables to read from the env, or use default if not set in the env, to make it easier to change this on an instance by instance basis and make it persistent across updates.
2019-06-02 14:38:13 +02:00
Thibaut Girka 1501b142d2 Fix expanding status from menu modal in glitch-soc
Fixes #1085
2019-06-02 14:11:32 +02:00
Takeshi Umeda 96ac52dabd Improvement variable height in single column layout (#10917)
* Improvement variable height of compose and navigation panel in single column layout

* Fix wrong quotes and missing commas
2019-06-02 10:05:54 +02:00
Hanage999 702dbf1622 Center 2-columns layout without side effect (#10915) 2019-06-01 07:59:21 +03:00
Thibaut Girka 206d0ea6a2 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-30 13:31:01 +02:00
Thibaut Girka 6e1ad5a03f Raise exception when attempting to serialize local-only statuses 2019-05-30 09:04:12 +02:00
slice fb0489022c Fix incorrect PropType in Glitch AutosuggestInput 2019-05-30 09:04:00 +02:00
slice c12383e06c 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 233a60f6a2 Change links in right panel to open in the same tab (#10848)
For Rambox compatibility
2019-05-29 17:33:35 +03:00
ThibG 0162dc0c9c Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872) 2019-05-29 17:33:15 +03:00
Takeshi Umeda 9c174f4d02 Fix safari post field display issue in single column layout (#10883) 2019-05-29 12:03:56 +03:00
Alix Rossi 6f624f449e i18n: Update Corsican front-end translation (#10884) 2019-05-29 17:57:08 +09:00
mayaeh 7403b0ec05 Update Japanese translations. (#10875)
run yarn manage:translations ja && i18n-tasks add-missing ja
2019-05-29 11:09:59 +09:00
Aditoo17 d0dc7a60ab I18n: Update Czech translation (#10874) 2019-05-29 09:52:41 +09:00
Thibaut Girka 7fb3fa16dd Truncate long URLs while providing alt text for inline images 2019-05-28 19:33:43 +02:00
Thibaut Girka d417a32290 Translate incoming remote img tags by a link 2019-05-28 19:33:43 +02:00
Eugen Rochko 40117d908f [Glitch] Use `<use />` to render transparent SVG logo instead of inserting it
Port SCSS changes from c5234ac2aa to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-28 17:50:21 +02:00
Thibaut Girka b9c5aed987 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-28 17:45:06 +02:00
ThibG 31b8203887 Fix web push notifications for polls (#10864)
Fixes #10861
2019-05-28 00:26:08 +02:00
Eugen Rochko 7d2b4e9277 Refactor footers in web UI into a single component (#10846) 2019-05-27 21:58:41 +02:00
abcang 4c9d8f8ef9 Display notifications count on a new single column (#10859) 2019-05-27 21:56:29 +02:00
Thibaut Girka 938edb44a1 Fix video player regressions introduced by blurhash merge 2019-05-27 19:43:15 +02:00
Thibaut Girka c1619a5c24 [Glitch] Add keyboard shortcut to hide/show media
Port 7ee189fa60 and 9e238804ea to glitch-soc
2019-05-27 19:43:15 +02:00
Eugen Rochko c5234ac2aa Use `<use />` to render transparent SVG logo instead of inserting it (#10845) 2019-05-27 03:33:39 +02:00
Takeshi Umeda 03054b27e1 Fix poll visibility on public pages (#10817)
* Fix poll visibility on public pages

* Revert "Fix poll visibility on public pages"

This reverts commit 54a9608add6f855bc6337fe3c65eaee7ba13db49.

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

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

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-26 13:50:15 +02:00
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
2019-05-26 13:48:45 +02:00
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
2019-05-26 13:48:16 +02:00
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)
2019-05-26 12:22:33 +02:00
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
2019-05-26 02:55:37 +02:00
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
2019-05-25 23:20:51 +02:00
Mélanie Chauvel (ariasuni) 276c9e6e9e Avoid cutting bottom of letters of last paragraph of statuses (#10821) 2019-05-25 23:19:39 +02:00
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
2019-05-25 21:27:00 +02:00
Thibaut Girka 57911e10c5 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 e8b45064b8 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- streaming/index.js
2019-05-24 15:23:52 +02:00
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
2019-05-24 15:21:42 +02:00
ThibG 4e953ee471 Merge pull request #1067 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
2019-05-23 22:01:34 +02:00
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
2019-05-23 21:19:44 +02:00
Thibaut Girka 630aafa3a7 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-23 21:18:27 +02:00
Eugen Rochko 106cfa7553 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 028fb2060b Fix possible race condition when processing statuses (#10815) 2019-05-23 20:00:39 +02:00
nzws 3d860417a5 [Glitch] Fix stacking order of emoji picker
Port 1fbe5c2fec to glitch-soc

Signed-off-by: Thibaut Girka <thib@sitedethib.com>
2019-05-23 19:16:42 +02:00
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`.
2019-05-23 19:01:30 +02:00
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
2019-05-23 15:22:39 +02:00
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.
2019-05-23 15:00:30 +02:00
Thibaut Girka 9a101b91ae Make headers font size proportional 2019-05-23 12:41:38 +02:00
Thibaut Girka 3117d0ac70 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 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
2019-05-23 01:35:22 +02:00
nzws 1fbe5c2fec Fix stacking order of emoji picker (#10801) 2019-05-22 18:00:34 +02:00
dxwc 0a1ba7c14b 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 a93c6f708b Fix local text/html toots not being sanitized 2019-05-21 23:12:43 +02:00
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
2019-05-21 13:28:49 +02:00
Thibaut Girka a0b7246388 Refactor contentType selection in glitch composer 2019-05-20 10:27:31 +02:00
Thibaut Girka 0bc9d4f6d3 Use glitch-soc's poll component instead of upstream's 2019-05-19 23:24:53 +02:00
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
2019-05-19 22:51:44 +02:00
Thibaut Girka e21662d370 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 21:53:44 +02:00
ThibG 4ad004d2ef Fix “invited by” not showing up for invited accounts in admin interface (#10791) 2019-05-19 21:40:36 +02:00
Hinaloe 4de9bd3870 fix `isSubmitting` prop case (#10785) 2019-05-19 18:41:41 +02:00
Thibaut Girka fd5da4033e Merge branch 'master' into glitch-soc/merge-upstream 2019-05-19 17:46:31 +02:00
Ben Lubar 8ec309ee64 add og:image:alt for media attachments in embeds (#10779) 2019-05-18 20:57:45 +02:00
Eugen Rochko 3a4761c665 Change poll options to alphabetic letters when status text is hidden (#10685)
Fix #10569
2019-05-18 14:41:16 +02:00
Thibaut Girka 08a793cbd9 Merge branch 'master' into glitch-soc/merge-upstream 2019-05-18 10:04:32 +02:00
ThibG 1fec2ff78f Prevent from publicly boosting one's own private toots (#10775) 2019-05-18 00:28:51 +02:00
Thibaut Girka d48d1ed534 Minor optimization 2019-05-17 23:51:14 +02:00
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