Commit Graph

1652 Commits (79828478c68ac535b53c1cf9b7605b6622587c83)

Author SHA1 Message Date
Eugen 79828478c6 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 db5149b963 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 180aab6e2e 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 b9c1c5bdd0 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
Eugen 4068de0eed 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 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
Niclas Darville 1e5ecbdf23 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 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 9123aca6df 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 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
halna_Tanaguru c7e14e496b Merge branch 'master' into development 2017-04-04 12:06:53 +02:00
Leo Wzukw cb21bf5b40 More consistent typography 2017-04-04 06:58:17 +02:00
walfie 766eabf194 Fix typo in Heroku guide 2017-04-04 00:00:56 -04:00
Eugen Rochko 5110975df4 Fix #808 - smaller elephant friend PNG for frontpage 2017-04-04 02:03:16 +02:00
Eugen Rochko 7a56845060 Only call regeneration worker after first login after a 14 day break 2017-04-04 02:00:10 +02:00
Eugen Rochko 24793cdbaa Fix ActionController::Parameters in API issue 2017-04-04 01:33:34 +02:00
Eugen Rochko 8eca42b265 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
Alice c2787014e5 Add octodon.social 2017-04-03 23:05:03 +02:00
Eugen Rochko 8796f7a125 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_Tanaguru 4833f53a37 accessibility fix
eanable focus on ClearColumnButton
2017-04-03 22:45:29 +02:00
Aesen 9a4a766ab3 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
Wonderfall e27807e8e9 update social.targaryen.house info 2017-04-03 21:36:28 +02:00
Eugen Rochko c23ef9a706 Fix norwegian translation being malformed 2017-04-03 19:50:55 +02:00
Eugen Rochko c9ffa7ab1d Add basic logging of who resolved report 2017-04-03 19:35:00 +02:00
Eugen Rochko ceaafb22d3 When taking action on a report (silence/suspend), it dismisses all other
reports for that user automatically
2017-04-03 19:19:54 +02:00
Eugen Rochko 6ebe31e716 Make default admin UI page reports. Add admin UI for creating a domain block 2017-04-03 18:55:06 +02:00
shel 37863b45a3 Add instances from instances.mastodon.xyz
Updated list with lots of instances that have been added to instances.mastodon.xyz but not this list
2017-04-03 12:28:36 -04:00
Eugen 1e9ee59cce Merge pull request #777 from chriswk/master
Add Norwegian locale
2017-04-03 18:06:37 +02:00
Eugen bf8a9f3a87 Merge pull request #782 from wxcafe/patch-1
Adds social.wxcafe.net
2017-04-03 18:06:16 +02:00
Eugen bf8407e0ca Merge pull request #784 from singingwolfboy/github-capitalized
GitHub should be capitalized
2017-04-03 18:06:02 +02:00
David Baumgold 3e38b3989f GitHub should be capitalized 2017-04-03 11:44:11 -04:00
wxcafé 5c269d3e0e Adds social.wxcafe.net 2017-04-03 17:32:25 +02:00
Christopher Kolstad c1f52eaff1 Add Norwegian locale 2017-04-03 16:32:03 +02:00
Eugen 5f03a1220d Merge pull request #775 from JantsoP/master
Finnish Translation
2017-04-03 15:04:51 +02:00
JantsoP e74a4efa20 another typo. fuck me 2017-04-03 14:56:13 +02:00
JantsoP 54db5aa06c fixed an sneaky peaky tpy 2017-04-03 14:54:53 +02:00
JantsoP bed61b7cc4 add finnish translation
add finnish translation
2017-04-03 14:43:07 +02:00
JantsoP aa77d63da9 add finnish translation
add finnish translation
2017-04-03 14:20:50 +02:00
JantsoP f0be0d36c9 fixed typo 2017-04-03 14:16:03 +02:00
JantsoP 35ad63910d Merge branch 'master' into master 2017-04-03 13:50:57 +02:00
JantsoP 1c84f62d6d add finnish translation
add finnish translation
2017-04-03 13:35:12 +02:00
JantsoP bb8d80f1b0 add finnish translation
add finnish translation
2017-04-03 13:34:26 +02:00
JantsoP 4949cc46d8 add finnish translation
add finnish translation
2017-04-03 13:33:43 +02:00