Commit Graph

  • e91011116a Merge tag 'v1.3.2' into mathtodon 北䑓如法 2017-05-02 19:27:11 +0900
  • ea1e291af8 add ETH address Valentin Ouvrard 2017-05-02 21:18:23 +1100
  • b0a11be1fe ... Don't code when you're sick, folks. Matthew Walsh 2017-05-02 02:48:49 -0700
  • 167b260bf4 clean BTC presentation. Valentin Ouvrard 2017-05-02 20:48:38 +1100
  • 2b794c6ee0 Fixed url linking in a less hack-ish way Matthew Walsh 2017-05-02 02:47:12 -0700
  • ffd35bc0f3 Add Hebrew interface translation. Ira 2017-04-26 01:45:56 +0300
  • 29c135f98b Fixed some garbage that came up while fixing conflicts Matthew Walsh 2017-05-02 00:32:03 -0700
  • 73973b345d Merge branch 'master' of https://github.com/STJrInuyasha/mastodon into monologuing Matthew Walsh 2017-05-02 00:25:04 -0700
  • c4c82c6b71 Merge branch 'master' into feature-webpack Eugen Rochko 2017-05-02 05:17:05 +0200
  • eca4e6d03f Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> Eugen Rochko 2017-05-02 05:05:30 +0200
  • 879728c5d2 Merge pull request #5 from tomoasleep/fix/multiple-code-blocks Tomoya Chiba 2017-05-02 12:00:15 +0900
  • 859d174abf Added japanese version of terms of service and privacy policy dajieshengu 2017-05-02 11:11:45 +0900
  • 3a085dd950 Update doorkeeper.zh-CN.yml ヨイツの賢狼ホロ | 3rd style 2017-05-02 09:25:37 +0800
  • 491ce20865 Merge branch 'master' into master ヨイツの賢狼ホロ | 3rd style 2017-05-01 20:09:42 -0500
  • 557bb8ad9a
    Update zh-CN translations. KenOokamiHoro 2017-05-02 09:07:21 +0800
  • 65a9a06e03 working show.html.haml Valentin Ouvrard 2017-05-02 12:06:57 +1100
  • 9e2f8fb4ca Merge 7e7464ebe6 into f485fa31f3 May Kittens Devour Your Soul 2017-05-02 00:21:41 +0000
  • f485fa31f3 grammar fixes (#2695) Drew Gates 2017-05-01 20:21:19 -0400
  • 34ae4cf511 fix(boost-icon): Align center for Firefox (#2690) Stephen Burgess 2017-05-01 20:15:14 -0400
  • 298796cc7b annotate models (#2697) yhirano 2017-05-02 09:14:47 +0900
  • 4ff7649722 fix rubocop to add frozen_string_literal Yoshiyuki Hirano 2017-05-02 08:26:37 +0900
  • 1b72a97dc8 enable old mastodon logo after logged Valentin Ouvrard 2017-05-02 10:22:12 +1100
  • aaefca3cb4 Merge branch 'cloud' of github.com:MastodonCloud/mastodon into cloud Valentin Ouvrard 2017-05-02 10:21:24 +1100
  • 09fa2218d0 re-enable old Mastodon logo Valentin Ouvrard 2017-05-02 10:21:03 +1100
  • 38bc8df0e0 clean compose and rest Valentin Ouvrard 2017-05-02 07:58:02 +1100
  • c3bf6bb02d clean image when loggued. Valentin Ouvrard 2017-04-28 21:21:58 +1100
  • 8e9de686ec make release 3.1 stable. Valentin Ouvrard 2017-04-28 20:42:12 +1100
  • cfd3a48aa2 enable own design Valentin Ouvrard 2017-04-28 13:23:02 +1100
  • 03fb8cdc79 add rules to each locales Valentin Ouvrard 2017-04-28 08:58:03 +1100
  • 3b06d978dc Upgrade on 1.3 and Rebase our changes Valentin Ouvrard 2017-04-28 08:47:09 +1100
  • 66e0fcb0e5 add schema info to models Yoshiyuki Hirano 2017-05-02 08:01:55 +0900
  • 8479769e75 configure annotate_models Yoshiyuki Hirano 2017-05-02 07:58:40 +0900
  • 63f71dc569 rails g annotate:install Yoshiyuki Hirano 2017-05-02 07:57:45 +0900
  • 767dab4c18 add annotate to Gemfile Yoshiyuki Hirano 2017-05-02 07:57:17 +0900
  • aae32eed3b Change "Mastodon" to "instance name" on password change email notification Spyros 2017-05-02 00:52:33 +0200
  • d6f7908c08 Revert "Suggestion for using instance name instead of mastodon on email notification" Spyros 2017-05-02 00:49:19 +0200
  • 407ae6a0d9 Merge remote-tracking branch 'tootsuite/master' Spyros 2017-05-02 00:47:22 +0200
  • a4859446ab Coverage for remote follows (#2694) Matt Jankowski 2017-05-01 18:44:23 -0400
  • 78bdb2192f Merge branch 'master' into dev Rachel H 2017-05-01 15:42:25 -0700
  • 1af4936f64 Merge branch 'master' of github.com:thor-the-norseman/mastodon Thor H. Johansen 2017-05-02 00:21:01 +0200
  • 1a7fd19001 Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-05-02 00:20:36 +0200
  • 1ffe00e5ba Merge branch 'master' into master Thor Harald Johansen 2017-05-02 00:19:57 +0200
  • ad23bbff55 Changed 'en' to 'no' in activerecord.no.yml. Thor H. Johansen 2017-05-02 00:18:32 +0200
  • cb98094fa0 grammar fixes Drew Gates 2017-05-01 17:55:18 -0400
  • c9745f52fc Merge a373e0f908 into 7bffd16024 Yamagishi Kazutoshi 2017-05-01 21:25:49 +0000
  • 7a125bf8f0 Check for suspended accounts Matt Jankowski 2017-05-01 15:19:27 -0400
  • 34953d4296 Move the discovery portions of remote follow out of controller Matt Jankowski 2017-05-01 13:37:08 -0400
  • e98da38a7c Remote follow behaves more like model Matt Jankowski 2017-05-01 11:22:20 -0400
  • 9cfefbbc87 Simplify how remote follow pulls acct from session Matt Jankowski 2017-05-01 11:15:12 -0400
  • c56ed297c2 Add coverage for session[:remote_follow] having data Matt Jankowski 2017-05-01 11:11:53 -0400
  • f8e5f4aa3b Add coverage for create when webfinger is good Matt Jankowski 2017-05-01 11:08:17 -0400
  • 5170e615ca Add coverage for create with webfinger providing bad values Matt Jankowski 2017-05-01 10:40:10 -0400
  • 2351d46200 Add coverage for create with webfinger failure Matt Jankowski 2017-05-01 10:36:44 -0400
  • b4ed7fdafb Add coverage for create with empty acct value Matt Jankowski 2017-05-01 10:32:46 -0400
  • e0942254b9 clean compose and rest Valentin Ouvrard 2017-05-02 07:58:02 +1100
  • 6044ec2747 Merge 6830f0b29a into 7bffd16024 Krzysztof J. Ksor 2017-05-01 20:24:48 +0000
  • 7bffd16024 Error responses cleanup (#2692) Matt Jankowski 2017-05-01 16:24:36 -0400
  • ef3beda60e Wrap up common error code into single method Matt Jankowski 2017-04-25 20:18:44 -0400
  • fad595c51c fix(boost-icon): Align center for Firefox Stephen Burgess 2017-05-01 13:42:31 -0400
  • 70a36106fb Use respond_with_error for forbidden errors Matt Jankowski 2017-04-25 20:07:23 -0400
  • b2afa196a3 Undo these changes Tomohiro Suwa 2017-04-29 21:37:58 +0900
  • 4dbeed217c Correct Account model for rubocop Tomohiro Suwa 2017-04-28 23:03:53 +0900
  • 592897e576 Merge remote-tracking branch 'tootsuite/master' Spyros 2017-05-01 18:23:49 +0200
  • 2018526205 Make travis load schema instead of running all migrations in sequence Eugen Rochko 2017-05-01 18:21:50 +0200
  • db5db35374 Merge branch 'master' into feature-webpack Eugen Rochko 2017-05-01 18:17:48 +0200
  • 2bd46f442d Italian translation (#2654) Giuseppe Pignataro 2017-05-01 18:14:51 +0200
  • 11b706acdf fix(scrolling): Center for large screen w/o breaking horiz scroll (#2682) Stephen Burgess 2017-05-01 12:14:26 -0400
  • 33b9e8d461 fix(dropdowns): Allow for dropdowns to fill full column (#2684) Stephen Burgess 2017-05-01 12:13:10 -0400
  • f025cc6782 Filter on allowed user language preferences (#2361) Matt Jankowski 2017-05-01 11:42:13 -0400
  • 7e7464ebe6 Update mastodon.jsx May Kittens Devour Your Soul 2017-05-01 17:29:56 +0200
  • 980f6e99a3 Update mastodon.jsx May Kittens Devour Your Soul 2017-05-01 17:06:24 +0200
  • 91672a9536 i18n: Updated Polish translation m4sk1n 2017-05-01 16:37:27 +0200
  • c6036293e7 live preview: replace new line*s* to br tag*s* 北䑓如法 2017-05-01 23:35:06 +0900
  • 3988f2dade Fix Rubocop offences (#2630) yhirano 2017-05-01 23:31:02 +0900
  • 1899cf5f04 Detect extension for preview card (#2679) Yamagishi Kazutoshi 2017-05-01 23:20:57 +0900
  • 949fccfb39 Fix issue with Immutable.List().unshift(...values) not working as expected Eugen Rochko 2017-05-01 16:19:10 +0200
  • 7ad750e5f0 fix(emoji-dropdown): Restore emoji dropdown caret Stephen Burgess 2017-05-01 09:56:41 -0400
  • 533ef267e3 fix(dropdowns): Allow for dropdowns to fill full column Stephen Burgess 2017-05-01 09:41:53 -0400
  • b6a9b9bca8 Merge branch 'master' into patch-10 Quent-in 2017-05-01 15:35:32 +0200
  • 77db95b61a Merge branch 'master' into patch-10 Quent-in 2017-05-01 15:24:09 +0200
  • 1df8c855d8 fix(scrolling): Center for large screen w/o breaking horiz scroll Stephen Burgess 2017-05-01 08:37:38 -0400
  • 7b4c297782 Reset textarea height when press submit key Yamagishi Kazutoshi 2017-05-01 21:19:55 +0900
  • 41e630687b Fix code block formatters to parse multiple code blocks correctly Tomoya Chiba 2017-05-01 21:12:20 +0900
  • b295f72738 next Yamagishi Kazutoshi 2017-05-01 20:26:04 +0900
  • 7d61ca7d0f Detect extension for preview card Yamagishi Kazutoshi 2017-05-01 20:09:00 +0900
  • c9ef3bc350 Merge pull request #4 from tomoasleep/use-v1.3.2 Tomoya Chiba 2017-05-01 18:30:30 +0900
  • d4c216d73c Complete and up-to-date Norwegian translations. Thor H. Johansen 2017-05-01 11:21:18 +0200
  • d5baa690cd Fixed mistake with main Norwegian YAML file Thor H. Johansen 2017-05-01 11:14:11 +0200
  • cb69349a79 New main Norwegian YAML file. Thor H. Johansen 2017-05-01 11:09:39 +0200
  • d90f6c4a21 Merge da429b821c into 5259319cf5 Yann GUERN 2017-05-01 09:05:39 +0000
  • 3b834c3cc4 Update mastodon.jsx May Kittens Devour Your Soul 2017-05-01 09:49:55 +0200
  • ca960224fa Fixes typo in translation Audun Larsen 2017-05-01 09:40:08 +0200
  • c29c040811 Fixes typo in translation Audun Larsen 2017-05-01 09:39:41 +0200
  • a6a030dbab Translates reset password email Audun Larsen 2017-05-01 09:34:30 +0200
  • d636612728 Translates html reset password email Audun Larsen 2017-05-01 09:33:09 +0200
  • ba9dc242fe Translates password changed email Audun Larsen 2017-05-01 09:30:19 +0200
  • 40ea948712 Translates html password changed email Audun Larsen 2017-05-01 09:29:26 +0200
  • 870f27e427 Translates welcome email Audun Larsen 2017-05-01 09:27:42 +0200
  • fe67459a4a Translates html welcome email Audun Larsen 2017-05-01 09:25:17 +0200
  • fda84f7f36 Create reset_password_instructions.no.text.erb Audun Larsen 2017-05-01 09:21:58 +0200