tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,819 Commits 10 Branches 0 Tags
5ccd011cc3bafc00a557dabbb47da004f3d4a381
Commit Graph
6846 Commits
Author SHA1 Message Date
Wenceslao Páez ChávezandEugen Rochko fe3bf3b0fc Fix overlap of emoji button on search popup (#10978) 2019-06-06 13:40:17 +02:00
Thibaut Girka a7f6e72b30 Fix CW field automatically getting the focus when it is always enabled 2019-06-06 13:26:42 +02:00
Eugen RochkoandGitHub 5bfd802c57 Fix not being able to directly switch between list timelines in web UI (#10973) 2019-06-06 13:04:49 +02:00
ThibGandEugen Rochko 2657765d2a Fix “mark as sensitive” not being used in delete & redraft (#10980) 2019-06-06 13:04:34 +02:00
Takeshi UmedaandEugen Rochko c402c291f4 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 ArmandEugen Rochko 8f3c32e29c 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
ThibGandEugen Rochko 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
ThibGandEugen Rochko 7fa23ec697 Fix potential private status leak (#10969) 2019-06-05 13:40:20 +02:00
ThibGandEugen Rochko d34a3a2cc7 Fix refreshing featured toots when the new collection is empty (#10971) 
Fixes #10945
 2019-06-05 13:39:59 +02:00
ThibGandEugen Rochko 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 RochkoandGitHub ed19f33440 Fix margins on profile metadata in single column mode (#10961) 2019-06-04 23:11:57 +02:00
Eugen RochkoandGitHub 6a9a759f40 Change reblogs counter to be updated when boosted privately (#10964) 2019-06-04 23:11:44 +02:00
Eugen RochkoandGitHub 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 RochkoandGitHub 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 RochkoandGitHub 6077eca240 Add profile directory link to single column navigation panel (#10963) 2019-06-04 19:50:38 +02:00
Jeong ArmandEugen Rochko a1e96b2d8a Add missing Korean translations (#10962) 
And change some word.
 2019-06-04 18:00:09 +02:00
Jeong ArmandThibaut Girka 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
ThibGandEugen Rochko 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 ArmandEugen Rochko e13e4b28db Fix profile picture preview (#10931) 2019-06-02 18:04:41 +02:00
Lady LumbandThibG 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 UmedaandEugen Rochko 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
Hanage999andEugen Rochko 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
sliceandThibG 22130a0947 Fix incorrect PropType in Glitch AutosuggestInput 2019-05-30 09:04:00 +02:00
sliceandThibG 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 RochkoandGitHub 8d9755e5f5 Change links in right panel to open in the same tab (#10848) 
For Rambox compatibility
 2019-05-29 17:33:35 +03:00
ThibGandEugen Rochko 3333250ede Fix React warning about legacy lifecycle calls and sensitive status resetting (#10872) 2019-05-29 17:33:15 +03:00
Takeshi UmedaandEugen Rochko 7f203f7c49 Fix safari post field display issue in single column layout (#10883) 2019-05-29 12:03:56 +03:00
Alix RossiandYamagishi Kazutoshi 33ec9c5095 i18n: Update Corsican front-end translation (#10884) 2019-05-29 17:57:08 +09:00
mayaehandYamagishi Kazutoshi c6e1229a82 Update Japanese translations. (#10875) 
run yarn manage:translations ja && i18n-tasks add-missing ja
 2019-05-29 11:09:59 +09:00
Aditoo17andYamagishi Kazutoshi 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 RochkoandThibaut Girka 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
ThibGandEugen Rochko fe3b863926 Fix web push notifications for polls (#10864) 
Fixes #10861
 2019-05-28 00:26:08 +02:00
Eugen RochkoandGitHub 451e5980b6 Refactor footers in web UI into a single component (#10846) 2019-05-27 21:58:41 +02:00
abcangandEugen Rochko 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 RochkoandGitHub 8d5dcc9301 Use <use /> to render transparent SVG logo instead of inserting it (#10845) 2019-05-27 03:33:39 +02:00
Takeshi UmedaandEugen Rochko 3b9c02506d 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 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
りんすきandThibG 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 MooreandEugen Rochko 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 RochkoandGitHub 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