Commit Graph

  • b3d0e488e5 codeclimate: indentation + return Chronister 2017-09-18 17:02:47 -0700
  • 142ac69c3c Fix code style in application_controller according to @nightpool's suggestion, use default style in embedded.html.haml Chronister 2017-09-18 17:00:15 -0700
  • 31ffca6949 Fix emoji at the start not being converted Eugen Rochko 2017-09-19 01:59:53 +0200
  • 0d03db60b4 Merge c155d843f4 into master K.SHIRAKASHI 2017-09-19 07:56:20 +0900
  • c155d843f4 A few updates to the Spanish translation and some typos fixing (#4997) BruWalfas 2017-09-18 19:47:48 -0300
  • dd165cc643 Remove unused message Yamagishi Kazutoshi 2017-09-19 06:49:31 +0900
  • 3d640dc8ac Add will-change to improve scrolling perf (#5001) Nolan Lawson 2017-09-18 14:29:15 -0700
  • 4f7331d53d Add will-change to improve scrolling perf Nolan Lawson 2017-09-18 13:25:05 -0700
  • 53812b2d35 Merge branch 'master' of https://github.com/bruwalfas/mastodon Bru 2017-09-18 16:56:54 -0300
  • 83d367f386 Spanish e-mail messages Bru 2017-09-18 16:55:43 -0300
  • 6db034a866 Re-allow underscore on valid_url_path_ending_chars (#4999) unarist 2017-09-19 04:25:40 +0900
  • c724f4ff66 Merge pull request #90 from lnanase/merge_v1.6.1_imastodon takayamaki 2017-09-19 03:51:57 +0900
  • 17bf3363ac Add published property to ActivityPub activity for reblogs (#5000) unarist 2017-09-19 03:30:11 +0900
  • 7f41ae9b59 Add published property to ActivityPub activity for reblogs unarist 2017-09-19 02:53:40 +0900
  • e58861e653 Re-allow underscore on valid_url_path_ending_chars unarist 2017-09-19 02:44:29 +0900
  • 155619e224 Fix incomplete account records being read Eugen Rochko 2017-09-18 18:14:53 +0200
  • fc4f733ce7 Merge branch 'master' into master Yamagishi Kazutoshi 2017-09-19 01:01:16 +0900
  • cca4894a63 Yeah, so much translations Bru 2017-09-18 12:25:42 -0300
  • 0c2d4a01d0 catgram: ソースコードのURLを設定 tristar 2017-09-18 22:47:22 +0900
  • 05f9354dd8 Hardcode IdToBigints migration columns aschmitz 2017-09-18 08:04:30 -0500
  • e1ae30310b Merge dcf1139ebd into master K.SHIRAKASHI 2017-09-18 22:02:37 +0900
  • dcf1139ebd Do not add image size without meta to OGP (regression from #4901) (#4995) Yamagishi Kazutoshi 2017-09-18 22:00:29 +0900
  • 9619b7f727 Use Account.local.sum(statuses_count) instead of Status.local.count (#4996) Akihiko Odaki 2017-09-18 21:59:57 +0900
  • e6cc286622 Address review comments aschmitz 2017-09-18 07:53:03 -0500
  • d6ded3f2d9 Merge branch 'toot-master' into feat/non-serial-ids-upstream aschmitz 2017-09-18 07:45:40 -0500
  • 73f008b81f Merge tag 'v1.6.1' into imastodon lnanase 2017-09-18 21:01:36 +0900
  • 2ce6a64b10 Merge tag 'v1.6.1' into catgram tristar 2017-09-18 20:11:29 +0900
  • 3fc70b0391 explicit precedence with && Chronister 2017-09-18 02:33:27 -0700
  • 583ffc6650 Use Account.local.sum(statuses_count) instead of Status.local.count Akihiko Odaki 2017-09-18 17:04:04 +0900
  • efdf67240f codeclimate Chronister 2017-09-18 00:49:00 -0700
  • aa4d7ac389 Explicitly check current_account in application controller and only check theme availability if non-nil Chronister 2017-09-17 22:23:35 -0700
  • 9b8915bcdc Do not add image size without meta to OGP (regression from #4901) Yamagishi Kazutoshi 2017-09-18 13:20:59 +0900
  • 2d93a24d94 Merge 66be6475b6 into master K.SHIRAKASHI 2017-09-18 12:31:27 +0900
  • 66be6475b6 Bump ruby version to 2.4.2 (#4958) Daigo 3 Dango 2017-09-17 16:55:57 -1000
  • 8b13827c99 Fix codeclimate issues Chronister 2017-09-17 19:55:43 -0700
  • 9e0985d9e4 Add `strip_insignificant_zeros: true` option to `number_to_human` (#4993) Yamagishi Kazutoshi 2017-09-18 11:55:23 +0900
  • 8780db68f7 Address requested changes in themes PR Chronister 2017-09-17 19:53:01 -0700
  • cf14f4945a Some improvements in the Spanish translation (#4991) febrezo 2017-09-18 04:52:34 +0200
  • 3a277f6bc7 Custom emoji Eugen Rochko 2017-09-17 21:03:15 +0200
  • 96c9375796 Add `strip_insignificant_zeros: true` option to `number_to_human` Yamagishi Kazutoshi 2017-09-18 10:43:58 +0900
  • 8623c19795 Merge 9f2f4f9fb5 into 4c14ff659b kabuakan 2017-09-18 01:27:21 +0000
  • 9f2f4f9fb5 Merge tag 'v1.6.1' into update/v1.6.1 akanyatsu man 2017-09-18 10:24:26 +0900
  • c27fb6392f Some little changes to simple_form.es.yml Bru 2017-09-17 18:54:32 -0300
  • cbe05bd302 Updated es.yml, and fixed some ortographical errors Bru 2017-09-17 18:49:18 -0300
  • 648c1076d5 Some improvements in the Spanish translation febrezo 2017-09-17 23:47:45 +0200
  • 65c7e33df0 Some little fixes Bru 2017-09-17 16:00:42 -0300
  • 3971cc630f Merge 4c14ff659b into master K.SHIRAKASHI 2017-09-18 00:46:22 +0900
  • 4c14ff659b Oauth code in input form and add description message (#4986) v1.6.1 Lynx Kotoura 2017-09-17 22:23:44 +0900
  • dd6f9a1b82 Validate uri presence for remote status (#4985) unarist 2017-09-17 22:21:57 +0900
  • 05d504913f Validate uri presence for remote status unarist 2017-09-17 21:31:03 +0900
  • c9c42c5538 New authcode description Lynx Kotoura 2017-09-17 21:14:01 +0900
  • 310a214eeb Oauth code in a input form and add description Lynx Kotoura 2017-09-17 21:13:01 +0900
  • 0bfd5c0fbf Merge 3f07f1b2b1 into master K.SHIRAKASHI 2017-09-17 21:02:04 +0900
  • 3f07f1b2b1 Raise an error on getting activity uri for remote status (#4984) unarist 2017-09-17 20:51:34 +0900
  • 0e0f7fbaab Raise an error on getting activity uri for remote status unarist 2017-09-17 19:56:22 +0900
  • 13b2148787 Merge 44245926f1 into master K.SHIRAKASHI 2017-09-17 19:08:40 +0900
  • 44245926f1 Fix cancellation of scroll to the right (#4978) abcang 2017-09-17 18:59:23 +0900
  • 8811778b55 Randomize sidekiq-scheduler cron schedule (#4980) Patrick Figel 2017-09-17 11:58:20 +0200
  • 1eab53ee10 Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService (#4979) unarist 2017-09-17 18:54:23 +0900
  • 98a1a94fc9 Merge 7be3131240 into master K.SHIRAKASHI 2017-09-17 18:42:50 +0900
  • 7be3131240 So Spanish. Much changes. Wow. (#4976) BruWalfas 2017-09-17 06:16:43 -0300
  • c9b6e7cbfa Randomize sidekiq-scheduler cron schedule Patrick Figel 2017-09-17 10:27:22 +0200
  • 8372ca1535 Add specs unarist 2017-09-17 16:36:59 +0900
  • 06be1a0cad Fix an error when actor json couldn't be fetched in ResolveRemoteAccountService unarist 2017-09-17 15:14:16 +0900
  • e74303ab40 Fix cancellation of scroll to the right ABCanG 2017-09-17 12:52:32 +0900
  • ca6f8084b5 メールアドレスの修正 NCLS 2017-09-17 12:43:14 +0900
  • 198a9a4fa4 Remove local_only scope in Status (#4977) Akihiko Odaki 2017-09-17 12:29:43 +0900
  • 965c428daf Merge pull request #17 from tootsuite/master NCLS 2017-09-17 12:28:32 +0900
  • aca66ac0fe Merge branch 'knzk-master' of https://github.com/GenkaiDev/Mastodon into knzk-master NCLS 2017-09-17 12:27:45 +0900
  • b091e8b6cc 修正 NCLS 2017-09-17 12:27:37 +0900
  • f787916c29 競合を解決 ncls7615 2017-09-17 12:19:18 +0900
  • 5019af19c2 Remove local_only scope in Status Akihiko Odaki 2017-09-17 12:09:59 +0900
  • 21a1759578 So Spanish. Much changes. Wow. BruWalfas 2017-09-16 22:54:47 -0300
  • ec36df97c4 Escape URL parts on formatting local status (#4975) unarist 2017-09-17 04:33:52 +0900
  • ba496243ac Escape URL parts on formatting local status unarist 2017-09-17 04:14:52 +0900
  • 6d59f8ca38 Merge pull request #16 from kazu0617/feature/Add-DiscordLink NCLS 2017-09-17 02:25:48 +0900
  • c8969dca35 Minor Chinese check & jsx addition (#4973) Mingye Wang 2017-09-16 12:48:38 -0400
  • b0487488a7 Re-center hidden media text vertical Surinna Curtis 2017-09-16 11:44:17 -0500
  • 1e3b1d7211 Adjust landing pages 2 (#4967) Lynx Kotoura 2017-09-17 01:39:12 +0900
  • f5d6bdd9c0 Merge pull request #147 from yipdw/sync/upstream David Yip 2017-09-16 11:37:53 -0500
  • 0698c610a6 Fix an error in ReplyDistributionWorker when replied status was deleted (#4974) unarist 2017-09-17 01:18:00 +0900
  • ad8e856a5b Fix error when following locked accounts (#4896) Eugen Rochko 2017-09-11 23:50:37 +0200
  • 5a1d1ab6c4 Fix an error in ReplyDistributionWorker when replied status was deleted unarist 2017-09-17 00:38:28 +0900
  • b997deac85 Revert removing action buttons Lynx Kotoura 2017-09-17 00:20:15 +0900
  • d5b50ff857 zh-*: complete jsx translation Mingye Wang 2017-09-16 10:59:28 -0400
  • 77e71a5fdd zh-cn: de-monetize ya account Mingye Wang 2017-09-16 10:31:08 -0400
  • d23efbfdd3 zh-*: apply suggestions for PR #4557 Mingye Wang 2017-09-16 10:26:43 -0400
  • 395db2f4bc zh-*: transition from "like" back to "fav" Mingye Wang 2017-09-16 10:16:37 -0400
  • 629fae8b3b correct URL pattern used in text length counter in WebUI (#4968) ふぁぼ原 2017-09-16 22:01:15 +0900
  • c30e6433de Fix AP serialization error when thread is missing (#4970) unarist 2017-09-16 22:00:36 +0900
  • cea5597722 Fix hasSize condition in secSet and sizes. (#4969) Naoki Kosaka 2017-09-16 22:00:01 +0900
  • 48d77ea1eb Fix filterable_languages method of SettingsHelper (#4966) Akihiko Odaki 2017-09-16 21:59:41 +0900
  • 55c6b1cc06 Fix AP serialization error when thread is missing unarist 2017-09-16 17:35:03 +0900
  • a04947779f スタートのところのユーザーガイドとアプリをDiscordリンクとメールに差し替え。 kazu0617 2017-09-16 20:37:29 +0900
  • 989af79db2 Merge branch 'GenkaiDev-knzk-master' kazu0617 2017-09-16 20:24:19 +0900
  • 34719f1848 Merge branch 'knzk-master' of https://github.com/GenkaiDev/mastodon into GenkaiDev-knzk-master kazu0617 2017-09-16 20:24:03 +0900
  • 8b629fb327 haml変更 NCLS 2017-09-16 20:06:35 +0900
  • d64ec0a304 Fix filterable_languages method of SettingsHelper Akihiko Odaki 2017-09-16 13:53:11 +0900
  • eef2433ca8 Fix hasSize condition in secSet and sizes. Naoki Kosaka 2017-09-16 17:38:29 +0900
  • 28c692c38b Adjust landing pages 2 Lynx Kotoura 2017-09-16 17:05:59 +0900