Commit Graph

  • 4445e77512 Specify middleware versions in docker-compose.yml unarist 2017-10-07 01:01:14 +0900
  • f308995c5a Merge f6cb68bc7d into 6f2d88dd28 K.SHIRAKASHI 2017-10-06 15:49:04 +0000
  • fa18175cad [i18n] Korean translation kjwon15 2017-10-07 00:22:11 +0900
  • f6cb68bc7d Fix error on reloading status detail column Kosuke Shirakashi 2017-10-06 23:52:07 +0900
  • 8197d2bc40 Encode custom emojis as resolveable objects in ActivityPub Eugen Rochko 2017-10-06 16:51:21 +0200
  • 4981a23b5d Merge remote-tracking branch 'upstream/master' Kosuke Shirakashi 2017-10-06 23:48:14 +0900
  • 6f2d88dd28 Fix error at emoji_compressed in Firefox ESR (#5241) MIYAGI Hikaru 2017-10-06 14:40:41 +0000
  • 9271588e07 Fix overflowing in web UI Lynx Kotoura 2017-10-05 02:31:38 +0900
  • daa59dd454 Fix theme settings (#5242) Lynx Kotoura 2017-10-06 20:29:53 +0900
  • e75364ce91 Fix theme settings Lynx Kotoura 2017-10-06 19:52:52 +0900
  • 72d939b69f Fix thinking_face emoji autocomplete (#5238) Nolan Lawson 2017-10-06 03:03:13 -0700
  • 2e9537e9e6 Revert "最新版" NCLS 2017-10-06 19:03:06 +0900
  • eb831706d9 Fix error at emoji_compressed in Firefox ESR MIYAGI Hikaru 2017-10-06 17:29:15 +0900
  • 1a8011648f Merge pull request #160 from glitch-soc/ugly-fix-notif-clearing Ondřej Hruška 2017-10-06 09:34:12 +0200
  • 37e141bccb
    comment out unused stuff with Video Ondřej Hruška 2017-10-06 09:23:28 +0200
  • 5d8238c377 Make rspec pass nullkal 2017-10-06 16:22:17 +0900
  • dcd8ff5308
    fix haml quotes in a bid to make travis less grumpy Ondřej Hruška 2017-10-06 09:07:04 +0200
  • d24ce425bf Merge remote-tracking branch 'upstream/master' into feature-moderation-note nullkal 2017-10-06 16:03:34 +0900
  • ac5f87b29a Add frozen_string_literal nullkal 2017-10-06 16:00:47 +0900
  • 46127fa22f Add moderation note nullkal 2017-10-06 15:53:00 +0900
  • 7d59a3dbe2 Fix thinking_face emoji autocomplete Nolan Lawson 2017-10-05 23:00:21 -0700
  • 4094c4c9cc Revert "最新版" NCLS 2017-10-06 14:00:01 +0900
  • 3ee93bbd4c 最新版 NCLS 2017-10-06 13:56:26 +0900
  • 97b3d0cd56 Import only Spring/Motion from react-motion (#5236) Nolan Lawson 2017-10-05 18:46:15 -0700
  • fd7f0732fe Compress and combine emoji data (#5229) Nolan Lawson 2017-10-05 18:42:34 -0700
  • eb5ac23434 Clean up code style of Mastodon::TimestampId module (#5232) Eugen Rochko 2017-10-06 03:42:21 +0200
  • d1e2e22d47 Merge 82050c9d3c into a5143df303 aschmitz 2017-10-06 01:37:40 +0000
  • 913d4dc818 Import only Spring/Motion from react-motion Nolan Lawson 2017-10-05 18:29:23 -0700
  • a78f43dbf7 Update brakeman config Eugen Rochko 2017-10-06 03:27:51 +0200
  • bd6e5fe58a Clean up code style of Mastodon::TimestampId module Eugen Rochko 2017-10-05 21:07:36 +0200
  • a5143df303 Add strong_migrations to production dependency (#5234) unarist 2017-10-06 10:24:54 +0900
  • 5ad7ca933d Merge b9a991ed14 into 2aca22b8ea Akihiko Odaki 2017-10-06 01:24:46 +0000
  • 2aca22b8ea import only Overlay from react-overlays (#5235) Nolan Lawson 2017-10-05 18:24:33 -0700
  • 73f5f510fe import only Overlay from react-overlays Nolan Lawson 2017-10-05 18:04:34 -0700
  • bfc618685d Compress and combine emoji data Nolan Lawson 2017-10-03 17:43:28 -0700
  • e6d42c36eb Add strong_migrations to production dependency unarist 2017-10-06 08:11:55 +0900
  • 7db0f8dcb2 Implement hotkeys for web UI (#5164) Eugen Rochko 2017-10-06 01:07:59 +0200
  • 49cc0eb3e7 Improve admin UI for custom emojis, add copy/disable/enable (#5231) Eugen Rochko 2017-10-05 23:42:05 +0200
  • b9c76e2edb When processing custom emoji, ensure a non-animated version exists (#5230) Eugen Rochko 2017-10-05 23:41:47 +0200
  • f82e90bf11
    workaround for notif clearing Ondřej Hruška 2017-10-05 21:55:02 +0200
  • 1d3b1ba621 Improve admin UI for custom emojis, add copy/disable/enable Eugen Rochko 2017-10-05 19:45:59 +0200
  • decabd99bf When processing custom emoji, ensure a non-animated version exists Use the non-animated version in web UI, but return both in API Eugen Rochko 2017-10-05 17:50:41 +0200
  • cc4a4cd168 Merge a626e76051 into 2559d9166c xserverjp 2017-10-05 10:55:19 +0000
  • 298bcbedaa Avoid parsing nil as time zunda 2017-10-04 22:55:14 -1000
  • b1b5d34d76 Adjust coding style, trust input, and stop worrying zunda 2017-10-04 22:45:37 -1000
  • 8233f683b0 Avoid rescuing JSON::ParserError with using valid JSON for tests zunda 2017-10-04 22:39:34 -1000
  • 4263762083 Log delays in delivery of toots zunda 2017-10-02 21:46:05 -1000
  • a4472bd7c2 friends.nicoからチュートリアル機能を輸入 mtsue 2017-10-03 20:03:37 +0900
  • 9013eb0d10 Merge 89fc08a86a into 2559d9166c Akihiko Odaki 2017-10-04 23:07:09 +0000
  • 2559d9166c Fix regression in FetchRemoteResourceService (#5217) ThibG 2017-10-05 00:21:44 +0200
  • 32e8a87830 adjust public profile pages 2 (#5223) Lynx Kotoura 2017-10-05 05:49:36 +0900
  • 5f010b1229 adjust public profile pages 2 Lynx Kotoura 2017-10-05 03:18:09 +0900
  • 8060eb6c09 Update specs to match interface changes made in #5114 Thibaut Girka 2017-10-04 20:17:22 +0200
  • 89d0791efb Fix regression in FetchRemoteResourceService Thibaut Girka 2017-10-04 16:59:37 +0200
  • 636acb5712 Update German translation (#5221) Jakob Kramer 2017-10-04 20:03:41 +0200
  • a626e76051 Merge remote-tracking branch 'tootsuite/master' into hota/master lindwurm 2017-10-05 02:52:37 +0900
  • a170c1e086 Update German translation Jakob Kramer 2017-10-04 19:25:27 +0200
  • a7f346a0b1 Fix focusing notifications column, fix hotkeys in compose textarea Eugen Rochko 2017-10-04 19:06:03 +0200
  • b406e3cc4c Fix #5050 - Use summary_large_image only with media attachments (#5219) Eugen Rochko 2017-10-04 19:06:23 +0200
  • 3d16bc71dc Fix #5050 - Use summary_large_image only with media attachments Eugen Rochko 2017-10-04 18:52:28 +0200
  • 099415560c Merge c2955d99f6 into 43577e9f59 cookie 2017-10-04 16:16:50 +0000
  • 43577e9f59 Fix style of email domain block table (#5218) Lynx Kotoura 2017-10-05 01:16:30 +0900
  • 507c86a382 add toot visibillity icons on status lnanase 2017-10-04 23:40:41 +0900
  • 9ae73ecc65 Fix style of email domain block table Lynx Kotoura 2017-10-05 00:33:09 +0900
  • 977d342d5f 最新版 NCLS 2017-10-04 23:36:57 +0900
  • ecfa1c3f3b fix error (When part of conversation has already been deleted.) (#5216) MitarashiDango 2017-10-04 23:28:39 +0900
  • f6ec9b8771 fix error (When part of conversation has already been deleted.) MitarashiDango 2017-10-04 23:05:26 +0900
  • b3af3f9f8c Implement EmailBlackList (#5109) utam0k 2017-10-04 22:16:10 +0900
  • 82050c9d3c Set backdated timestamp IDs on new old Statuses aschmitz 2017-10-03 23:08:13 -0500
  • 85a1ddccc8 Rename BlacklistedEmailDomain to EmailDomainBlock utam0k 2017-10-04 21:23:16 +0900
  • 5c399ee6f1 Merge 8a826716cd into d5091387c6 Akihiko Odaki 2017-10-04 11:26:20 +0000
  • d5091387c6 Supply @instance variable in password reset instructions / password change mailer (#5215) Ryo Kajiwara 2017-10-04 20:25:24 +0900
  • 22e8c2ddca Supply @instance variable in password reset instructions / password change mailer Ryo Kajiwara 2017-10-04 20:11:08 +0900
  • a2c8dca7b7 Merge remote-tracking branch 'tootsuite/master' into hota/master lindwurm 2017-10-04 18:39:31 +0900
  • 87298197d2 fix mismerge lindwurm 2017-10-03 18:31:25 +0900
  • 178f718a9b Separate notifications preferences from general preferences (#4447) Yamagishi Kazutoshi 2017-10-04 17:22:52 +0900
  • 38d851c74f Merge 9a805f7a3b into 0e1b0f2747 ねじりわさび 2017-10-04 07:59:39 +0000
  • 0e1b0f2747 Check Webfinger-returned author URI even when not redirected (#5213) ThibG 2017-10-04 09:59:28 +0200
  • 468523f4ad Non-Serial ("Snowflake") IDs (#4801) aschmitz 2017-10-04 02:56:37 -0500
  • 2076c557c9 Configure webpack to poll for changes in development (#5040) aschmitz 2017-10-04 02:52:11 -0500
  • d40c9140e8 Fix undefined local variable (regression from #5114) (#5210) Yamagishi Kazutoshi 2017-10-04 16:51:42 +0900
  • 9a805f7a3b
    Better Japanese translation yuzulabo 2017-10-04 16:50:51 +0900
  • 4080f7484f Check Webfinger-returned author URI even when not redirected Thibaut Girka 2017-10-04 08:25:19 +0200
  • 07baf2ffce Run db:schema:load hooks for test in development aschmitz 2017-10-03 22:40:56 -0500
  • 6c3aafa565 Fix undefined local variable (regression from #5114) Yamagishi Kazutoshi 2017-10-04 11:55:13 +0900
  • d4621d0246 Heredoc cleanup aschmitz 2017-10-03 21:54:09 -0500
  • 5ab954fca9 remove preferences.notifications Yamagishi Kazutoshi 2017-10-04 10:36:19 +0900
  • bee65c0588 Merge 6e2ad13ed3 into 632178d754 Akihiko Odaki 2017-10-04 01:26:08 +0000
  • 1f62b888af Merge 6ea23d8ddb into 632178d754 Akihiko Odaki 2017-10-04 01:26:07 +0000
  • 4f4bc4c903 Only poll in Vagrant aschmitz 2017-10-03 20:21:57 -0500
  • 8493963676 Merge branch 'master' into feature-hotkeys Eugen Rochko 2017-10-04 02:08:34 +0200
  • 3c542372db 修正 NCLS 2017-10-04 08:47:51 +0900
  • 9008df90a0 修正 NCLS 2017-10-04 08:45:38 +0900
  • 9d7636fe28 最新版 NCLS 2017-10-04 08:40:38 +0900
  • 632178d754 Use own, shorter relative timestamps (#5171) Eugen Rochko 2017-10-04 01:23:52 +0200
  • 291feba6f1 Follow up to #5172, clean up notifications after mute like after block (#5198) Eugen Rochko 2017-10-04 01:22:33 +0200
  • 63f0979799 Validate id of ActivityPub representations (#5114) Akihiko Odaki 2017-10-04 08:13:48 +0900
  • ec13cfa4f9 When a streaming API status arrives, sort it into conversations (#5206) Eugen Rochko 2017-10-04 01:01:44 +0200
  • a7ae2a5e12 Bump version to 2.0.0rc1 Eugen Rochko 2017-10-04 00:44:04 +0200
  • cdd5ef691b Use separate workers to process imports, retry failures (#5207) Eugen Rochko 2017-10-04 00:39:32 +0200