fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-15 19:31:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
7242 commits 128 branches 266 tags 975 MiB
Commit graph

7242 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thibaut Girka 801919fc9b Add hashtag trendline support to glitch-soc flavour 
Port Mastodon's hashtag stats thing to glitch-soc.
This doesn't change how hashtags are ordered, and doesn't add a trending
hashtags section, but it does change how hashtag searches are rendered,
displaying a trend line alongside each hashtag.
 2018-08-22 19:27:06 +02:00
Thibaut Girka 360fbf1bd4 Add pinned accounts editor 2018-08-22 16:18:23 +02:00
Thibaut Girka 9fbaaefe59 Split list editor into components and containers 2018-08-22 16:18:23 +02:00
Thibaut Girka d69f045681 Fix ColumnLink keys in getting_started_misc 2018-08-22 16:18:23 +02:00
ThibG 37965ac8d9
Merge pull request #660 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-21 19:54:21 +02:00
Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master 
Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.
 2018-08-21 18:24:48 +02:00
ThibG f06fa09962 Revert to using Paperclip's filesystem storage, and fix dangling records in remove_remote (#8339) 
* Fix uncaching worker

* Revert to using Paperclip's filesystem backend instead of fog-local

fog-local has lots of concurrency issues, causing failure to delete files,
dangling file records, and spurious errors UncacheMediaWorker
 2018-08-21 17:53:01 +02:00
Eugen Rochko d98de8ada7
Get rid of all batch order warnings (#8334) 2018-08-21 12:25:50 +02:00
Eugen Rochko 83746b6364
Remove annoying Notification#cache_ids scope warning (#8333) 2018-08-21 02:49:51 +02:00
NecroTechno 6a0d4d36ad reorder simple form ul to list vertically (fixes #8236) (#8322) 
* reorder simple form ul to list vertically (fixes #8236)

* remove browser specific prefixes
 2018-08-20 23:58:57 +02:00
ThibG 8ac5e651e1 Upgrade doorkeeper to 4.4.2 (#8321) 2018-08-20 22:42:02 +02:00
Thibaut Girka c789181626 [Glitch] Add hotkey for follow requests 
Port 25f6f41052 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 8fe1f8d4ce
 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
Oskari Noppa 1d1e0171ec Fix a variable for a Finnish translation (#8299) 2018-08-20 02:16:40 +09: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
Marcin Mikołajczak 62cd097414 i18n: Update Polish translation (#8290) 
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
 2018-08-20 00:05:36 +09:00
Thibaut Girka ea3c0ce321 Adapt github issue template to glitch-soc 
We don't have releases, so it don't make sense to mention.
On the other hand, a lot of our code is from upstream, so encourage people to
check whether it is a bug in glitch-soc or upstream.
 2018-08-19 16:56:42 +02:00
Thibaut Girka 432f6b88b0 Focus CW field when enabling it, focus compose textarea when disabling it 
Port a99179d31f and 09147186b7
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
ThibG 484b9314e3
Merge pull request #652 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-19 09:46:26 +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
AkiraFukushima 58ffe3f7c3 Revert "Upgrade Doorkeeper to 4.4.1 (#8197)" (#8231) 
* Revert "Upgrade Doorkeeper to 4.4.1 (#8197)"

This reverts commit 464daffdf9.

* Except migration files from revert commit
 2018-08-19 03:20:37 +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 f13afa1ee9
Do not use WHERE NOT IN in CopyStatusStats migration (#8281) 
Fix #8275

As the batch operation progresses, the statuses_stats table grows,
and the WHERE NOT IN subquery becomes more expensive
 2018-08-19 02:01:49 +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
Eugen Rochko c6eab9e0aa
Add Makara dependency to support read-replicas (#8216) 
Not active by default unless config/database.yml is edited
 2018-08-18 21:06:12 +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
ThibG 44e31c3e53
Merge pull request #649 from ThibG/glitch-soc/merge-upstream 
Merge upstream changes
 2018-08-18 18:22:54 +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
ThibG 5059989cc7 Use CircleCI workflows for ruby dependencies (#8228) 
* Add “bundle clean” suggestion from CircleCI doc

Cf. https://circleci.com/docs/2.0/caching/#bundler-ruby

* Use workspaces instead of caches for ruby gems

Cache are not guaranteed to be available, while the test jobs *require* their
depencies to run. Workspaces are thus more suitable.

One downside is that the order of workspace layer additions need to be
deterministic, which is why install-ruby{2.3,2.4} now depend on
install-ruby2.5.
 2018-08-18 04:05:42 +02:00
Eugen Rochko edb1de7800
Make CopyStatusStats migration use batches of 1000 to avoid locks (#8256) 2018-08-18 03:44:50 +02:00