Commit graph

  • c385fc5d3c Merge pull request #757 from yiskah/patch-4 Eugen 2017-04-03 03:40:20 +0200
  • 3f650c06b6 Merge pull request #757 from yiskah/patch-4 Eugen 2017-04-03 03:40:20 +0200
  • ce7ace0cf0 Merge pull request #759 from Wonderfall/master Eugen 2017-04-03 03:40:00 +0200
  • 71b9205679 Merge pull request #759 from Wonderfall/master Eugen 2017-04-03 03:40:00 +0200
  • ebd4650511 Merge pull request #748 from ProgVal/patch-1 Eugen 2017-04-03 03:39:35 +0200
  • 6b9c50117f Merge pull request #748 from ProgVal/patch-1 Eugen 2017-04-03 03:39:35 +0200
  • 7d5921dd5c Improve French translation Valentin Lorentz 2017-04-03 03:16:37 +0200
  • fbcba65f81 Improve French translation Valentin Lorentz 2017-04-03 03:16:37 +0200
  • b11e1f73c9 use alpine-based official images Wonderfall 2017-04-03 03:09:56 +0200
  • b7beb4368c
    use alpine-based official images Wonderfall 2017-04-03 03:09:56 +0200
  • fd51b1a2a5 Add social.imirhil.fr shel 2017-04-02 20:11:28 -0400
  • e2526a62e7 Add social.imirhil.fr shel 2017-04-02 20:11:28 -0400
  • 02c431e1d7 Merge pull request #743 from Kazhnuz/master Eugen 2017-04-03 01:10:36 +0200
  • 61f90f15b0 Merge pull request #743 from Kazhnuz/master Eugen 2017-04-03 01:10:36 +0200
  • 8ba7d4ed82 Merge branch 'master' into master Eugen 2017-04-03 01:07:53 +0200
  • d2358aefec Merge branch 'master' into master Eugen 2017-04-03 01:07:53 +0200
  • 87b78caf6b Merge pull request #751 from Wonderfall/master Eugen 2017-04-03 01:03:42 +0200
  • 30df1c8476 Merge pull request #751 from Wonderfall/master Eugen 2017-04-03 01:03:42 +0200
  • b84a37db4a Update Dockerfile Wonderfall 2017-04-03 00:56:05 +0200
  • b8d2373e0b Update Dockerfile Wonderfall 2017-04-03 00:56:05 +0200
  • 99918c71e7 update Dockerfile Wonderfall 2017-04-03 00:46:44 +0200
  • 92d35c52d9 update Dockerfile Wonderfall 2017-04-03 00:46:44 +0200
  • 97a75cc942 Merge pull request #744 from fpiesche/master Eugen 2017-04-03 00:26:24 +0200
  • d7d60073f9 Merge pull request #744 from fpiesche/master Eugen 2017-04-03 00:26:24 +0200
  • 720922cd13 Merge pull request #746 from eramdam/feature/improve-french-locales Eugen 2017-04-03 00:25:56 +0200
  • 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales Eugen 2017-04-03 00:25:56 +0200
  • 38808dea00 Merge pull request #747 from Themimitoof/patch-1 Eugen 2017-04-03 00:25:37 +0200
  • ce495138ac Merge pull request #747 from Themimitoof/patch-1 Eugen 2017-04-03 00:25:37 +0200
  • 02fac04fc5 Also fix the start command. Valentin Lorentz 2017-04-03 00:10:51 +0200
  • 9ca548c17e Also fix the start command. Valentin Lorentz 2017-04-03 00:10:51 +0200
  • e089c66083 Fix install instructions. Valentin Lorentz 2017-04-03 00:08:40 +0200
  • 82ae07e48b Fix install instructions. Valentin Lorentz 2017-04-03 00:08:40 +0200
  • 621b595c46 add link to another mastodon instance. Michael Vieira 2017-04-03 00:04:54 +0200
  • b69e97c40b add link to another mastodon instance. Michael Vieira 2017-04-03 00:04:54 +0200
  • e6a6c102f6 Add forgotten comma Kazhnuz 2017-04-02 23:39:41 +0200
  • c76d20c2a0 Add forgotten comma Kazhnuz 2017-04-02 23:39:41 +0200
  • 567587b789 Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. Florian Piesche 2017-04-02 22:31:43 +0100
  • 590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. Florian Piesche 2017-04-02 22:31:43 +0100
  • 5f0e912d87 Add more lcoales in fr.jsx Damien Erambert 2017-04-02 14:23:40 -0700
  • 4f7cce25ac Add more lcoales in fr.jsx Damien Erambert 2017-04-02 14:23:40 -0700
  • 6ac05fc74b Update French Translation Kazhnuz 2017-04-02 23:18:01 +0200
  • 633e5ec6f6 Update French Translation Kazhnuz 2017-04-02 23:18:01 +0200
  • 9586becc7f Add info on CW tags not automatically hiding images. Florian Piesche 2017-04-02 22:07:23 +0100
  • e92796b49c Add info on CW tags not automatically hiding images. Florian Piesche 2017-04-02 22:07:23 +0100
  • 4404c223a2 Add user guide to README toc Florian Piesche 2017-04-02 22:05:21 +0100
  • a729d0c2b1 Add user guide to README toc Florian Piesche 2017-04-02 22:05:21 +0100
  • 066b904205 Fix typo in simple_form.fr.yml Damien Erambert 2017-04-02 14:04:06 -0700
  • 71cf9d0608 Fix typo in simple_form.fr.yml Damien Erambert 2017-04-02 14:04:06 -0700
  • b7554089cb Improve translation of data import in fr.yml Damien Erambert 2017-04-02 14:03:57 -0700
  • 5e45982ed9 Improve translation of data import in fr.yml Damien Erambert 2017-04-02 14:03:57 -0700
  • 6162adec16 Better translation for revoked token in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:41 -0700
  • b829460b4a Better translation for revoked token in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:41 -0700
  • 53e0834cf4 Fix date format in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:31 -0700
  • 65e6a00817 Fix date format in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:31 -0700
  • 9cc9321935 Update to catch up with new features and add missing images. Florian Piesche 2017-04-02 22:03:00 +0100
  • 60a82c9022 Update to catch up with new features and add missing images. Florian Piesche 2017-04-02 22:03:00 +0100
  • b5be221637 Write up reporting. Florian Piesche 2017-04-02 21:45:51 +0100
  • b277e88aae Write up reporting. Florian Piesche 2017-04-02 21:45:51 +0100
  • dfcd9a3a5c Add information about the Direct privacy setting. Florian Piesche 2017-04-02 21:39:05 +0100
  • 03b2f37b46 Add information about the Direct privacy setting. Florian Piesche 2017-04-02 21:39:05 +0100
  • 62d639bb27 Add information on following remote users or using the Search box to find them. Florian Piesche 2017-04-02 21:33:39 +0100
  • 0f274589dd Add information on following remote users or using the Search box to find them. Florian Piesche 2017-04-02 21:33:39 +0100
  • 0bcac82f2a Merge pull request #737 from nevillepark/patch-2 Eugen 2017-04-02 22:23:11 +0200
  • 2cd792fc3d Merge pull request #737 from nevillepark/patch-2 Eugen 2017-04-02 22:23:11 +0200
  • e3509e02c0 Merge pull request #740 from 0x70b1a5/master Eugen 2017-04-02 22:22:56 +0200
  • 09b4b65fde Merge pull request #740 from 0x70b1a5/master Eugen 2017-04-02 22:22:56 +0200
  • 0335a52e28 Merge pull request #741 from eramdam/feature/improve-french-locales Eugen 2017-04-02 22:22:44 +0200
  • 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales Eugen 2017-04-02 22:22:44 +0200
  • 4bfabbd5e2 Avoid re-loading already loaded relationships. Also fixes issue where wrong button would be displayed in account lists for unloaded relationships Eugen Rochko 2017-04-02 22:02:38 +0200
  • a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong button would be displayed in account lists for unloaded relationships Eugen Rochko 2017-04-02 22:02:38 +0200
  • eb85833dc7 Keep track of which timelines are connected live to avoid redundant refreshes on navigation Eugen Rochko 2017-04-02 21:44:06 +0200
  • aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant refreshes on navigation Eugen Rochko 2017-04-02 21:44:06 +0200
  • 6966854f3d Add heartbeat to websockets streaming API connections Eugen Rochko 2017-04-02 21:27:14 +0200
  • 3618cc04ff Add heartbeat to websockets streaming API connections Eugen Rochko 2017-04-02 21:27:14 +0200
  • 1ee4c6415c Catching rack timeout from rails doesn't work Eugen Rochko 2017-04-02 21:12:18 +0200
  • 2d07cb5771 Catching rack timeout from rails doesn't work Eugen Rochko 2017-04-02 21:12:18 +0200
  • bba468bcca single-quotes Tobias Merkle 2017-04-02 14:55:13 -0400
  • f25fc04ea1 single-quotes Tobias Merkle 2017-04-02 14:55:13 -0400
  • 034cfeb1ac remove black border on buttons Tobias Merkle 2017-04-02 14:54:24 -0400
  • ca21be3e16 remove black border on buttons Tobias Merkle 2017-04-02 14:54:24 -0400
  • 00e99e58db Add proper error page for request timeouts Eugen Rochko 2017-04-02 19:43:09 +0200
  • 5b12624847 Add proper error page for request timeouts Eugen Rochko 2017-04-02 19:43:09 +0200
  • 9575c18707 Corrected spelling mistake Neville Park 2017-04-02 13:01:55 -0400
  • 54c796c8df Corrected spelling mistake Neville Park 2017-04-02 13:01:55 -0400
  • c083a69d4d Merge pull request #729 from Abzol/master Eugen 2017-04-02 17:53:00 +0200
  • 34ff11c496 Merge pull request #729 from Abzol/master Eugen 2017-04-02 17:53:00 +0200
  • 1c4ebd95b0 Merge pull request #735 from TheKinrar/patch-3 Eugen 2017-04-02 17:50:15 +0200
  • 25ed563cdb Merge pull request #735 from TheKinrar/patch-3 Eugen 2017-04-02 17:50:15 +0200
  • ef40b260f3 Add link to instances.mastodon.xyz TheKinrar 2017-04-02 17:48:25 +0200
  • 9f219d8968 Add link to instances.mastodon.xyz TheKinrar 2017-04-02 17:48:25 +0200
  • 6e4703703a Merge branch 'master' of github.com:tootsuite/mastodon Olivia Mossberg 2017-04-02 17:04:31 +0200
  • 30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon Olivia Mossberg 2017-04-02 17:04:31 +0200
  • 2d8a0caf98 Fix word-break in account profiles Olivia Mossberg 2017-04-02 16:54:24 +0200
  • f4b5fe9caf Fix word-break in account profiles Olivia Mossberg 2017-04-02 16:54:24 +0200
  • f04816f005 Fix wording "show reblogs" -> "show boosts", order reports chronologically in admin UI Eugen Rochko 2017-04-02 16:45:49 +0200
  • 4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in admin UI Eugen Rochko 2017-04-02 16:45:49 +0200
  • 1e01011f65 Merge pull request #728 from bottitytto/add-mashek Eugen 2017-04-02 16:30:30 +0200
  • 3a62721e54 Merge pull request #728 from bottitytto/add-mashek Eugen 2017-04-02 16:30:30 +0200
  • 4db2e2f4eb Fix issue with feed merge-in code as well Eugen Rochko 2017-04-02 15:58:25 +0200
  • d6b965cf08 Fix issue with feed merge-in code as well Eugen Rochko 2017-04-02 15:58:25 +0200