Commit graph

39670 commits

Author SHA1 Message Date
Jo Decker
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 Thurlow
acc597fa98 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Adam Thurlow
192f079776 Add mastodon.club to running instances list 2017-04-04 11:14:51 -03:00
Florian Maunier
53b2df62dd Update List-of-Mastodon-instances.md
Add my own instance
2017-04-04 16:03:05 +02:00
Florian Maunier
58bdb9b42e Update List-of-Mastodon-instances.md
Add my own instance
2017-04-04 16:03:05 +02:00
Angristan
aee8798179 Missing quotes 2017-04-04 15:57:37 +02:00
Angristan
665ec615e3 Missing quotes 2017-04-04 15:57:37 +02:00
Eugen Rochko
353a30810c New admin setting: open/close registrations, with custom message, from the admin UI 2017-04-04 15:28:12 +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
JantsoP
c3db103305 updated line 28 about GitHub 2017-04-04 15:07:15 +02:00
JantsoP
10a8666e04 updated line 28 about GitHub 2017-04-04 15:07:15 +02:00
Eugen
79828478c6 Merge pull request #804 from fhalna/development
Accessibility Fix.
2017-04-04 14:52:27 +02:00
Eugen
405c495c23 Merge pull request #804 from fhalna/development
Accessibility Fix.
2017-04-04 14:52:27 +02:00
Eugen
9edfbf2ec9 Merge pull request #803 from 0xa/patch-1
Add octodon.social
2017-04-04 14:51:47 +02:00
Eugen
fee3312193 Merge pull request #803 from 0xa/patch-1
Add octodon.social
2017-04-04 14:51:47 +02:00
Eugen
db5149b963 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
Eugen
48dfdad492 Merge branch 'master' into patch-1 2017-04-04 14:51:42 +02:00
Eugen
7f543e1fca Merge pull request #800 from unascribed/patch-1
Add fern.surgeplay.com to the instances list
2017-04-04 14:51:01 +02:00
Eugen
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
Eugen
180aab6e2e Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
c359e60034 Merge pull request #799 from Wonderfall/master
update social.targaryen.house info
2017-04-04 14:50:35 +02:00
Eugen
5f88226ad0 Merge pull request #832 from ndarville/patch-1
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:50:14 +02:00
Eugen
4bb623a595 Merge pull request #832 from ndarville/patch-1
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:50:14 +02:00
Eugen
b9c1c5bdd0 Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Eugen
7c075b5551 Merge pull request #788 from yiskah/patch-5
Add instances from instances.mastodon.xyz
2017-04-04 14:49:48 +02:00
Niclas Darville
8eec03bb70 Fix typo in ISSUE_TEMPLATE 2017-04-04 14:49:31 +02:00
Niclas Darville
904f9266ef Fix typo in ISSUE_TEMPLATE 2017-04-04 14:49:31 +02:00
Eugen
4068de0eed Merge pull request #815 from walfie/patch-1
Fix typo in Heroku guide
2017-04-04 14:49:06 +02:00
Eugen
1e81cad3f3 Merge pull request #815 from walfie/patch-1
Fix typo in Heroku guide
2017-04-04 14:49:06 +02:00
Eugen
8e50f24a5c Merge pull request #816 from leowzukw/patch-1
More consistent typography
2017-04-04 14:48:51 +02:00
Eugen
8e693b8e41 Merge pull request #816 from leowzukw/patch-1
More consistent typography
2017-04-04 14:48:51 +02:00
Eugen
283ef86463 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
Eugen
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 Darville
1e5ecbdf23 Create ISSUE_TEMPLATE.md 2017-04-04 14:46:08 +02:00
Niclas Darville
be2e7e1802 Create ISSUE_TEMPLATE.md 2017-04-04 14:46:08 +02:00
Eugen Rochko
e85ec98efb Remove sidekiq-merger 2017-04-04 14:28:57 +02:00
Eugen Rochko
38b504b7a7 Remove sidekiq-merger 2017-04-04 14:28:57 +02:00
Eugen Rochko
e60c473917 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
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
9123aca6df Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge 2017-04-04 13:43:36 +02:00
Eugen Rochko
b1f3499c38 Optimize FeedManager#unmerge, and slightly optimize FeedManager#merge 2017-04-04 13:43:36 +02:00
Eugen Rochko
1484df2db5 Move OStatus processing back into default queue 2017-04-04 13:02:49 +02:00
Eugen Rochko
b21f7c28f6 Move OStatus processing back into default queue 2017-04-04 13:02:49 +02:00
Eugen Rochko
fbf64105a5 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
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_Tanaguru
c7e14e496b Merge branch 'master' into development 2017-04-04 12:06:53 +02:00
halna_Tanaguru
3abb0f7bc7 Merge branch 'master' into development 2017-04-04 12:06:53 +02:00
JantsoP
0c0e1c2519 Merge branch 'master' into master 2017-04-04 08:41:46 +02:00
JantsoP
db4a41cf58 Merge branch 'master' into master 2017-04-04 08:41:46 +02:00
JantsoP
0c0acb22e6 updated translation 2017-04-04 08:29:53 +02:00