tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • f9b4f30de6 updated final translation JantsoP 2017-04-03 13:07:09 +02:00
  • 01b79beca4 Merge pull request #769 from Angristan/patch-1 Eugen 2017-04-03 12:59:41 +02:00
  • 5d854f37b4 Merge pull request #764 from ticky/tweak-quick-start-area Eugen 2017-04-03 12:59:16 +02:00
  • 92a0b3d73a Merge pull request #765 from marrus-sh/mastodon-API-update Eugen 2017-04-03 12:58:38 +02:00
  • 2f7139c6b5 Merge pull request #768 from marvinkopf/mutedropdown Eugen 2017-04-03 12:53:49 +02:00
  • 87854745e9 Create new translation file JantsoP 2017-04-03 12:42:09 +02:00
  • 69fc95a2f5 Create Finnish translation for Mastodon JantsoP 2017-04-03 12:09:33 +02:00
  • c97fc5c1f4 Improve french translation Angristan 2017-04-03 11:04:00 +02:00
  • 1236a12cae add mute option in status dropdown Marvin Kopf 2017-04-03 09:56:01 +02:00
  • b455cbc6d3 "direct" in statuses#create Kibigo! 2017-04-03 01:23:37 -07:00
  • a9db64cf26 Forgot direct statuses :P Kibigo! 2017-04-02 22:46:10 -07:00
  • 5d2f1d600d Typofixes Kibigo! 2017-04-02 21:17:07 -07:00
  • 5d65aa3bf9 Code now code Kibigo! 2017-04-02 21:13:15 -07:00
  • 565568dd9c Merging 'upstream' updates Kibigo! 2017-04-02 21:07:07 -07:00
  • 6e41ef55ed Updated API docs Kibigo! 2017-04-02 21:03:49 -07:00
  • 2d384850cb Fix the position of the Mastodon mascot in the UI Jessica Stokes 2017-04-03 13:16:14 +10:00
  • 1a5ab538de Merge pull request #760 from ProgVal/patch-2 Eugen 2017-04-03 03:40:34 +02:00
  • 3f650c06b6 Merge pull request #757 from yiskah/patch-4 Eugen 2017-04-03 03:40:20 +02:00
  • 71b9205679 Merge pull request #759 from Wonderfall/master Eugen 2017-04-03 03:40:00 +02:00
  • 6b9c50117f Merge pull request #748 from ProgVal/patch-1 Eugen 2017-04-03 03:39:35 +02:00
  • fbcba65f81 Improve French translation Valentin Lorentz 2017-04-03 03:16:37 +02:00
  • b7beb4368c
         use alpine-based official images Wonderfall 2017-04-03 03:09:56 +02:00
  • e2526a62e7 Add social.imirhil.fr shel 2017-04-02 20:11:28 -04:00
  • 61f90f15b0 Merge pull request #743 from Kazhnuz/master Eugen 2017-04-03 01:10:36 +02:00
  • d2358aefec Merge branch 'master' into master Eugen 2017-04-03 01:07:53 +02:00
  • 30df1c8476 Merge pull request #751 from Wonderfall/master Eugen 2017-04-03 01:03:42 +02:00
  • b8d2373e0b Update Dockerfile Wonderfall 2017-04-03 00:56:05 +02:00
  • 92d35c52d9 update Dockerfile Wonderfall 2017-04-03 00:46:44 +02:00
  • d7d60073f9 Merge pull request #744 from fpiesche/master Eugen 2017-04-03 00:26:24 +02:00
  • 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales Eugen 2017-04-03 00:25:56 +02:00
  • ce495138ac Merge pull request #747 from Themimitoof/patch-1 Eugen 2017-04-03 00:25:37 +02:00
  • 9ca548c17e Also fix the start command. Valentin Lorentz 2017-04-03 00:10:51 +02:00
  • 82ae07e48b Fix install instructions. Valentin Lorentz 2017-04-03 00:08:40 +02:00
  • b69e97c40b add link to another mastodon instance. Michael Vieira 2017-04-03 00:04:54 +02:00
  • c76d20c2a0 Add forgotten comma Kazhnuz 2017-04-02 23:39:41 +02:00
  • 590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. Florian Piesche 2017-04-02 22:31:43 +01:00
  • 4f7cce25ac Add more lcoales in fr.jsx Damien Erambert 2017-04-02 14:23:40 -07:00
  • 633e5ec6f6 Update French Translation Kazhnuz 2017-04-02 23:18:01 +02:00
  • e92796b49c Add info on CW tags not automatically hiding images. Florian Piesche 2017-04-02 22:07:23 +01:00
  • a729d0c2b1 Add user guide to README toc Florian Piesche 2017-04-02 22:05:21 +01:00
  • 71cf9d0608 Fix typo in simple_form.fr.yml Damien Erambert 2017-04-02 14:04:06 -07:00
  • 5e45982ed9 Improve translation of data import in fr.yml Damien Erambert 2017-04-02 14:03:57 -07:00
  • b829460b4a Better translation for revoked token in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:41 -07:00
  • 65e6a00817 Fix date format in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:31 -07:00
  • 60a82c9022 Update to catch up with new features and add missing images. Florian Piesche 2017-04-02 22:03:00 +01:00
  • b277e88aae Write up reporting. Florian Piesche 2017-04-02 21:45:51 +01:00
  • 03b2f37b46 Add information about the Direct privacy setting. Florian Piesche 2017-04-02 21:39:05 +01:00
  • 0f274589dd Add information on following remote users or using the Search box to find them. Florian Piesche 2017-04-02 21:33:39 +01:00
  • 2cd792fc3d Merge pull request #737 from nevillepark/patch-2 Eugen 2017-04-02 22:23:11 +02:00
  • 09b4b65fde Merge pull request #740 from 0x70b1a5/master Eugen 2017-04-02 22:22:56 +02:00
  • 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales Eugen 2017-04-02 22:22:44 +02:00
  • 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 +02:00
  • aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant refreshes on navigation Eugen Rochko 2017-04-02 21:44:06 +02:00
  • 3618cc04ff Add heartbeat to websockets streaming API connections Eugen Rochko 2017-04-02 21:27:14 +02:00
  • 2d07cb5771 Catching rack timeout from rails doesn't work Eugen Rochko 2017-04-02 21:12:18 +02:00
  • f25fc04ea1 single-quotes Tobias Merkle 2017-04-02 14:55:13 -04:00
  • ca21be3e16 remove black border on buttons Tobias Merkle 2017-04-02 14:54:24 -04:00
  • 5b12624847 Add proper error page for request timeouts Eugen Rochko 2017-04-02 19:43:09 +02:00
  • 54c796c8df Corrected spelling mistake Neville Park 2017-04-02 13:01:55 -04:00
  • 34ff11c496 Merge pull request #729 from Abzol/master Eugen 2017-04-02 17:53:00 +02:00
  • 25ed563cdb Merge pull request #735 from TheKinrar/patch-3 Eugen 2017-04-02 17:50:15 +02:00
  • 9f219d8968 Add link to instances.mastodon.xyz TheKinrar 2017-04-02 17:48:25 +02:00
  • 30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon Olivia Mossberg 2017-04-02 17:04:31 +02:00
  • f4b5fe9caf Fix word-break in account profiles Olivia Mossberg 2017-04-02 16:54:24 +02:00
  • 4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in admin UI Eugen Rochko 2017-04-02 16:45:49 +02:00
  • 3a62721e54 Merge pull request #728 from bottitytto/add-mashek Eugen 2017-04-02 16:30:30 +02:00
  • d6b965cf08 Fix issue with feed merge-in code as well Eugen Rochko 2017-04-02 15:58:25 +02:00
  • e809caa0e1 Fix feed regeneration bug Eugen Rochko 2017-04-02 15:46:31 +02:00
  • aaea7e1e7c Adding social.mashek.net Sina Mashek 2017-04-02 16:22:13 +03:00
  • 750662d9e2 Merge branch 'maximeborges-master' Eugen Rochko 2017-04-02 12:38:11 +02:00
  • 34aff3e269 Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master Eugen Rochko 2017-04-02 12:36:26 +02:00
  • e70661b495 Merge pull request #723 from jkap/patch-1 Eugen 2017-04-02 12:33:34 +02:00
  • a2fa09518f Merge branch 'master' into patch-1 Eugen 2017-04-02 12:33:29 +02:00
  • 3e84a86eb8 Merge pull request #727 from TheKinrar/patch-2 Eugen 2017-04-02 12:32:17 +02:00
  • f5d434e433 Add IPv6 column in list and remove dead instance TheKinrar 2017-04-02 12:05:32 +02:00
  • 3ed75efc31 Add fr locale for community_timeline in fr.jsx Damien Erambert 2017-04-01 23:45:53 -07:00
  • cb1989cbd8 Add locale in devise.fr.yml Damien Erambert 2017-04-01 23:38:40 -07:00
  • 03d676faa8 Add french translation for "scopes" in doorkeeper.fr.yml Damien Erambert 2017-04-01 23:35:11 -07:00
  • 9e26af264e Fix small typo in doorkeeper.fr.yml Damien Erambert 2017-04-01 23:34:37 -07:00
  • f9f6098e22 Complete localization of in simple_form.fr.yml Damien Erambert 2017-04-01 23:26:26 -07:00
  • 2c881e6717 Improve french locales on the backend (WIP) Damien Erambert 2017-04-01 23:15:49 -07:00
  • 1389d5d7fd Updated list of instances for gay.crime.team jenn kaplan 2017-04-01 22:37:10 -07:00
  • 433cb198fa Fix landing page sign up form ignoring username field Eugen Rochko 2017-04-02 04:10:22 +02:00
  • 3ffa27e812 Merge pull request #720 from 0x70b1a5/master Eugen 2017-04-02 03:15:22 +02:00
  • ae43978433 improve video button visibililty Tobias Merkle 2017-04-01 21:02:30 -04:00
  • 0f05643f5d Merge pull request #718 from Wonderfall/master Eugen 2017-04-02 01:27:02 +02:00
  • 7ccc9b8b02
         Add social.targaryen.house to instances list Wonderfall 2017-04-01 23:53:00 +02:00
  • 55d275d30f Merge pull request #714 from TheKinrar/patch-1 Eugen 2017-04-01 23:10:39 +02:00
  • a8c2e44fee Fix broken reference Eugen Rochko 2017-04-01 22:29:20 +02:00
  • 808017ff18 Paperclip will complain on its own if this variable is missing Eugen Rochko 2017-04-01 22:16:26 +02:00
  • 60ebfa182f Made modal system more generic Eugen Rochko 2017-04-01 22:11:28 +02:00
  • f693ab69f3 Fix word-break in profile's note on profile page and profile component Maxime BORGES 2017-04-01 20:17:28 +02:00
  • 355168b939 Add mastodon.xyz to instances list TheKinrar 2017-04-01 18:00:52 +02:00
  • 13dfd8d109 Improve mobile tabs a little Eugen Rochko 2017-04-01 15:17:35 +02:00
  • d93d6f5124 Fix reworked search Eugen Rochko 2017-03-31 22:44:12 +02:00
  • 7ddda65269 Merge pull request #706 from alexgleason/patch-3 Eugen 2017-03-31 21:25:31 +02:00
  • b4046c5957 Rework search Eugen Rochko 2017-03-31 19:59:54 +02:00
  • d835647ec0 Put line breaks between API methods in docs Alex Gleason 2017-03-31 14:55:08 -04:00
  • 553e6dd07c Merge pull request #685 from yiskah/patch-2 Eugen 2017-03-31 16:36:29 +02:00
  • 1ee292b4cc Merge pull request #703 from alexgleason/patch-1 Eugen 2017-03-31 16:36:21 +02:00