3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,622 Commits
8 Branches
0 Tags
183 MiB
Commit Graph

1622 Commits (5b6f4fdeb4932df1704da01762cc22c63aacb20f)

Author SHA1 Message Date
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
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
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
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
JantsoP bfa99981e5 Merge branch 'master' into master 2017-04-03 13:50:57 +02:00
JantsoP 6501ffdadc add finnish translation 
add finnish translation
 2017-04-03 13:35:12 +02:00
JantsoP ae95f35fe6 add finnish translation 
add finnish translation
 2017-04-03 13:34:26 +02:00
JantsoP 22f88b845a add finnish translation 
add finnish translation
 2017-04-03 13:33:43 +02:00
JantsoP eabb86b124 add finnish language 
add finnish language
 2017-04-03 13:32:10 +02:00
JantsoP b0f4c9b91f finnish translation 
finnish translation
 2017-04-03 13:25:46 +02:00
JantsoP f9b4f30de6 updated final translation 
updated final translation
 2017-04-03 13:07:09 +02:00
Eugen 01b79beca4 Merge pull request #769 from Angristan/patch-1 
Improve french translation
 2017-04-03 12:59:41 +02:00
Eugen 5d854f37b4 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 92a0b3d73a Merge pull request #765 from marrus-sh/mastodon-API-update 
Update API docs
 2017-04-03 12:58:38 +02:00
Eugen 2f7139c6b5 Merge pull request #768 from marvinkopf/mutedropdown 
add mute option in status dropdown
 2017-04-03 12:53:49 +02:00
JantsoP 87854745e9 Create new translation file 
Still in progress. Should be done shortly
 2017-04-03 12:42:09 +02:00
JantsoP 69fc95a2f5 Create Finnish translation for Mastodon 
Create Finnish translation for Mastodon
 2017-04-03 12:09:33 +02:00
Angristan c97fc5c1f4 Improve french translation 2017-04-03 11:04:00 +02:00
Marvin Kopf 1236a12cae add mute option in status dropdown 2017-04-03 10:44:08 +02:00
Kibigo! b455cbc6d3 "direct" in statuses#create 2017-04-03 01:23:37 -07:00
Kibigo! a9db64cf26 Forgot `direct` statuses :P 2017-04-02 22:46:10 -07:00
Kibigo! 5d2f1d600d Typofixes 2017-04-02 21:17:07 -07:00
Kibigo! 5d65aa3bf9 Code now code 2017-04-02 21:13:15 -07:00
Kibigo! 565568dd9c Merging 'upstream' updates 2017-04-02 21:07:07 -07:00
Kibigo! 6e41ef55ed Updated API docs 2017-04-02 21:03:49 -07:00
Jessica Stokes 2d384850cb 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 1a5ab538de Merge pull request #760 from ProgVal/patch-2 
Improve French translation
 2017-04-03 03:40:34 +02:00
Eugen 3f650c06b6 Merge pull request #757 from yiskah/patch-4 
Add social.imirhil.fr
 2017-04-03 03:40:20 +02:00
Eugen 71b9205679 Merge pull request #759 from Wonderfall/master 
use alpine-based official images
 2017-04-03 03:40:00 +02:00
Eugen 6b9c50117f Merge pull request #748 from ProgVal/patch-1 
Fix install instructions.
 2017-04-03 03:39:35 +02:00
Valentin Lorentz fbcba65f81 Improve French translation 
Fix typos and typography. Make vocabulary and grammar more uniform.
 2017-04-03 03:16:37 +02:00
Wonderfall b7beb4368c
use alpine-based official images 2017-04-03 03:09:56 +02:00
shel e2526a62e7 Add social.imirhil.fr 2017-04-02 20:11:28 -04:00
Eugen 61f90f15b0 Merge pull request #743 from Kazhnuz/master 
Update French Translation
 2017-04-03 01:10:36 +02:00
Eugen d2358aefec Merge branch 'master' into master 2017-04-03 01:07:53 +02:00
Eugen 30df1c8476 Merge pull request #751 from Wonderfall/master 
update Dockerfile
 2017-04-03 01:03:42 +02:00