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
Wonderfall
b8d2373e0b
Update Dockerfile
2017-04-03 00:56:05 +02:00
Wonderfall
92d35c52d9
update Dockerfile
2017-04-03 00:46:44 +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
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
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
9ca548c17e
Also fix the start command.
2017-04-03 00:10:51 +02:00
Valentin Lorentz
82ae07e48b
Fix install instructions.
...
Closes GH-745.
2017-04-03 00:08:40 +02:00
Michael Vieira
b69e97c40b
add link to another mastodon instance.
2017-04-03 00:04:54 +02:00
Kazhnuz
c76d20c2a0
Add forgotten comma
2017-04-02 23:39:41 +02: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
4f7cce25ac
Add more lcoales in fr.jsx
2017-04-02 14:23:40 -07:00
Kazhnuz
633e5ec6f6
Update French Translation
2017-04-02 23:18:01 +02:00
Florian Piesche
e92796b49c
Add info on CW tags not automatically hiding images.
2017-04-02 22:07:23 +01:00
Florian Piesche
a729d0c2b1
Add user guide to README toc
2017-04-02 22:05:21 +01:00
Damien Erambert
71cf9d0608
Fix typo in simple_form.fr.yml
2017-04-02 14:04:06 -07:00
Damien Erambert
5e45982ed9
Improve translation of data import in fr.yml
2017-04-02 14:03:57 -07:00
Damien Erambert
b829460b4a
Better translation for revoked token in doorkeeper.fr.yml
2017-04-02 14:03:41 -07:00
Damien Erambert
65e6a00817
Fix date format in doorkeeper.fr.yml
2017-04-02 14:03:31 -07: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
b277e88aae
Write up reporting.
2017-04-02 21:45:51 +01:00
Florian Piesche
03b2f37b46
Add information about the Direct privacy setting.
2017-04-02 21:39:05 +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
2cd792fc3d
Merge pull request #737 from nevillepark/patch-2
...
Corrected spelling mistake
2017-04-02 22:23:11 +02:00
Eugen
09b4b65fde
Merge pull request #740 from 0x70b1a5/master
...
remove black border on video mute/spoiler buttons
2017-04-02 22:22:56 +02:00
Eugen
48cb2dccd2
Merge pull request #741 from eramdam/feature/improve-french-locales
...
Improve/add some French locales
2017-04-02 22:22:44 +02:00
Eugen Rochko
a23e4380b2
Avoid re-loading already loaded relationships. Also fixes issue where wrong
...
button would be displayed in account lists for unloaded relationships
2017-04-02 22:02:38 +02:00
Eugen Rochko
aaa4d1b0fb
Keep track of which timelines are connected live to avoid redundant
...
refreshes on navigation
2017-04-02 21:44:06 +02:00
Eugen Rochko
3618cc04ff
Add heartbeat to websockets streaming API connections
2017-04-02 21:27:14 +02:00
Eugen Rochko
2d07cb5771
Catching rack timeout from rails doesn't work
2017-04-02 21:12:18 +02:00
Tobias Merkle
f25fc04ea1
single-quotes
2017-04-02 14:55:13 -04:00
Tobias Merkle
ca21be3e16
remove black border on buttons
2017-04-02 14:54:24 -04:00
Eugen Rochko
5b12624847
Add proper error page for request timeouts
2017-04-02 19:43:44 +02:00
Neville Park
54c796c8df
Corrected spelling mistake
2017-04-02 13:01:55 -04:00
Eugen
34ff11c496
Merge pull request #729 from Abzol/master
...
Fix word-break in account profiles
2017-04-02 17:53:00 +02:00
Eugen
25ed563cdb
Merge pull request #735 from TheKinrar/patch-3
...
Add link to instances.mastodon.xyz
2017-04-02 17:50:15 +02:00
TheKinrar
9f219d8968
Add link to instances.mastodon.xyz
2017-04-02 17:48:25 +02:00
Olivia Mossberg
30da6440d0
Merge branch 'master' of github.com:tootsuite/mastodon
...
It's just an upstream merge
2017-04-02 17:04:31 +02:00
Olivia Mossberg
f4b5fe9caf
Fix word-break in account profiles
...
word-break:break-all is a surefire way to break things. It should be set
to normal.
This merge just set it back to what it should be.
Tested on Firefox 52.0.2 and Chrome 56.0.2924.87 with no detected
errors.
2017-04-02 16:54:24 +02:00
Eugen Rochko
4b7dca4713
Fix wording "show reblogs" -> "show boosts", order reports chronologically in
...
admin UI
2017-04-02 16:45:49 +02:00
Eugen
3a62721e54
Merge pull request #728 from bottitytto/add-mashek
...
Adding social.mashek.net
2017-04-02 16:30:30 +02:00
Eugen Rochko
d6b965cf08
Fix issue with feed merge-in code as well
2017-04-02 15:58:25 +02:00
