aiden
/
mastodon
mirror of https://github.com/mastodon/mastodon
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,674 Commits
141 Branches
284 Tags
1.0 GiB
Commit Graph

1674 Commits (117b22e905832132367b20e2ef79e98cf9f03f17)
 

Author SHA1 Message Date
Eugen 117b22e905 Merge pull request from peterkeen/email-whitelist-817 
[] Add email whitelist
Eugen d3dab68978 Merge pull request from ashfurrow/patch-1 
Adds instructions for adding admin users for Heroku installs
Eugen 57466d542b Merge pull request from nevillepark/master 
Changed "reblogs" to "boosts"
Eugen 417273326a Merge pull request from asm/mastodon_cc 
Adding https://mastodon.cc
Eugen 909d81923e Merge pull request from SirCmpwn/remote-follow-improvements 
Remote follow improvements
Eugen 2edeb3fe1c Merge pull request from krainboltgreene/patch-6 
Use active record shorthand
Ash Furrow dd441606aa Updates instructions.
Eugen feea517046 Merge pull request from kwaio/patch-1 
typo in admin doc
Drew DeVault f7e35d90db Remote follow improvements 
This stores the @username@instance you provide in your session and
reuses it the next time you remote follow someone from this instance.
Eugen e55fbdede3 Merge pull request from Angristan/patch-4 
Add file package
Eugen Rochko bda37489ac Remove PuSH subscriptions when delivery is answered with a 4xx error
Jason Snell 50a88d6a6e Adding https://mastodon.cc
Ash Furrow 04225ed72e Adds instructions for adding admin users.
Eugen ed22f65b3c Merge pull request from krainboltgreene/patch-7 
Quick attempt to get pull requests passing
Kurtis Rainbolt-Greene 9ae9ecdebe Quick attempt to get pull requests passing
Nope Nope dcda852b5f typo in admin doc 
s/rails/rake/
Angristan 6091b9b1a9 Add file package 
If the file package is not installed, we get "Validation failed: File has contents that are not what they are reported to be" when upload media.
Eugen Rochko 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed
Kurtis Rainbolt-Greene 731e650681 Use active record shorthand
Pete Keen e9a6da6bc7 [] Add email whitelist 
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.

Fixes
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI
Eugen 405c495c23 Merge pull request from fhalna/development 
Accessibility Fix.
Eugen fee3312193 Merge pull request from 0xa/patch-1 
Add octodon.social
Eugen 48dfdad492 Merge branch 'master' into patch-1
Eugen ed4a723a82 Merge pull request from unascribed/patch-1 
Add fern.surgeplay.com to the instances list
Eugen c359e60034 Merge pull request from Wonderfall/master 
update social.targaryen.house info
Eugen 4bb623a595 Merge pull request from ndarville/patch-1 
Fix typo in ISSUE_TEMPLATE
Eugen 7c075b5551 Merge pull request from yiskah/patch-5 
Add instances from instances.mastodon.xyz
Niclas Darville 904f9266ef Fix typo in ISSUE_TEMPLATE
Eugen 1e81cad3f3 Merge pull request from walfie/patch-1 
Fix typo in Heroku guide
Eugen 8e693b8e41 Merge pull request from leowzukw/patch-1 
More consistent typography
Eugen 60d07c06c3 Merge pull request from ndarville/patch-1 
Create ISSUE_TEMPLATE.md to bring down duplicate issues
Niclas Darville be2e7e1802 Create ISSUE_TEMPLATE.md
Eugen Rochko 38b504b7a7 Remove sidekiq-merger
Eugen Rochko 82aaedec46 Reduce number of items in feeds, optimize regeneration worker slightly, 
make regeneration worker unique, (only schedule/execute once at a time)
Eugen Rochko b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge
Eugen Rochko b21f7c28f6 Move OStatus processing back into default queue
Eugen Rochko ce9df2fa82 Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods, 
do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis
halna_Tanaguru 3abb0f7bc7 Merge branch 'master' into development
Leo Wzukw e81ba26be9 More consistent typography
walfie c22388fc79 Fix typo in Heroku guide
Eugen Rochko eb023beb49 Fix - smaller elephant friend PNG for frontpage
Eugen Rochko b510a56c0c Only call regeneration worker after first login after a 14 day break
Eugen Rochko 4c53af64f0 Fix ActionController::Parameters in API issue
Eugen Rochko f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull" 
must be added to the Sidekiq invokation in your systemd file

The pull queue will handle link crawling, thread resolving, and OStatus
processing. Such tasks are more likely to hang for a longer time (due to
network requests) so it is more sensible to not make the "in-house" tasks
wait for them.
Neville Park ce1ca28594 Changed "reblogs" to "boosts"
Alice 5b6f4fdeb4 Add octodon.social
Eugen Rochko 8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions
halna_Tanaguru 3f30ae1f97 accessibility fix 
eanable focus on ClearColumnButton
Aesen 1ed37fae9b Add fern.surgeplay.com to the instances list 
It's hard to tell if this is supposed to be alphabetically sorted or not. I put it after epiktistes since it starts with F - let me know if it should go elsewhere.