tykayn
/
mastodon
mirror of https://framagit.org/tykayn/mastodon.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Commit Graph

  • ce9df2fa82 Optimize filter methods in FeedManager a bit, use redis pipelining on merge/unmerge feed methods, do not re-create a dynamic class on each feed push call, make sure redis-rb uses hiredis Eugen Rochko 2017-04-04 13:01:14 +0200
  • 3abb0f7bc7 Merge branch 'master' into development halna_Tanaguru 2017-04-04 12:06:53 +0200
  • db4a41cf58 Merge branch 'master' into master JantsoP 2017-04-04 08:41:46 +0200
  • dc89fc17cc updated translation JantsoP 2017-04-04 08:29:53 +0200
  • b8243c1b49 changed line 25 for better translation JantsoP 2017-04-04 08:26:59 +0200
  • e81ba26be9 More consistent typography Leo Wzukw 2017-04-04 06:58:17 +0200
  • c22388fc79 Fix typo in Heroku guide walfie 2017-04-04 00:00:56 -0400
  • eb023beb49 Fix #808 - smaller elephant friend PNG for frontpage Eugen Rochko 2017-04-04 02:03:16 +0200
  • b510a56c0c Only call regeneration worker after first login after a 14 day break Eugen Rochko 2017-04-04 02:00:10 +0200
  • 4c53af64f0 Fix ActionController::Parameters in API issue Eugen Rochko 2017-04-04 01:33:34 +0200
  • f722bd2387 Separate background jobs into different queues. ATTENTION: new queue "pull" must be added to the Sidekiq invokation in your systemd file Eugen Rochko 2017-04-04 00:53:20 +0200
  • ce1ca28594 Changed "reblogs" to "boosts" Neville Park 2017-04-03 17:45:36 -0400
  • 5b6f4fdeb4 Add octodon.social Alice 2017-04-03 23:05:03 +0200
  • 8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions Eugen Rochko 2017-04-03 22:54:46 +0200
  • 3f30ae1f97 accessibility fix halna_Tanaguru 2017-04-03 22:45:29 +0200
  • 1ed37fae9b Add fern.surgeplay.com to the instances list Aesen 2017-04-03 15:52:33 -0400
  • cc451e1fcb update social.targaryen.house info Wonderfall 2017-04-03 21:36:28 +0200
  • 0700521ef3 added Esperanto (eo) axolotl 2017-04-03 20:22:50 +0200
  • 98a93aa07e Fix norwegian translation being malformed Eugen Rochko 2017-04-03 19:50:55 +0200
  • 68f829e11c Add basic logging of who resolved report Eugen Rochko 2017-04-03 19:27:30 +0200
  • 71458dc6df When taking action on a report (silence/suspend), it dismisses all other reports for that user automatically Eugen Rochko 2017-04-03 19:17:56 +0200
  • ec8029a955 Updated and fixed orthography Korbinian 2017-04-03 19:10:48 +0200
  • 7dd5ba42a3 Updated and fixed german orthography Korbinian 2017-04-03 19:01:17 +0200
  • b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block Eugen Rochko 2017-04-03 18:55:06 +0200
  • 8a45a97e2e Add instances from instances.mastodon.xyz shel 2017-04-03 12:28:36 -0400
  • f6e9251054 Merge pull request #777 from chriswk/master Eugen 2017-04-03 18:06:37 +0200
  • 9738aaf5fb Merge pull request #782 from wxcafe/patch-1 Eugen 2017-04-03 18:06:16 +0200
  • ce433e22f6 Merge pull request #784 from singingwolfboy/github-capitalized Eugen 2017-04-03 18:06:02 +0200
  • 5652f00d81 GitHub should be capitalized David Baumgold 2017-04-03 11:44:11 -0400
  • d06c810b16 Adds social.wxcafe.net wxcafé 2017-04-03 17:32:25 +0200
  • 5cb011b66b Add Norwegian locale Christopher Kolstad 2017-04-03 15:44:05 +0200
  • 663e5378c0 Merge pull request #775 from JantsoP/master Eugen 2017-04-03 15:04:51 +0200
  • 65d667dc6c another typo. fuck me JantsoP 2017-04-03 14:56:13 +0200
  • d3fde60297 fixed an sneaky peaky tpy JantsoP 2017-04-03 14:54:53 +0200
  • 85a8b62ca2 add finnish translation JantsoP 2017-04-03 14:43:07 +0200
  • 97803600ed add finnish translation JantsoP 2017-04-03 14:20:50 +0200
  • a229840ffe fixed typo JantsoP 2017-04-03 14:16:03 +0200
  • bfa99981e5 Merge branch 'master' into master JantsoP 2017-04-03 13:50:57 +0200
  • 6501ffdadc add finnish translation JantsoP 2017-04-03 13:35:12 +0200
  • ae95f35fe6 add finnish translation JantsoP 2017-04-03 13:34:26 +0200
  • 22f88b845a add finnish translation JantsoP 2017-04-03 13:33:43 +0200
  • eabb86b124 add finnish language JantsoP 2017-04-03 13:32:10 +0200
  • b0f4c9b91f finnish translation JantsoP 2017-04-03 13:25:46 +0200
  • f9b4f30de6 updated final translation JantsoP 2017-04-03 13:07:09 +0200
  • 01b79beca4 Merge pull request #769 from Angristan/patch-1 Eugen 2017-04-03 12:59:41 +0200
  • 5d854f37b4 Merge pull request #764 from ticky/tweak-quick-start-area Eugen 2017-04-03 12:59:16 +0200
  • 92a0b3d73a Merge pull request #765 from marrus-sh/mastodon-API-update Eugen 2017-04-03 12:58:38 +0200
  • 2f7139c6b5 Merge pull request #768 from marvinkopf/mutedropdown Eugen 2017-04-03 12:53:49 +0200
  • 87854745e9 Create new translation file JantsoP 2017-04-03 12:42:09 +0200
  • 69fc95a2f5 Create Finnish translation for Mastodon JantsoP 2017-04-03 12:09:33 +0200
  • c97fc5c1f4 Improve french translation Angristan 2017-04-03 11:04:00 +0200
  • 1236a12cae add mute option in status dropdown Marvin Kopf 2017-04-03 09:56:01 +0200
  • b455cbc6d3 "direct" in statuses#create Kibigo! 2017-04-03 01:23:37 -0700
  • a9db64cf26 Forgot `direct` statuses :P Kibigo! 2017-04-02 22:46:10 -0700
  • 5d2f1d600d Typofixes Kibigo! 2017-04-02 21:17:07 -0700
  • 5d65aa3bf9 Code now code Kibigo! 2017-04-02 21:13:15 -0700
  • 565568dd9c Merging 'upstream' updates Kibigo! 2017-04-02 21:07:07 -0700
  • 6e41ef55ed Updated API docs Kibigo! 2017-04-02 21:03:49 -0700
  • 2d384850cb Fix the position of the Mastodon mascot in the UI Jessica Stokes 2017-04-03 13:16:14 +1000
  • 1a5ab538de Merge pull request #760 from ProgVal/patch-2 Eugen 2017-04-03 03:40:34 +0200
  • 3f650c06b6 Merge pull request #757 from yiskah/patch-4 Eugen 2017-04-03 03:40:20 +0200
  • 71b9205679 Merge pull request #759 from Wonderfall/master Eugen 2017-04-03 03:40:00 +0200
  • 6b9c50117f Merge pull request #748 from ProgVal/patch-1 Eugen 2017-04-03 03:39:35 +0200
  • fbcba65f81 Improve French translation Valentin Lorentz 2017-04-03 03:16:37 +0200
  • b7beb4368c
         use alpine-based official images Wonderfall 2017-04-03 03:09:56 +0200
  • e2526a62e7 Add social.imirhil.fr shel 2017-04-02 20:11:28 -0400
  • 61f90f15b0 Merge pull request #743 from Kazhnuz/master Eugen 2017-04-03 01:10:36 +0200
  • d2358aefec Merge branch 'master' into master Eugen 2017-04-03 01:07:53 +0200
  • 30df1c8476 Merge pull request #751 from Wonderfall/master Eugen 2017-04-03 01:03:42 +0200
  • b8d2373e0b Update Dockerfile Wonderfall 2017-04-03 00:56:05 +0200
  • 92d35c52d9 update Dockerfile Wonderfall 2017-04-03 00:46:44 +0200
  • d7d60073f9 Merge pull request #744 from fpiesche/master Eugen 2017-04-03 00:26:24 +0200
  • 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales Eugen 2017-04-03 00:25:56 +0200
  • ce495138ac Merge pull request #747 from Themimitoof/patch-1 Eugen 2017-04-03 00:25:37 +0200
  • 9ca548c17e Also fix the start command. Valentin Lorentz 2017-04-03 00:10:51 +0200
  • 82ae07e48b Fix install instructions. Valentin Lorentz 2017-04-03 00:08:40 +0200
  • b69e97c40b add link to another mastodon instance. Michael Vieira 2017-04-03 00:04:54 +0200
  • c76d20c2a0 Add forgotten comma Kazhnuz 2017-04-02 23:39:41 +0200
  • 590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. Florian Piesche 2017-04-02 22:31:43 +0100
  • 4f7cce25ac Add more lcoales in fr.jsx Damien Erambert 2017-04-02 14:23:40 -0700
  • 633e5ec6f6 Update French Translation Kazhnuz 2017-04-02 23:18:01 +0200
  • e92796b49c Add info on CW tags not automatically hiding images. Florian Piesche 2017-04-02 22:07:23 +0100
  • a729d0c2b1 Add user guide to README toc Florian Piesche 2017-04-02 22:05:21 +0100
  • 71cf9d0608 Fix typo in simple_form.fr.yml Damien Erambert 2017-04-02 14:04:06 -0700
  • 5e45982ed9 Improve translation of data import in fr.yml Damien Erambert 2017-04-02 14:03:57 -0700
  • b829460b4a Better translation for revoked token in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:41 -0700
  • 65e6a00817 Fix date format in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:31 -0700
  • 60a82c9022 Update to catch up with new features and add missing images. Florian Piesche 2017-04-02 22:03:00 +0100
  • b277e88aae Write up reporting. Florian Piesche 2017-04-02 21:45:51 +0100
  • 03b2f37b46 Add information about the Direct privacy setting. Florian Piesche 2017-04-02 21:39:05 +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
  • 2cd792fc3d Merge pull request #737 from nevillepark/patch-2 Eugen 2017-04-02 22:23:11 +0200
  • 09b4b65fde Merge pull request #740 from 0x70b1a5/master Eugen 2017-04-02 22:22:56 +0200
  • 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales Eugen 2017-04-02 22:22:44 +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
  • aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant refreshes on navigation Eugen Rochko 2017-04-02 21:44:06 +0200
  • 3618cc04ff Add heartbeat to websockets streaming API connections Eugen Rochko 2017-04-02 21:27:14 +0200
  • 2d07cb5771 Catching rack timeout from rails doesn't work Eugen Rochko 2017-04-02 21:12:18 +0200
  • f25fc04ea1 single-quotes Tobias Merkle 2017-04-02 14:55:13 -0400
  • ca21be3e16 remove black border on buttons Tobias Merkle 2017-04-02 14:54:24 -0400