Commit graph

2242 commits

Author SHA1 Message Date
halna_Tanaguru
c7e14e496b 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
0c0acb22e6 updated translation 2017-04-04 08:29:53 +02:00
JantsoP
fc2b031506 changed line 25 for better translation 2017-04-04 08:26:59 +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
Neville Park
7b297cc6d2 Changed "reblogs" to "boosts" 2017-04-03 17:45:36 -04: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
axolotl
d6d192c914 added Esperanto (eo) 2017-04-03 20:22:50 +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
Korbinian
ce9bb73e96 Updated and fixed orthography 2017-04-03 19:10:48 +02:00
Korbinian
b8324b3aed Updated and fixed german orthography 2017-04-03 19:01:17 +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
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