mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-01-10 04:06:27 +01:00
Code Issues Projects Releases Wiki Activity
8,048 Commits 127 Branches 269 Tags 1 GiB
Commit Graph

5664 Commits

Author SHA1 Message Date
Thibaut Girka
c789181626 [Glitch] Add hotkey for follow requests 
Port 25f6f41052b52a765a74e9e16d7411750ae46221 to glitch-soc
 2018-08-20 21:25:02 +02:00
Thibaut Girka
b230c04e00 Make the privacy dropdown button not look strange when using top placement 
Inspired by 8fe1f8d4cecb9f2f749c1e1e77b2439dd640ddc5
 2018-08-20 20:10:53 +02:00
Thibaut Girka
24f39c0841 [Glitch] Skip pagination logic entirely for pinned toots 2018-08-20 20:09:19 +02:00
Thibaut Girka
0c091475df Make non-link ColumnLinks behave as links 2018-08-20 20:08:13 +02:00
ThibG
b34d6238cb Add API endpoint to list featured accounts (fixes #8315) (#8317) 2018-08-20 18:46:04 +02:00
ThibG
5fbf12bbb8 Skip pagination logic entirely for pinned toots (fixes #8302) (#8310) 2018-08-20 13:32:43 +02:00
Eugen Rochko
6226aa83d7
Increase reach of Delete->Actor activities (#8305) 
Fix #7316
 2018-08-20 13:28:05 +02:00
Annika Backstrom
25f6f41052 Add hotkey for follow requests (#8307) 2018-08-20 03:44:16 +02:00
Thibaut Girka
f4d28ccfa3 Don't filter own toots 2018-08-19 21:36:46 +02:00
ThibG
28163528e5 Don't filter own toots (fixes #8289) (#8298) 2018-08-19 18:44:18 +02:00
cpsdqs
8fe1f8d4ce Make dropdown animations respect their placement (#8292) 
* Make dropdown animations respect their placement

Also fix the corner radius on the privacy dropdown button when using top placement

* Fix code style issue
 2018-08-19 17:11:12 +02:00
Thibaut Girka
432f6b88b0 Focus CW field when enabling it, focus compose textarea when disabling it 
Port a99179d31ff0013987f362ffe15cb3450b29ed08 and 09147186b79f80cf3ef3aa8ba7e6e5e032faa255
to glitch-soc
 2018-08-19 16:56:31 +02:00
abcang
9e75aa30cd Unuse ActiveRecord::Base#cache_key (#8185) 
* Unuse ActiveRecord::Base#cache_key

* Enable cache_versioning

* Call cache_collection
 2018-08-19 15:52:38 +02:00
mayaeh
0d1d9b9a33 Fix report text color. (#8288) 2018-08-19 15:51:57 +02:00
Eugen Rochko
91c929a42c
Keep scheduler jobs unique until they're done (#8287) 2018-08-19 15:48:29 +02:00
Thibaut Girka
88a0395a58 Merge branch 'master' into glitch-soc/merge-upstream 2018-08-19 09:27:18 +02:00
Eugen Rochko
59c68c1a74
Reduce user active duration from 7 days to 2 days (#8282) 
To minimize fanout work and redis home feed storage space when
there are lots of recent sign-ups
 2018-08-19 03:50:34 +02:00
Eugen Rochko
19b07ba260
Make unfollow button light up red when hovered (#8286) 
Fix #8284
 2018-08-19 03:28:43 +02:00
Eugen Rochko
025fbb8285
Show compose form on delete & redraft when in mobile layout (#8277) 
Fix #8274
 2018-08-19 03:17:01 +02:00
Eugen Rochko
0fc0980de1
Link to mobile apps page (#8278) 
Fix #8269
 2018-08-19 01:17:44 +02:00
Eugen Rochko
9dd5639f90
Add admin function to deactivate all invites (#8279) 
Fix #8261
 2018-08-19 00:58:53 +02:00
ThibG
abc5548cca Do not process outgoing mentions to suspended accounts (#8272) 2018-08-18 19:42:13 +02:00
Spanky
7a0f781aa9 Fix ctrl+enter not submitting toot when text cursor is composing image description (#8273) 2018-08-18 19:40:35 +02:00
Thibaut Girka
bfeac6747a Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	.circleci/config.yml
	app/controllers/authorize_follows_controller.rb
	app/javascript/packs/public.js

Moved new stuff from packs/public.js to core/public.js.
Added appropriate use_pack in new controllers.
 2018-08-18 18:04:49 +02:00
Thibaut Girka
7423c0c130 Various minor upload description fixes 2018-08-18 17:53:20 +02:00
Thibaut Girka
534439e73b Add focal points support in the composer 2018-08-18 17:53:20 +02:00
Thibaut Girka
9782ac017b Refactor in preparation for focal points modal 2018-08-18 17:53:20 +02:00
M Somerville
298ee84488 Fix #8264 - Do not override ctrl/cmd+click. (#8265) 
This includes clicks on hashtags, mentions, display names and media in the
timeline; and usernames in reply-indicator, detailed status, and the boost
modal.
 2018-08-18 12:50:32 +02:00
Eugen Rochko
85bb32c410
Add "sign in to participate" message to public toot page (#8200) 2018-08-18 12:48:27 +02:00
Eugen Rochko
d010816ba8
Fix error when trying to update counters for statuses that are gone (#8251) 2018-08-18 03:03:23 +02:00
Eugen Rochko
78fa926ed5
Add remote interaction dialog for toots (#8202) 
* Add remote interaction dialog for toots

* Change AuthorizeFollow into AuthorizeInteraction, support statuses

* Update brakeman.ignore

* Adjust how interaction buttons are display on public pages

* Fix tests
 2018-08-18 03:03:12 +02:00
Thibaut Girka
69d4fa3bc5 Fix rails-ujs not being run on some settings pages (fixes #645) 2018-08-17 19:51:05 +02:00
Dachi Natsvlishvili
bf1bde5d6a Add Georgian language translation (#8250) 
* Add Georgian language translation

* i18n-tasks normalize
 2018-08-18 01:00:01 +09:00
Thibaut Girka
280d7b1df8 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
	app/models/status.rb
	db/migrate/20180528141303_fix_accounts_unique_index.rb
	db/schema.rb

Resolved by taking upstream changes (no real conflicts, just glitch-soc
specific code too close to actual changes).
 2018-08-17 17:43:54 +02:00
ThibG
59f7f4c923 Implement Undo { Accept { Follow } } (fixes #8234) (#8245) 
* Add Follow#revoke_request!

* Implement Undo { Accept { Follow } } (fixes #8234)
 2018-08-17 16:24:56 +02:00
Thibaut Girka
4a6bc2482a [Glitch] Defer scrollIntoView after DOM is drawn 2018-08-17 14:46:37 +02:00
ThibG
1ee675d68b Use correct activity id in Accept when receiving duplicate Follow (fixes #8218) (#8244) 2018-08-17 14:08:17 +02:00
ThibG
4601a58ac2 Defer scrollIntoView after DOM is drawn (fixes #8239) (#8242) 2018-08-17 14:07:38 +02:00
Thibaut Girka
50cd70b3e9 Fix incorrect prop type for ComposerReply.status 2018-08-16 21:19:20 +02:00
Thibaut Girka
7595ae4090 Fix one GettingStarted ColumnLink not having a key 2018-08-16 20:59:12 +02:00
ThibG
106fa28a00 Prevent actions log from crashing when displaying deleted status (fixes #8133) (#8219) 2018-08-16 20:05:26 +02:00
ThibG
c98681c358 Do not error out when performing admin actions on no statuses (#8220) 
Fixes the other issue with #8168
 2018-08-16 20:02:52 +02:00
Eugen Rochko
d78474264d
Update reply counters only if the reply is public/unlisted (#8211) 2018-08-16 14:21:52 +02:00
ThibG
be0b372a22 Fix admin.js starting rails-ujs twice (fixes #8168) (#8213) 2018-08-15 23:38:31 +02:00
ThibG
625b5a567b Get rid of the Content Warning rainbows (#8129) 
* Disable the animated rainbow text when the “Reduce motion” setting is set

* Get rid of the Content Warning rainbows

* Revert to default color for CWs in admin view

Since that colorscheme is apparently broken for some colorblind people.

* Use HTML5's details and summary for statuses with CWs in admin interface
 2018-08-15 19:38:56 +02:00
ThibG
af912fb308 Allow accessing local private/DM messages by URL (#8196) 
* Allow accessing local private/DM messages by URL

(Provided the user pasting the URL is authorized to see the toot, obviously)

* Fix SearchServiceSpec tests
 2018-08-15 19:33:36 +02:00
Eugen Rochko
4df9cabb22
Display replies count in web UI (#8181) 2018-08-15 19:29:52 +02:00
Thibaut Girka
494eaab5b1 Slightly more aggressive video preloading 
- Preload video metadata if the video is loaded in detailed view, as it is
  likely to get played, and metadata is useful for seeking in the video.
- Preload video data if it's fullscreen as it is extremely likely to get
  played right after being put in fullscreen (although those are two steps).
- Preload video data if the user has clicked the position slider, as the video
  will play as soon as the mouse button is released, and video metadata is
  needed to properly seek into the video.
 2018-08-14 21:56:23 +02:00
Thibaut Girka
c4e8402ef9 Fix bug when clicking on video position slider before starting the video 2018-08-14 21:56:23 +02:00
Thibaut Girka
f0fa6e3a7c Prevent default event handling when clicking on the video position slider 
This prevents accidental text selection and avoids opening the toot containing
the video in the dynamic column when clicking on the position slider.
 2018-08-14 21:56:23 +02:00