Commit graph

1622 commits

Author SHA1 Message Date
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
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
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
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
JantsoP
a3e82c4fa5 add finnish language
add finnish language
2017-04-03 13:32:10 +02:00
JantsoP
cbff9a2e15 finnish translation
finnish translation
2017-04-03 13:25:46 +02:00
JantsoP
5045c23636 updated final translation
updated final translation
2017-04-03 13:07:09 +02:00
Eugen
97404075cb Merge pull request #769 from Angristan/patch-1
Improve french translation
2017-04-03 12:59:41 +02:00
Eugen
a2224bb6ac Merge pull request #764 from ticky/tweak-quick-start-area
Fix the position of the Mastodon mascot in the UI
2017-04-03 12:59:16 +02:00
Eugen
554c8555b4 Merge pull request #765 from marrus-sh/mastodon-API-update
Update API docs
2017-04-03 12:58:38 +02:00
Eugen
6b5d5a6a1e Merge pull request #768 from marvinkopf/mutedropdown
add mute option in status dropdown
2017-04-03 12:53:49 +02:00
JantsoP
7606beb4dd Create new translation file
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
JantsoP
7227a992fc Create Finnish translation for Mastodon
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
Angristan
38bf31d425 Improve french translation 2017-04-03 11:04:00 +02:00
Marvin Kopf
61333ed232 add mute option in status dropdown 2017-04-03 10:44:08 +02:00
Kibigo!
dac1ca1e40 "direct" in statuses#create 2017-04-03 01:23:37 -07:00
Kibigo!
145493fd4c Forgot direct statuses :P 2017-04-02 22:46:10 -07:00
Kibigo!
a9f7e93396 Typofixes 2017-04-02 21:17:07 -07:00
Kibigo!
db554277b9 Code now code 2017-04-02 21:13:15 -07:00
Kibigo!
034f60b5c4 Merging 'upstream' updates 2017-04-02 21:07:07 -07:00
Kibigo!
0b99777853 Updated API docs 2017-04-02 21:03:49 -07:00
Jessica Stokes
f7bc9938a8 Fix the position of the Mastodon mascot in the UI
The Mastodon mascot was previously anchored to the bottom, and that was since broken. This restores that behaviour!

It also disables the double-scrollbar behaviour that was caused by this area allowing overflow-y in addition to its parent doing so.
2017-04-03 13:16:14 +10:00
Eugen
1f6eae02e1 Merge pull request #760 from ProgVal/patch-2
Improve French translation
2017-04-03 03:40:34 +02:00
Eugen
c385fc5d3c Merge pull request #757 from yiskah/patch-4
Add social.imirhil.fr
2017-04-03 03:40:20 +02:00
Eugen
ce7ace0cf0 Merge pull request #759 from Wonderfall/master
use alpine-based official images
2017-04-03 03:40:00 +02:00
Eugen
ebd4650511 Merge pull request #748 from ProgVal/patch-1
Fix install instructions.
2017-04-03 03:39:35 +02:00
Valentin Lorentz
7d5921dd5c Improve French translation
Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03 03:16:37 +02:00
Wonderfall
b11e1f73c9 use alpine-based official images 2017-04-03 03:09:56 +02:00
shel
fd51b1a2a5 Add social.imirhil.fr 2017-04-02 20:11:28 -04:00
Eugen
02c431e1d7 Merge pull request #743 from Kazhnuz/master
Update French Translation
2017-04-03 01:10:36 +02:00
Eugen
8ba7d4ed82 Merge branch 'master' into master 2017-04-03 01:07:53 +02:00
Eugen
87b78caf6b Merge pull request #751 from Wonderfall/master
update Dockerfile
2017-04-03 01:03:42 +02:00