Commit Graph

  • c3e7d4abd5 Catch error when server decryption fails on 2FA Matt Jankowski 2017-04-26 20:56:49 -0400
  • f232d2b7c9 ナビゲーションバーに図書館Wikiへのリンクを追加 Sojiro 2017-04-26 22:40:22 +0900
  • 93868254d0 Fix obvious typo, add comment Eugen Rochko 2017-04-27 14:48:48 +0200
  • bdd34cff9f Merge branch 'master' into fix-status-verification Eugen Rochko 2017-04-27 14:46:29 +0200
  • a25caa2033 Merge branch 'master' into feature-bump-version Eugen Rochko 2017-04-27 14:45:02 +0200
  • a1dac9fb32 Bump version, improve how version is stored for better commit history Eugen Rochko 2017-04-27 14:42:49 +0200
  • 88725d6ce8 OEmbed support for PreviewCard (#2337) Eugen Rochko 2017-04-27 14:42:22 +0200
  • b68a65c805 Instead of parsing shared status contents verbatim, make roundtrip to purported original URL. Confirm that the "original" URL is from the same domain as the author it claims to be from. Eugen Rochko 2017-04-27 14:35:40 +0200
  • 63a58d9c74 Changed indentation Expenses 2017-04-28 00:12:37 +1200
  • 880410f9ae Added different title for dev Expenses 2017-04-27 23:44:14 +1200
  • 24dbfbff70 Merge 7440e7eac2 into be0a01145b Rachel H 2017-04-27 11:27:32 +0000
  • efee2af764 Merge branch 'master' into favourite-export Ashley 2017-04-27 23:14:26 +1200
  • be0a01145b Sync a locale files for JavaScript (#2513) Yamagishi Kazutoshi 2017-04-27 19:03:28 +0900
  • 1f805a6377 Don't need to include ActiveModel::Validations (#2521) Tomohiro Suwa 2017-04-27 19:02:55 +0900
  • e595ccb294 Add ActivityPub Actor id to WebFinger JSON. (#2522) Evan Minto 2017-04-27 03:02:41 -0700
  • 43a29a9d0f Add aria-label to icon driven dropdown menus (#2516) Lindsey Bieda 2017-04-27 06:01:36 -0400
  • b74b597132 Improve oembed controller Eugen Rochko 2017-04-27 11:45:50 +0200
  • 682da0f4ed Extract http client to helper Eugen Rochko 2017-04-27 11:39:27 +0200
  • 5ea7f8e816 Merge remote-tracking branch 'refs/remotes/tootsuite/master' maa123 2017-04-27 17:25:49 +0900
  • 14a45114a5 Add ActivityPub Actor id to WebFinger JSON. Evan Minto 2017-04-27 00:04:38 -0700
  • 265ae080e6 Don't need to include ActiveModel::Validations Tomohiro Suwa 2017-04-27 15:52:47 +0900
  • d7aa32bfb6 Update onboard federation description Wonderfall 2017-04-27 08:21:22 +0200
  • 76b33ab614 Add aria-label to icon driven dropdown menus Lindsey Bieda 2017-04-27 00:21:16 -0400
  • 2b46e1e5f8 Sync a locale files for JavaScript Yamagishi Kazutoshi 2017-04-27 11:47:31 +0900
  • 952e9bf9bd Merge branch 'master' into master YaQ00 2017-04-27 12:08:51 +0900
  • c7e42eeb80 Merge branch 'master' of https://github.com/YaQ00/mastodon YaQ00 2017-04-27 12:01:16 +0900
  • 5be7b54fce Greater DM visibility TheInventrix 2017-04-26 19:33:36 -0600
  • f1c0da6930 Merge 28d8ca6bae into 0dd71af5fa Les Orchard 2017-04-27 00:38:45 +0000
  • 171402de03 Make vagrant HTTP port configurable Colin Mitchell 2017-04-26 20:33:49 -0400
  • 42f440c210 Merge 69e2ac8cf6 into 0dd71af5fa geta6 2017-04-26 23:54:01 +0000
  • 0dd71af5fa Copy over "Boost" hover text fix to detailed view. (#2508) Kaylee 2017-04-27 00:53:55 +0100
  • 50aca72a5a Copy over "Boost" hover text fix to detailed view. from #1754, should close out #1394 Kaylee 2017-04-26 23:48:36 +0100
  • 129e1f0d91 Check and disable "Reject media files" checkbox when suspending domain. Closes #2480 Kaylee 2017-04-26 22:07:32 +0100
  • 0618f09939 Add spec coverage and refactor authorize_follows controller (#2505) Matt Jankowski 2017-04-26 18:19:53 -0400
  • 7753d24141
    Merge branch 'master' of https://github.com/tootsuite/mastodon into launch-onboarding-tutorial Ash Furrow 2017-04-26 23:56:25 +0200
  • c7ee2cdb3c Add spec coverage and refactor authorize_follows controller Matt Jankowski 2017-04-20 21:01:28 -0400
  • a23eaf720e Update Russian translation (rebased) (#2503) Koala Yeung 2017-04-27 04:33:54 +0800
  • 9d3fc1281d travis: Add yarn and nodejs caching (#2504) Koala Yeung 2017-04-27 04:32:23 +0800
  • 82e571a2aa center .columns-area Hugo Gameiro 2017-04-26 20:04:36 +0100
  • fbe6dca919 travis: Add yarn and nodejs caching Koala Yeung 2017-04-27 02:53:15 +0800
  • d44f817e15 Update Russian translation Ratmir Karabut 2017-04-26 18:20:10 +0300
  • eb4e5113ac Fix merge conflicts Koala Yeung 2017-04-27 02:44:48 +0800
  • ce1c1871e4 Add missing strings in ru.yml Ratmir Karabut 2017-04-17 10:09:31 +0300
  • 1716986444 Remove two_factor_auth.warning (appears obsolete) Ratmir Karabut 2017-04-17 09:28:01 +0300
  • 0800dce4de Fix syntax error Ratmir Karabut 2017-04-17 09:00:48 +0300
  • 762f03dc83 Merge branch 'master' into master Eugen Rochko 2017-04-26 20:09:24 +0200
  • 8857cabca4 Domain block service cleanup (#2490) Matt Jankowski 2017-04-26 14:09:01 -0400
  • affd75936e Add spec for Status.as_home_timeline (#2451) Matt Jankowski 2017-04-26 14:08:30 -0400
  • b3649a8610 Merge da3733ae37 into 3e78b7cc3a Mykola Bilokonsky 2017-04-26 17:57:49 +0000
  • 8948dd1b87 Add spec for Status.as_home_timeline Matt Jankowski 2017-04-24 10:03:28 -0400
  • 390f7a8ac1 Merge branch 'master' into domain-block-service-cleanup Eugen Rochko 2017-04-26 19:33:24 +0200
  • 3e78b7cc3a Updated renamed i18n keys in `de` translation (#2500) Matt Jankowski 2017-04-26 13:33:10 -0400
  • 015ad7b3fe Updated renamed i18n keys in `de` translation Matt Jankowski 2017-04-26 13:26:48 -0400
  • b21915078a Merge branch 'master' into master Eugen Rochko 2017-04-26 18:57:11 +0200
  • 4dd562b953 Merge branch 'master' into domain-block-service-cleanup Eugen Rochko 2017-04-26 18:56:16 +0200
  • 8f1983099e Merge 262ce8911f into 647a148d4d Benedikt Geißler 2017-04-26 16:49:33 +0000
  • 647a148d4d fix indentation in translation file (#2498) Matthieu Paret 2017-04-26 18:48:43 +0200
  • bb777c24ff add task to report code statistics (#2489) yhirano 2017-04-27 01:47:22 +0900
  • b8f318a9cb
    fix indentation in translation file Matthieu Paret 2017-04-26 18:38:29 +0200
  • e20a42ab5e
    fix order in gemfile Matthieu Paret 2017-04-26 18:19:55 +0200
  • 36cf10060f
    add sidekiq scheduler add mastodon tasks service Matthieu Paret 2017-04-26 15:42:49 +0200
  • 69dfa609ec
    Merge branch 'master' of https://github.com/tootsuite/mastodon into launch-onboarding-tutorial Ash Furrow 2017-04-26 18:03:53 +0200
  • 57cbd186ea Merge branch 'master' into master Ratmir Karabut 2017-04-26 18:27:28 +0300
  • b14c12a692 Update Russian translation Ratmir Karabut 2017-04-26 18:20:10 +0300
  • d6f6a5fd75 add task to report code statistics Yoshiyuki Hirano 2017-04-26 23:01:10 +0900
  • 6c7b9a46ae Separate destruction of account images and account attachments Matt Jankowski 2017-04-26 10:32:47 -0400
  • e75bf69cff Extract media_from_blocked_domain method to find relevant attachments Matt Jankowski 2017-04-26 10:26:58 -0400
  • e1b67d59d7 Extract blocked_domain_accounts method to find accounts on the domain Matt Jankowski 2017-04-26 10:25:38 -0400
  • 3aba600536 Use blocked_domain method to reduce passed vars Matt Jankowski 2017-04-26 10:24:04 -0400
  • 251a1696b5 Move optional clear_media into silence_accounts method Matt Jankowski 2017-04-26 10:22:29 -0400
  • 3d2ab677c1 Move domain_block to attr_reader Matt Jankowski 2017-04-26 10:20:54 -0400
  • 25096fb024 Get rid of warning about find_each and order Matt Jankowski 2017-04-26 10:18:32 -0400
  • 4238f82425 Add coverage for domain block service with silence Matt Jankowski 2017-04-26 10:17:57 -0400
  • deb8c93b01 Merge b34ad73174 into 0576daf5f9 James 2017-04-26 14:12:46 +0000
  • 2139f5bca1 Merge 6cd16bd02f into 0576daf5f9 tom 2017-04-26 14:11:26 +0000
  • 1eb83c4d4b Change Settings maa123 2017-04-26 22:52:44 +0900
  • 87c989d364 Change Color maa123 2017-04-26 22:51:50 +0900
  • 40acde779b Merge remote-tracking branch 'refs/remotes/tootsuite/master' maa123 2017-04-26 22:50:06 +0900
  • 9d7f2fe476 Merge 019f42dcdd into 0576daf5f9 James Moore 2017-04-26 13:49:09 +0000
  • 0576daf5f9 Update German translation (#2485) Benedikt Geißler 2017-04-26 15:46:14 +0200
  • c442cade78 Update of simple_forum OC (#2486) Quent-in 2017-04-26 15:45:58 +0200
  • 6004b143a8 Update Japanese translation (#2487) Yamagishi Kazutoshi 2017-04-26 22:45:47 +0900
  • 25cbb8454c Red favicon for dev (#2470) Lindsey Bieda 2017-04-26 09:45:27 -0400
  • f1a036ff4f Merge 83139d081f into 416c9675fc Ben Roberts 2017-04-26 13:32:39 +0000
  • cc44320a1d Merge branch 'master' into dev-favicon-patch Lindsey Bieda 2017-04-26 09:31:41 -0400
  • 942fe28079 Update to remove interpolation Lindsey Bieda 2017-04-26 09:31:29 -0400
  • d00e1ea7e1 Update Japanese translation Yamagishi Kazutoshi 2017-04-26 22:15:28 +0900
  • da34fa7974 Update of simple_forum OC Quent-in 2017-04-26 15:20:37 +0200
  • 416c9675fc Don't toot request with only blank characters (#2154) Tomohiro Suwa 2017-04-26 22:18:09 +0900
  • 6a1e287053 Fix undefined variable in OnboardingModal (#2482) Yamagishi Kazutoshi 2017-04-26 22:15:47 +0900
  • 44f261b483 Update German translation Benedikt Geissler 2017-04-22 02:17:18 +0200
  • 262ce8911f Merge branch 'master' into update-german-translation Benedikt Geißler 2017-04-26 15:09:36 +0200
  • 8298bcb1f2 Update German translation Benedikt Geissler 2017-04-22 02:17:18 +0200
  • ec99efbad6 Fix undefined variable in OnboardingModal Yamagishi Kazutoshi 2017-04-26 22:00:19 +0900
  • 5bda32e460 Update ar.jsx (#2469) Koala Yeung 2017-04-26 20:55:15 +0800
  • 6137268e79 Update Japanese translation for activitypub and authorized followers (#2471) anon 2017-04-26 21:54:35 +0900
  • 56ed415195 Merge 31e6c16065 into 234e931db2 tomamplius 2017-04-26 12:54:27 +0000
  • 234e931db2 fix onboarding modal (#2477) Wonderfall 2017-04-26 14:54:12 +0200
  • 08242a22e7 Merge 5b8e810202 into fdcb55a0a6 Ashley E 2017-04-26 12:53:45 +0000
  • 6c906abe7f Merge branch 'master' into patch-1 halest 2017-04-26 14:39:19 +0200