Commit Graph

1725 Commits (bea03b4553f679e13c3ed879c89748df763a411f)

Author SHA1 Message Date
Eugen 87b78caf6b Merge pull request 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 99918c71e7 update Dockerfile 2017-04-03 00:46:44 +02:00
Eugen 97a75cc942 Merge pull request from fpiesche/master
Add in-depth user guide
2017-04-03 00:26:24 +02:00
Eugen 720922cd13 Merge pull request from eramdam/feature/improve-french-locales
Feature/improve french locales (again)
2017-04-03 00:25:56 +02:00
Eugen 38808dea00 Merge pull request 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 e089c66083 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
Kazhnuz e6a6c102f6 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
Damien Erambert 5f0e912d87 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
Florian Piesche 9586becc7f 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
Damien Erambert 066b904205 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 6162adec16 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
Florian Piesche 9cc9321935 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 dfcd9a3a5c 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
Eugen 0bcac82f2a Merge pull request from nevillepark/patch-2
Corrected spelling mistake
2017-04-02 22:23:11 +02:00
Eugen e3509e02c0 Merge pull request from 0x70b1a5/master
remove black border on video mute/spoiler buttons
2017-04-02 22:22:56 +02:00
Eugen 0335a52e28 Merge pull request from eramdam/feature/improve-french-locales
Improve/add some French locales
2017-04-02 22:22:44 +02:00
Eugen Rochko 4bfabbd5e2 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 eb85833dc7 Keep track of which timelines are connected live to avoid redundant
refreshes on navigation
2017-04-02 21:44:06 +02:00
Eugen Rochko 6966854f3d Add heartbeat to websockets streaming API connections 2017-04-02 21:27:14 +02:00
Eugen Rochko 1ee4c6415c Catching rack timeout from rails doesn't work 2017-04-02 21:12:18 +02:00
Tobias Merkle bba468bcca single-quotes 2017-04-02 14:55:13 -04:00
Tobias Merkle 034cfeb1ac remove black border on buttons 2017-04-02 14:54:24 -04:00
Eugen Rochko 00e99e58db Add proper error page for request timeouts 2017-04-02 19:43:44 +02:00
Neville Park 9575c18707 Corrected spelling mistake 2017-04-02 13:01:55 -04:00
Eugen c083a69d4d Merge pull request from Abzol/master
Fix word-break in account profiles
2017-04-02 17:53:00 +02:00
Eugen 1c4ebd95b0 Merge pull request from TheKinrar/patch-3
Add link to instances.mastodon.xyz
2017-04-02 17:50:15 +02:00
TheKinrar ef40b260f3 Add link to instances.mastodon.xyz 2017-04-02 17:48:25 +02:00
Olivia Mossberg 6e4703703a Merge branch 'master' of github.com:tootsuite/mastodon
It's just an upstream merge
2017-04-02 17:04:31 +02:00
Olivia Mossberg 2d8a0caf98 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 f04816f005 Fix wording "show reblogs" -> "show boosts", order reports chronologically in
admin UI
2017-04-02 16:45:49 +02:00
Eugen 1e01011f65 Merge pull request from bottitytto/add-mashek
Adding social.mashek.net
2017-04-02 16:30:30 +02:00
Eugen Rochko 4db2e2f4eb Fix issue with feed merge-in code as well 2017-04-02 15:58:25 +02:00
Eugen Rochko 572cf64791 Fix feed regeneration bug 2017-04-02 15:46:31 +02:00
Sina Mashek aa72831d14 Adding social.mashek.net 2017-04-02 16:22:13 +03:00
Eugen Rochko 5bc32b0884 Merge branch 'maximeborges-master' 2017-04-02 12:38:11 +02:00
Eugen Rochko 347830262f Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master 2017-04-02 12:36:26 +02:00
Eugen 7a475be4a5 Merge pull request from jkap/patch-1
Updated list of instances for gay.crime.team
2017-04-02 12:33:34 +02:00
Eugen 5b39827c82 Merge branch 'master' into patch-1 2017-04-02 12:33:29 +02:00
Eugen 0993a18356 Merge pull request from TheKinrar/patch-2
Add IPv6 column in list and remove dead instance
2017-04-02 12:32:17 +02:00
TheKinrar e7840652bb Add IPv6 column in list and remove dead instance
This is done after some complaints I saw on Twitter about the lack of IPv6 support on Mastodon instances.
Also, seeing this may encourage instances owner to add IPv6 support to their own.
2017-04-02 12:05:32 +02:00