Eugen
48dfdad492
Merge branch 'master' into patch-1
2017-04-04 14:51:42 +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
c359e60034
Merge pull request #799 from Wonderfall/master
...
update social.targaryen.house info
2017-04-04 14:50:35 +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
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
904f9266ef
Fix typo in ISSUE_TEMPLATE
2017-04-04 14:49:31 +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
8e693b8e41
Merge pull request #816 from leowzukw/patch-1
...
More consistent typography
2017-04-04 14:48:51 +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
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_Tanaguru
3abb0f7bc7
Merge branch 'master' into development
2017-04-04 12:06:53 +02:00
JantsoP
db4a41cf58
Merge branch 'master' into master
2017-04-04 08:41:46 +02:00
JantsoP
dc89fc17cc
updated translation
2017-04-04 08:29:53 +02:00
JantsoP
b8243c1b49
changed line 25 for better translation
2017-04-04 08:26:59 +02:00
Leo Wzukw
e81ba26be9
More consistent typography
2017-04-04 06:58:17 +02:00
walfie
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 Park
ce1ca28594
Changed "reblogs" to "boosts"
2017-04-03 17:45:36 -04:00
Alice
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_Tanaguru
3f30ae1f97
accessibility fix
...
eanable focus on ClearColumnButton
2017-04-03 22:45:29 +02:00
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.
2017-04-03 15:52:33 -04:00
Wonderfall
cc451e1fcb
update social.targaryen.house info
2017-04-03 21:36:28 +02:00
Eugen Rochko
98a93aa07e
Fix norwegian translation being malformed
2017-04-03 19:50:55 +02:00
Eugen Rochko
68f829e11c
Add basic logging of who resolved report
2017-04-03 19:35:00 +02:00
Eugen Rochko
71458dc6df
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
Korbinian
ec8029a955
Updated and fixed orthography
2017-04-03 19:10:48 +02:00
Korbinian
7dd5ba42a3
Updated and fixed german orthography
2017-04-03 19:01:17 +02:00
Eugen Rochko
b7c1b12367
Make default admin UI page reports. Add admin UI for creating a domain block
2017-04-03 18:55:06 +02:00
shel
8a45a97e2e
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
f6e9251054
Merge pull request #777 from chriswk/master
...
Add Norwegian locale
2017-04-03 18:06:37 +02:00
Eugen
9738aaf5fb
Merge pull request #782 from wxcafe/patch-1
...
Adds social.wxcafe.net
2017-04-03 18:06:16 +02:00
Eugen
ce433e22f6
Merge pull request #784 from singingwolfboy/github-capitalized
...
GitHub should be capitalized
2017-04-03 18:06:02 +02:00
David Baumgold
5652f00d81
GitHub should be capitalized
2017-04-03 11:44:11 -04:00
wxcafé
d06c810b16
Adds social.wxcafe.net
2017-04-03 17:32:25 +02:00
Christopher Kolstad
5cb011b66b
Add Norwegian locale
2017-04-03 16:32:03 +02:00
Eugen
663e5378c0
Merge pull request #775 from JantsoP/master
...
Finnish Translation
2017-04-03 15:04:51 +02:00
JantsoP
65d667dc6c
another typo. fuck me
2017-04-03 14:56:13 +02:00
JantsoP
d3fde60297
fixed an sneaky peaky tpy
2017-04-03 14:54:53 +02:00
JantsoP
85a8b62ca2
add finnish translation
...
add finnish translation
2017-04-03 14:43:07 +02:00
JantsoP
97803600ed
add finnish translation
...
add finnish translation
2017-04-03 14:20:50 +02:00
JantsoP
a229840ffe
fixed typo
2017-04-03 14:16:03 +02:00
