bfa99981e5
Merge branch 'master' into master
2017-04-03 13:50:57 +02:00
6501ffdadc
add finnish translation
...
add finnish translation
2017-04-03 13:35:12 +02:00
ae95f35fe6
add finnish translation
...
add finnish translation
2017-04-03 13:34:26 +02:00
22f88b845a
add finnish translation
...
add finnish translation
2017-04-03 13:33:43 +02:00
eabb86b124
add finnish language
...
add finnish language
2017-04-03 13:32:10 +02:00
b0f4c9b91f
finnish translation
...
finnish translation
2017-04-03 13:25:46 +02:00
f9b4f30de6
updated final translation
...
updated final translation
2017-04-03 13:07:09 +02:00
01b79beca4
Merge pull request #769 from Angristan/patch-1
...
Improve french translation
2017-04-03 12:59:41 +02:00
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
92a0b3d73a
Merge pull request #765 from marrus-sh/mastodon-API-update
...
Update API docs
2017-04-03 12:58:38 +02:00
2f7139c6b5
Merge pull request #768 from marvinkopf/mutedropdown
...
add mute option in status dropdown
2017-04-03 12:53:49 +02:00
87854745e9
Create new translation file
...
Still in progress. Should be done shortly
2017-04-03 12:42:09 +02:00
69fc95a2f5
Create Finnish translation for Mastodon
...
Create Finnish translation for Mastodon
2017-04-03 12:09:33 +02:00
c97fc5c1f4
Improve french translation
2017-04-03 11:04:00 +02:00
1236a12cae
add mute option in status dropdown
2017-04-03 10:44:08 +02:00
b455cbc6d3
"direct" in statuses#create
2017-04-03 01:23:37 -07:00
a9db64cf26
Forgot `direct` statuses :P
2017-04-02 22:46:10 -07:00
5d2f1d600d
Typofixes
2017-04-02 21:17:07 -07:00
5d65aa3bf9
Code now code
2017-04-02 21:13:15 -07:00
565568dd9c
Merging 'upstream' updates
2017-04-02 21:07:07 -07:00
6e41ef55ed
Updated API docs
2017-04-02 21:03:49 -07:00
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
1a5ab538de
Merge pull request #760 from ProgVal/patch-2
...
Improve French translation
2017-04-03 03:40:34 +02:00
3f650c06b6
Merge pull request #757 from yiskah/patch-4
...
Add social.imirhil.fr
2017-04-03 03:40:20 +02:00
71b9205679
Merge pull request #759 from Wonderfall/master
...
use alpine-based official images
2017-04-03 03:40:00 +02:00
6b9c50117f
Merge pull request #748 from ProgVal/patch-1
...
Fix install instructions.
2017-04-03 03:39:35 +02:00
fbcba65f81
Improve French translation
...
Fix typos and typography. Make vocabulary and grammar more uniform.
2017-04-03 03:16:37 +02:00
b7beb4368c
use alpine-based official images
2017-04-03 03:09:56 +02:00
e2526a62e7
Add social.imirhil.fr
2017-04-02 20:11:28 -04:00
61f90f15b0
Merge pull request #743 from Kazhnuz/master
...
Update French Translation
2017-04-03 01:10:36 +02:00
d2358aefec
Merge branch 'master' into master
2017-04-03 01:07:53 +02:00
30df1c8476
Merge pull request #751 from Wonderfall/master
...
update Dockerfile
2017-04-03 01:03:42 +02:00
b8d2373e0b
Update Dockerfile
2017-04-03 00:56:05 +02:00
92d35c52d9
update Dockerfile
2017-04-03 00:46:44 +02:00
d7d60073f9
Merge pull request #744 from fpiesche/master
...
Add in-depth user guide
2017-04-03 00:26:24 +02:00
61894582b8
Merge pull request #746 from eramdam/feature/improve-french-locales
...
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
ce495138ac
Merge pull request #747 from Themimitoof/patch-1
...
add link to another mastodon instance.
2017-04-03 00:25:37 +02:00
9ca548c17e
Also fix the start command.
2017-04-03 00:10:51 +02:00
82ae07e48b
Fix install instructions.
...
Closes GH-745.
2017-04-03 00:08:40 +02:00
b69e97c40b
add link to another mastodon instance.
2017-04-03 00:04:54 +02:00
c76d20c2a0
Add forgotten comma
2017-04-02 23:39:41 +02:00
590558d52c
Update images to standard sizes. Write up Federated/Local timelines and rename relevant image.
2017-04-02 22:31:43 +01:00
4f7cce25ac
Add more lcoales in fr.jsx
2017-04-02 14:23:40 -07:00
633e5ec6f6
Update French Translation
2017-04-02 23:18:01 +02:00
e92796b49c
Add info on CW tags not automatically hiding images.
2017-04-02 22:07:23 +01:00
a729d0c2b1
Add user guide to README toc
2017-04-02 22:05:21 +01:00
71cf9d0608
Fix typo in simple_form.fr.yml
2017-04-02 14:04:06 -07:00
5e45982ed9
Improve translation of data import in fr.yml
2017-04-02 14:03:57 -07:00
b829460b4a
Better translation for revoked token in doorkeeper.fr.yml
2017-04-02 14:03:41 -07:00
65e6a00817
Fix date format in doorkeeper.fr.yml
2017-04-02 14:03:31 -07:00
JantsoP