35ad63910d
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
1c84f62d6d
add finnish translation
...
add finnish translation
2017-04-03 13:35:12 +02:00
bb8d80f1b0
add finnish translation
...
add finnish translation
2017-04-03 13:34:26 +02:00
4949cc46d8
add finnish translation
...
add finnish translation
2017-04-03 13:33:43 +02:00
a3e82c4fa5
add finnish language
...
add finnish language
2017-04-03 13:32:10 +02:00
cbff9a2e15
finnish translation
...
finnish translation
2017-04-03 13:25:46 +02:00
5045c23636
updated final translation
...
updated final translation
2017-04-03 13:07:09 +02:00
97404075cb
Merge pull request #769 from Angristan/patch-1
...
Improve french translation
2017-04-03 12:59:41 +02:00
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
554c8555b4
Merge pull request #765 from marrus-sh/mastodon-API-update
...
Update API docs
2017-04-03 12:58:38 +02:00
6b5d5a6a1e
Merge pull request #768 from marvinkopf/mutedropdown
...
add mute option in status dropdown
2017-04-03 12:53:49 +02:00
7606beb4dd
Create new translation file
...
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
7227a992fc
Create Finnish translation for Mastodon
...
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
38bf31d425
Improve french translation
2017-04-03 11:04:00 +02:00
61333ed232
add mute option in status dropdown
2017-04-03 10:44:08 +02:00
dac1ca1e40
"direct" in statuses#create
2017-04-03 01:23:37 -07:00
145493fd4c
Forgot `direct` statuses :P
2017-04-02 22:46:10 -07:00
a9f7e93396
Typofixes
2017-04-02 21:17:07 -07:00
db554277b9
Code now code
2017-04-02 21:13:15 -07:00
034f60b5c4
Merging 'upstream' updates
2017-04-02 21:07:07 -07:00
0b99777853
Updated API docs
2017-04-02 21:03:49 -07:00
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
1f6eae02e1
Merge pull request #760 from ProgVal/patch-2
...
Improve French translation
2017-04-03 03:40:34 +02:00
c385fc5d3c
Merge pull request #757 from yiskah/patch-4
...
Add social.imirhil.fr
2017-04-03 03:40:20 +02:00
ce7ace0cf0
Merge pull request #759 from Wonderfall/master
...
use alpine-based official images
2017-04-03 03:40:00 +02:00
ebd4650511
Merge pull request #748 from ProgVal/patch-1
...
Fix install instructions.
2017-04-03 03:39:35 +02:00
7d5921dd5c
Improve French translation
...
Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03 03:16:37 +02:00
b11e1f73c9
use alpine-based official images
2017-04-03 03:09:56 +02:00
fd51b1a2a5
Add social.imirhil.fr
2017-04-02 20:11:28 -04:00
02c431e1d7
Merge pull request #743 from Kazhnuz/master
...
Update French Translation
2017-04-03 01:10:36 +02:00
8ba7d4ed82
Merge branch 'master' into master
2017-04-03 01:07:53 +02:00
87b78caf6b
Merge pull request #751 from Wonderfall/master
...
update Dockerfile
2017-04-03 01:03:42 +02:00
b84a37db4a
Update Dockerfile
2017-04-03 00:56:05 +02:00
99918c71e7
update Dockerfile
2017-04-03 00:46:44 +02:00
97a75cc942
Merge pull request #744 from fpiesche/master
...
Add in-depth user guide
2017-04-03 00:26:24 +02:00
720922cd13
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
38808dea00
Merge pull request #747 from Themimitoof/patch-1
...
add link to another mastodon instance.
2017-04-03 00:25:37 +02:00
02fac04fc5
Also fix the start command.
2017-04-03 00:10:51 +02:00
e089c66083
Fix install instructions.
...
Closes GH-745.
2017-04-03 00:08:40 +02:00
621b595c46
add link to another mastodon instance.
2017-04-03 00:04:54 +02:00
e6a6c102f6
Add forgotten comma
2017-04-02 23:39:41 +02:00
567587b789
Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.
2017-04-02 22:31:43 +01:00
5f0e912d87
Add more lcoales in fr.jsx
2017-04-02 14:23:40 -07:00
6ac05fc74b
Update French Translation
2017-04-02 23:18:01 +02:00
9586becc7f
Add info on CW tags not automatically hiding images.
2017-04-02 22:07:23 +01:00
4404c223a2
Add user guide to README toc
2017-04-02 22:05:21 +01:00
066b904205
Fix typo in simple_form.fr.yml
2017-04-02 14:04:06 -07:00
b7554089cb
Improve translation of data import in fr.yml
2017-04-02 14:03:57 -07:00
6162adec16
Better translation for revoked token in doorkeeper.fr.yml
2017-04-02 14:03:41 -07:00
53e0834cf4
Fix date format in doorkeeper.fr.yml
2017-04-02 14:03:31 -07:00
JantsoP