Commit graph

39694 commits

Author SHA1 Message Date
Eugen
61f90f15b0 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
d2358aefec 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
Eugen
30df1c8476 Merge pull request #751 from Wonderfall/master
update Dockerfile
2017-04-03 01:03:42 +02:00
Wonderfall
b84a37db4a Update Dockerfile 2017-04-03 00:56:05 +02:00
Wonderfall
b8d2373e0b Update Dockerfile 2017-04-03 00:56:05 +02:00
Wonderfall
99918c71e7 update Dockerfile 2017-04-03 00:46:44 +02:00
Wonderfall
92d35c52d9 update Dockerfile 2017-04-03 00:46:44 +02:00
Eugen
97a75cc942 Merge pull request #744 from fpiesche/master
Add in-depth user guide
2017-04-03 00:26:24 +02:00
Eugen
d7d60073f9 Merge pull request #744 from fpiesche/master
Add in-depth user guide
2017-04-03 00:26:24 +02:00
Eugen
720922cd13 Merge pull request #746 from eramdam/feature/improve-french-locales
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
Eugen
61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
Eugen
38808dea00 Merge pull request #747 from Themimitoof/patch-1
add link to another mastodon instance.
2017-04-03 00:25:37 +02:00
Eugen
ce495138ac Merge pull request #747 from Themimitoof/patch-1
add link to another mastodon instance.
2017-04-03 00:25:37 +02:00
Valentin Lorentz
02fac04fc5 Also fix the start command. 2017-04-03 00:10:51 +02:00
Valentin Lorentz
9ca548c17e Also fix the start command. 2017-04-03 00:10:51 +02:00
Valentin Lorentz
e089c66083 Fix install instructions.
Closes GH-745.
2017-04-03 00:08:40 +02:00
Valentin Lorentz
82ae07e48b Fix install instructions.
Closes GH-745.
2017-04-03 00:08:40 +02:00
Michael Vieira
621b595c46 add link to another mastodon instance. 2017-04-03 00:04:54 +02:00
Michael Vieira
b69e97c40b add link to another mastodon instance. 2017-04-03 00:04:54 +02:00
Kazhnuz
e6a6c102f6 Add forgotten comma 2017-04-02 23:39:41 +02:00
Kazhnuz
c76d20c2a0 Add forgotten comma 2017-04-02 23:39:41 +02:00
Florian Piesche
567587b789 Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. 2017-04-02 22:31:43 +01:00
Florian Piesche
590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. 2017-04-02 22:31:43 +01:00
Damien Erambert
5f0e912d87 Add more lcoales in fr.jsx 2017-04-02 14:23:40 -07:00
Damien Erambert
4f7cce25ac Add more lcoales in fr.jsx 2017-04-02 14:23:40 -07:00
Kazhnuz
6ac05fc74b Update French Translation 2017-04-02 23:18:01 +02:00
Kazhnuz
633e5ec6f6 Update French Translation 2017-04-02 23:18:01 +02:00
Florian Piesche
9586becc7f Add info on CW tags not automatically hiding images. 2017-04-02 22:07:23 +01:00
Florian Piesche
e92796b49c Add info on CW tags not automatically hiding images. 2017-04-02 22:07:23 +01:00
Florian Piesche
4404c223a2 Add user guide to README toc 2017-04-02 22:05:21 +01:00
Florian Piesche
a729d0c2b1 Add user guide to README toc 2017-04-02 22:05:21 +01:00
Damien Erambert
066b904205 Fix typo in simple_form.fr.yml 2017-04-02 14:04:06 -07:00
Damien Erambert
71cf9d0608 Fix typo in simple_form.fr.yml 2017-04-02 14:04:06 -07:00
Damien Erambert
b7554089cb Improve translation of data import in fr.yml 2017-04-02 14:03:57 -07:00
Damien Erambert
5e45982ed9 Improve translation of data import in fr.yml 2017-04-02 14:03:57 -07:00
Damien Erambert
6162adec16 Better translation for revoked token in doorkeeper.fr.yml 2017-04-02 14:03:41 -07:00
Damien Erambert
b829460b4a Better translation for revoked token in doorkeeper.fr.yml 2017-04-02 14:03:41 -07:00
Damien Erambert
53e0834cf4 Fix date format in doorkeeper.fr.yml 2017-04-02 14:03:31 -07:00
Damien Erambert
65e6a00817 Fix date format in doorkeeper.fr.yml 2017-04-02 14:03:31 -07:00
Florian Piesche
9cc9321935 Update to catch up with new features and add missing images. 2017-04-02 22:03:00 +01:00
Florian Piesche
60a82c9022 Update to catch up with new features and add missing images. 2017-04-02 22:03:00 +01:00
Florian Piesche
b5be221637 Write up reporting. 2017-04-02 21:45:51 +01:00
Florian Piesche
b277e88aae Write up reporting. 2017-04-02 21:45:51 +01:00
Florian Piesche
dfcd9a3a5c Add information about the Direct privacy setting. 2017-04-02 21:39:05 +01:00
Florian Piesche
03b2f37b46 Add information about the Direct privacy setting. 2017-04-02 21:39:05 +01:00
Florian Piesche
62d639bb27 Add information on following remote users or using the Search box to find them. 2017-04-02 21:33:39 +01:00
Florian Piesche
0f274589dd Add information on following remote users or using the Search box to find them. 2017-04-02 21:33:39 +01:00
Eugen
0bcac82f2a Merge pull request #737 from nevillepark/patch-2
Corrected spelling mistake
2017-04-02 22:23:11 +02:00