tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,826 Commits 10 Branches 0 Tags
5276c0a0900a0886b59a8ead2346540aa381ea46
Commit Graph
4826 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nope NopeandGitHub dcda852b5f typo in admin doc 
s/rails/rake/
 2017-04-04 20:45:32 +02:00
AngristanandGitHub 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.
 2017-04-04 19:23:53 +02:00
Eugen Rochko 6fd865c000 Spawn FeedInsertWorker to deliver status into personal feed 2017-04-04 19:21:37 +02:00
Clément DandGitHub 350958babf Fix typos on french translations 2017-04-04 19:09:54 +02:00
Thibaut (Eychics)andGitHub 9a5d6e9715 Add closed_registrations message on French language 2017-04-04 18:58:19 +02:00
Pierre OzouxandGitHub 41ba74b511 Update the list of instances 2017-04-04 17:28:29 +01:00
Valentin Lorentz 22000ef7a9 Add oc.todon.fr to the list of instances. 
[SKIP CI]
 2017-04-04 18:11:41 +02:00
Sébastien SantoroandGitHub 7015578655 Add social.nasqueron.org instance 2017-04-04 18:11:14 +02:00
Kurtis Rainbolt-GreeneandGitHub 731e650681 Use active record shorthand 2017-04-04 09:04:07 -07:00
AngristanandGitHub 2fcf8d79ad Fix crontab edit 
Missing -u parameter to specify the mastodon user.
 2017-04-04 17:23:56 +02:00
Pete Keen e9a6da6bc7 [#817] Add email whitelist 
This adds the ability to filter user signup with a whitelist
instead of or in addition to a blacklist.

Fixes #817
 2017-04-04 11:20:15 -04:00
Jo DeckerandGitHub d8855150a0 Update social.diskseven.com's IPv6 status 
As far as I'm aware, my instance should be supporting IPv6 now. Was an error on my part that it wasn't working before.
 2017-04-04 15:29:07 +01:00
Adam ThurlowandGitHub 192f079776 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian MaunierandGitHub 58bdb9b42e Update List-of-Mastodon-instances.md 
Add my own instance
 2017-04-04 16:03:05 +02:00
AngristanandGitHub 665ec615e3 Missing quotes 2017-04-04 15:57:37 +02:00
Eugen Rochko 5f54981846 New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +02:00
JantsoPandGitHub 10a8666e04 updated line 28 about GitHub 2017-04-04 15:07:15 +02:00
EugenandGitHub 405c495c23 Merge pull request #804 from fhalna/development 
Accessibility Fix.
 2017-04-04 14:52:27 +02:00
EugenandGitHub fee3312193 Merge pull request #803 from 0xa/patch-1 
Add octodon.social
 2017-04-04 14:51:47 +02:00
EugenandGitHub 48dfdad492 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
EugenandGitHub ed4a723a82 Merge pull request #800 from unascribed/patch-1 
Add fern.surgeplay.com to the instances list
 2017-04-04 14:51:01 +02:00
EugenandGitHub c359e60034 Merge pull request #799 from Wonderfall/master 
update social.targaryen.house info
 2017-04-04 14:50:35 +02:00
EugenandGitHub 4bb623a595 Merge pull request #832 from ndarville/patch-1 
Fix typo in ISSUE_TEMPLATE
 2017-04-04 14:50:14 +02:00
EugenandGitHub 7c075b5551 Merge pull request #788 from yiskah/patch-5 
Add instances from instances.mastodon.xyz
 2017-04-04 14:49:48 +02:00
Niclas DarvilleandGitHub 904f9266ef Fix typo in ISSUE_TEMPLATE 2017-04-04 14:49:31 +02:00
EugenandGitHub 1e81cad3f3 Merge pull request #815 from walfie/patch-1 
Fix typo in Heroku guide
 2017-04-04 14:49:06 +02:00
EugenandGitHub 8e693b8e41 Merge pull request #816 from leowzukw/patch-1 
More consistent typography
 2017-04-04 14:48:51 +02:00
EugenandGitHub 60d07c06c3 Merge pull request #831 from ndarville/patch-1 
Create ISSUE_TEMPLATE.md to bring down duplicate issues
 2017-04-04 14:48:22 +02:00
Niclas DarvilleandGitHub be2e7e1802 Create ISSUE_TEMPLATE.md 2017-04-04 14:46:08 +02:00
Eugen Rochko 38b504b7a7 Remove sidekiq-merger 2017-04-04 14:28:57 +02:00
Eugen Rochko 82aaedec46 Reduce number of items in feeds, optimize regeneration worker slightly, 
make regeneration worker unique, (only schedule/execute once at a time)
 2017-04-04 13:58:34 +02:00
Eugen Rochko b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge 2017-04-04 13:43:36 +02:00
Eugen Rochko b21f7c28f6 Move OStatus processing back into default queue 2017-04-04 13:02:49 +02:00
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
 2017-04-04 13:01:14 +02:00
halna_TanaguruandGitHub 3abb0f7bc7 Merge branch 'master' into development 2017-04-04 12:06:53 +02:00
JantsoPandGitHub db4a41cf58 Merge branch 'master' into master 2017-04-04 08:41:46 +02:00
JantsoPandGitHub dc89fc17cc updated translation 2017-04-04 08:29:53 +02:00
JantsoPandGitHub b8243c1b49 changed line 25 for better translation 2017-04-04 08:26:59 +02:00
Leo WzukwandGitHub e81ba26be9 More consistent typography 2017-04-04 06:58:17 +02:00
walfieandGitHub c22388fc79 Fix typo in Heroku guide 2017-04-04 00:00:56 -04:00
Eugen Rochko eb023beb49 Fix #808 - smaller elephant friend PNG for frontpage 2017-04-04 02:03:16 +02:00
Eugen Rochko b510a56c0c Only call regeneration worker after first login after a 14 day break 2017-04-04 02:00:10 +02:00
Eugen Rochko 4c53af64f0 Fix ActionController::Parameters in API issue 2017-04-04 01:33:34 +02:00
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.
 2017-04-04 00:53:20 +02:00
Neville ParkandGitHub ce1ca28594 Changed "reblogs" to "boosts" 2017-04-03 17:45:36 -04:00
AliceandGitHub 5b6f4fdeb4 Add octodon.social 2017-04-03 23:05:03 +02:00
Eugen Rochko 8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions 2017-04-03 22:54:46 +02:00
halna_TanaguruandGitHub 3f30ae1f97 accessibility fix 
eanable focus on ClearColumnButton
 2017-04-03 22:45:29 +02:00
AesenandGitHub 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.
 2017-04-03 15:52:33 -04:00
WonderfallandGitHub cc451e1fcb update social.targaryen.house info 2017-04-03 21:36:28 +02:00