Commit Graph

  • 04271000a4 Merge branch 'local-id' of github.com:virtualpain/mastodon into local-id virtualpain 2017-04-20 02:46:10 +0700
  • 6f16d016c8 fix InvalidLocaleData on a string virtualpain 2017-04-20 02:45:48 +0700
  • f2efac9209 Moved .bg-profile to a better place (covers following/followers page) MKody 2017-04-19 21:33:46 +0200
  • 477b5ba2ad Updated note about 'none' SMTP authentication method in .env.production.sample evilny0 2017-04-19 21:33:04 +0200
  • 6e4ff6ccd9 Merge remote-tracking branch 'origin/master' into background-profiles MKody 2017-04-19 21:32:08 +0200
  • 774ce77eb2 fix InvalidLocaleData on a string virtualpain 2017-04-20 02:31:02 +0700
  • 428b388a83 center app on larger window sizes Hugo Gameiro 2017-04-19 20:01:46 +0100
  • c88e5c5b3c move center app to components.scss Hugo Gameiro 2017-04-19 19:59:29 +0100
  • 084da71fc2 Merge pull request #1 from jeroenpraat/jeroenpraat-patch-1 jeroenpraat 2017-04-19 19:48:41 +0200
  • d888697331 Dutch language strings: a few important fixes jeroenpraat 2017-04-19 19:46:43 +0200
  • 26669ee9d0 Extract error messages to locale file alpaca-tc 2017-04-20 02:45:08 +0900
  • 09dad88853 Fixed hungarian translation (#2158) v1.2.1 György Nádudvari 2017-04-19 19:21:44 +0200
  • 7832425fdd Fix css for toot button when uploading images (#2161) Tomohiro Suwa 2017-04-20 02:21:23 +0900
  • abe16a7026 fix broken style when follower has long description (#2159) fsubal 2017-04-20 02:20:51 +0900
  • 8fb27f7427 Fix css for toot button when uploading images Tomohiro Suwa 2017-04-20 02:14:33 +0900
  • cae7cbd3ca Fixed hungarian translation György Nádudvari 2017-04-19 18:36:44 +0200
  • c270f58784 fix broken style when follower has long description subal f 2017-04-20 01:29:35 +0900
  • edc7dffdfe Merge pull request #14 from alarky/osaka-benize alarky 2017-04-20 00:53:18 +0900
  • 32815fe3d5 Merge pull request #13 from acid-chicken/osaka-master alarky 2017-04-20 00:52:38 +0900
  • 74e682c989 sainara alarky 2017-04-20 00:52:14 +0900
  • 9bdad70a51 tsurumi alarky 2017-04-20 00:51:43 +0900
  • baabbce672 Fix double-escaping of display names in <title> (#2155) Eugen 2017-04-19 17:46:24 +0200
  • cea4ee2ea9 Fix double-escaping of display names in <title> Eugen Rochko 2017-04-19 17:45:38 +0200
  • 1d47910d3b Fix possibility of unrightful webfinger redirect (#2147) Eugen 2017-04-19 17:28:35 +0200
  • 708bdd53f1 Remove unused view files in accounts/ (#2153) Matt Jankowski 2017-04-19 11:19:23 -0400
  • 2510119f19 Add meta tags for OGP to following & follow page (#2052) Yamagishi Kazutoshi 2017-04-20 00:17:32 +0900
  • 85e459f01f revert accounts/{following,followers} Yamagishi Kazutoshi 2017-04-20 00:14:32 +0900
  • 64299614d5 og:type is only accounts/show Yamagishi Kazutoshi 2017-04-19 23:55:03 +0900
  • 7ee5a50454 Follow up #2133 Yamagishi Kazutoshi 2017-04-19 21:20:34 +0900
  • b4df54d3aa simplify render helper Yamagishi Kazutoshi 2017-04-19 13:03:27 +0900
  • bcbba4f386 Add meta tags for OGP to following & follow page Yamagishi Kazutoshi 2017-04-18 11:32:45 +0900
  • 0d3b3881e2 Merge branch 'local-id' of github.com:virtualpain/mastodon into local-id virtualpain 2017-04-19 21:57:13 +0700
  • 1413b61513 Remove unused view files in accounts/ Matt Jankowski 2017-04-19 10:55:09 -0400
  • d4f57782b6 add Indonesian (Bahasa Indonesia) translation virtualpain 2017-04-19 21:37:14 +0700
  • fe1ddc3b96 fix Japanese search result translation (#2149) matsurai25 2017-04-19 23:41:30 +0900
  • 38ee95f386 Merge branch 'master' into fix/search_result_ja_text Eugen 2017-04-19 16:41:24 +0200
  • a3486e0543 Completed Italian translation (#2151) Matteo Aquila 2017-04-19 16:40:45 +0200
  • 30183c0a74 fix search text 'zero' (#2150) matsurai25 2017-04-19 23:40:24 +0900
  • 9e5159bd93 Add more tests for FollowRemoteAccountService Eugen Rochko 2017-04-19 16:37:28 +0200
  • 0520660287 add Indonesian (Bahasa Indonesia) translation virtualpain 2017-04-19 21:37:14 +0700
  • 2e0789debf Update sidekiq.yml maa123 2017-04-19 23:29:28 +0900
  • 85e382a8ce Update mastodon.jsx Matteo Aquila 2017-04-19 16:26:35 +0200
  • 154d67ff59 Update docker-compose.yml maa123 2017-04-19 23:25:10 +0900
  • 426a7a8dc1 Update index.jsx Matteo Aquila 2017-04-19 16:24:36 +0200
  • 009c7f87f7 Update sidekiq.yml maa123 2017-04-19 23:24:00 +0900
  • 2281112227 Added it.jsx Matteo Aquila 2017-04-19 16:23:02 +0200
  • c5eff11091 けもフレ化 maa123 2017-04-19 23:21:10 +0900
  • 859ca6526a Merge remote-tracking branch 'tootsuite/master' Matteo Aquila 2017-04-19 16:17:05 +0200
  • 6a67ab0ee3 Update README.md maa123 2017-04-19 23:06:36 +0900
  • e169262792 Merge remote-tracking branch 'refs/remotes/tootsuite/master' maa123 2017-04-19 22:59:39 +0900
  • fdd4868252 fix search text 'zero' matsurai25 2017-04-19 22:48:44 +0900
  • 2c5b043497 fix Japanese search result translation matsurai25 2017-04-19 22:46:20 +0900
  • 20fe22a4a9 Merge branch 'master' into feature-private-federation Eugen 2017-04-19 15:40:14 +0200
  • 15a4fc5dcc Automatically change the size of textarea (#2128) geta6 2017-04-19 22:39:46 +0900
  • a8e1afc30a Simplify render in controllers (#2144) Matt Jankowski 2017-04-19 09:37:42 -0400
  • bfbc2ca0d8 Attachment list for uncached attachments (#2110) Eugen 2017-04-19 15:37:18 +0200
  • 37185b2369 Fix possibility of unrightful webfinger redirect Eugen Rochko 2017-04-19 15:16:35 +0200
  • 649cbfa0c2 Update index.jsx 硫酸鶏 2017-04-19 22:24:33 +0900
  • b279de5426 Merge pull request #1 from alarky/osaka-master 硫酸鶏 2017-04-19 22:09:10 +0900
  • 8937372b6e Merge 01432d5473 into 5ce8a1811a Quent-in 2017-04-19 13:08:12 +0000
  • 5ce8a1811a Replace User.count -> User.confirmed.count (#2127) alpaca-tc 2017-04-19 21:58:27 +0900
  • dca0ffa1a1 Remove unnecessary word from Japanese locale (#2143) Yamagishi Kazutoshi 2017-04-19 21:54:47 +0900
  • 70891a99a9 Fix html escape characters in the URL (#2138) abcang 2017-04-19 21:52:18 +0900
  • c667698c6c Fix case when attachment type is set explicitly Eugen Rochko 2017-04-19 14:50:04 +0200
  • d2e1baa095 Remove unnecessary word from Japanese locale Yamagishi Kazutoshi 2017-04-19 21:44:58 +0900
  • cd7603719d add HTML escape test ABCanG 2017-04-19 21:38:04 +0900
  • 28ab365fbb Simplify render in controllers Matt Jankowski 2017-04-19 05:57:10 -0400
  • 3572f4423f enable to scroll the setting's page sidebar (#1347) 857b 2017-04-19 14:30:23 +0200
  • 23eea5c5ae Install Yarn dependencies during setup (#1169) Joël Quenneville 2017-04-19 08:29:23 -0400
  • 35bdacba7a capistrano: link robots.txt (#1576) Alex Dunn 2017-04-19 05:28:23 -0700
  • 97012487ed Do not show link preview card if toot has a spoiler (#1617) Isabelle Knott 2017-04-19 08:28:00 -0400
  • 91c3b50f73 == to === Eugen 2017-04-19 14:27:01 +0200
  • 9a7ea7c870 Moves from hamburger icon to asterisk. (#2116) Ash Furrow 2017-04-19 08:21:14 -0400
  • 1ac41c873a Improve visibility of mute, block, report menu in Japanese (#2131) chrolis 2017-04-19 21:21:00 +0900
  • 6c83fec971 Make configuarable s3_permissions for paperclip (#2139) tmyt 2017-04-19 21:20:36 +0900
  • 2bb54d5c57 Update title text for "reply all" button (#2118) Misty De Meo 2017-04-19 20:20:04 +0800
  • 8b8e140c71 Change to switch signature version for Amazon S3 (#2124) Yamagishi Kazutoshi 2017-04-19 21:18:50 +0900
  • 53bc988183 Merge branch 'master' into feature-attachment-list Eugen 2017-04-19 14:14:50 +0200
  • b476c54db4 put a comma after the last item ABCanG 2017-04-19 20:57:42 +0900
  • 957012c928 Merge branch 'master' into patch-ja chrolis 2017-04-19 20:57:36 +0900
  • 8bac0350d1 Restful refactor of accounts/ routes (#2133) Matt Jankowski 2017-04-19 07:52:37 -0400
  • c8042c567d Merge branch 'master' into patch-ja chrolis 2017-04-19 20:48:35 +0900
  • c0b30c56db Update ja.yml (follow for #2118) (#2137) Kota Ouchi 2017-04-19 20:44:07 +0900
  • 1cc54a47fd Make configuarable s3_permissions for paperclip Ubuntu 2017-04-19 11:43:35 +0000
  • cdc8637694 Change Messages maa123 2017-04-19 20:36:17 +0900
  • 179597d411 typo fix k0ta0uchi 2017-04-19 20:33:28 +0900
  • 129cf1c035 Change Background Image maa123 2017-04-19 20:28:33 +0900
  • a094a0b005 Update ja.yml (follow for #2118) k0ta0uchi 2017-04-19 20:05:45 +0900
  • ec0714b20d fix visibility enum index pixocode@pixel 2017-04-19 12:25:26 +0200
  • aedb2c6ab6 Remove upgrade from docker build pierreozoux 2017-04-19 11:14:16 +0100
  • f32bd7fe3a Use more restful route naming for public account follow pages Matt Jankowski 2017-04-09 20:53:18 -0400
  • 4e8ccad073 Formatting fixes * Mentions and hashtags are now handled properly (note: a space is now required between Markdown's # Headers to differentiate them) * Blockquote support Matthew Walsh 2017-04-19 02:03:57 -0700
  • 5ac0ea7c61 Improve visibility of mute, block, report menu in Japanese chrone 2017-04-19 16:50:15 +0900
  • 32c2b55951 Automatically change the size of textarea geta6 2017-04-19 16:09:26 +0900
  • c1c4c77ba7 Removing duplicate _email, and making _username consistent with existing convention Wogan May 2017-04-19 06:56:17 +0000
  • 9b61aade1d Newline fix (come ON rubocop) Wogan May 2017-04-19 06:51:55 +0000
  • bb89d73c0a Trailing whitespace fix Wogan May 2017-04-19 06:49:26 +0000
  • 489301e778 Removing about-more JSON view in favor of extending the instances#show Wogan May 2017-04-19 06:46:36 +0000
  • b218450abd Extend instances#show to return more information about the instance Wogan May 2017-04-19 06:44:07 +0000
  • 54c57f48ad Replace User.count -> User.confirmed.count alpaca-tc 2017-04-19 15:15:40 +0900