Commit Graph

  • bec179790d Refactor locale Yann 2017-04-12 23:37:25 +0200
  • fb569de724 Refactor locale Yann 2017-04-12 23:07:26 +0200
  • a8ed0dd94b Move 'unsafe-inline' from 'default-src' to specific types. Valentin Lorentz 2017-04-12 22:55:28 +0200
  • 4573609dfc Merge remote-tracking branch 'upstream/master' into feature-admin-create-user-from-ui Yann 2017-04-12 22:53:33 +0200
  • 0e322e3cc5 Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-04-12 22:50:46 +0200
  • 2fceb3af45 Further adjustments to Norwegian translation. Thor H. Johansen 2017-04-12 22:50:05 +0200
  • 5b22ceead7 Merge remote-tracking branch 'upstream/master' into feature-admin-update-password Yann 2017-04-12 22:49:43 +0200
  • ba17ed3e33 Change user credentials from admin ui Yann 2017-04-12 22:49:40 +0200
  • 66c98d6ccf Ignore postgres/redis folder from docker-compose Lukas Burk 2017-04-12 22:07:33 +0200
  • 32fb5e22cb lol Luclu7 2017-04-12 22:06:23 +0200
  • b3f5ae1c14 Merge branch 'master' of https://github.com/tootsuite/mastodon Luclu7 2017-04-12 22:04:30 +0200
  • b18d4752cd fixing broken innerHTML JP DeVries 2017-04-12 21:51:59 +0200
  • ed32a467a8 Merge branch 'master' into master Ratmir Karabut 2017-04-12 22:41:01 +0300
  • aa56ca43b4 Update ja.jsx 新都心(Neet Shin) 2017-04-13 01:08:42 +0530
  • f72d721d56 Merge branch 'master' of https://github.com/tootsuite/mastodon Alex McGivern 2017-04-12 20:25:01 +0100
  • 36e8580c35 Merge branch 'master' into l10n-ja 新都心(Neet Shin) 2017-04-13 00:52:05 +0530
  • 0737059dea Update ja.yml 新都心(Neet Shin) 2017-04-13 00:44:21 +0530
  • f4ab6b9f2c Merge branch 'master' into skylight Eugen Rochko 2017-04-12 21:12:07 +0200
  • 4e4cb73926 Update doorkeeper.ja.yml 新都心(Neet Shin) 2017-04-13 00:40:05 +0530
  • f9e3c36d6e Update ja.jsx 新都心(Neet Shin) 2017-04-13 00:34:13 +0530
  • 3b8cd09c6d Fix tests issue introduced in #1607 Eugen Rochko 2017-04-12 21:03:58 +0200
  • 03271146bd use updated svg logo for mask-icon Dale Price 2017-04-12 14:03:57 -0500
  • cb66aadc40 Use shift+click instead of alt+click to bypass boost dialog blackle 2017-04-12 15:02:07 -0400
  • 61d3a24546 Merge branch 'master' of github.com:tootsuite/mastodon Dale Price 2017-04-12 13:56:45 -0500
  • bd834add56 Fix visuals introduced in #1463 (#1634) Eugen 2017-04-12 20:54:49 +0200
  • 8900b0127a Merge branch 'master' of https://github.com/tootsuite/mastodon Alex McGivern 2017-04-12 19:48:45 +0100
  • 014c700d32 Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-04-12 20:44:26 +0200
  • 825ae0000c Further adjustments to Norwegian translation. Thor H. Johansen 2017-04-12 20:43:39 +0200
  • 9966bd27c2 [l10n] ja: Improve Japanese Translations (#1631) lindwurm 2017-04-13 03:41:50 +0900
  • b0ab632531 Fix missing compose box when viewport width is exactly 1024px (#1632) Isabelle Knott 2017-04-12 14:40:03 -0400
  • 54532105c4 Fix visuals introduced in #1463 Eugen Rochko 2017-04-12 20:38:11 +0200
  • 3fa86d4c8d Merge branch 'master' of https://github.com/tootsuite/mastodon Alex McGivern 2017-04-12 19:33:11 +0100
  • fb6eba61b6 Fix missing compose box when viewport width is exactly 1024px blackle 2017-04-12 14:32:20 -0400
  • 1862856786 [l10n] ja: Improve Japanese Translations lindwurm 2017-04-12 01:03:11 +0900
  • e1264bbd92 Added norwegian version of terms of service and privacy policy (#1625) Knut Erik 2017-04-12 20:28:56 +0200
  • 055d3c72a7 Merge 99a6260bed into 38e24a699b Rachel H 2017-04-12 18:26:52 +0000
  • 2da639b120 fix admin input display SansPseudoFix 2017-04-12 20:19:38 +0200
  • ae3c26a962 flipped a conditional Alex McGivern 2017-04-12 19:21:11 +0100
  • 38e24a699b fix Japanese translation (#1623) pinfort 2017-04-13 03:19:38 +0900
  • bf3e56b8ad Fix incorrect notation in simple_form.ja.yml (#1620) Manato Kameya 2017-04-13 03:19:27 +0900
  • fb17375682 Merge branch 'master' into master Knut Erik 2017-04-12 20:17:57 +0200
  • 39a3f3021c Added norwegian version of terms of service and privacy policy abjectio 2017-04-12 20:16:36 +0200
  • 9b698bf448 Update fr.jsx (#1551) goofy-bz 2017-04-12 20:11:09 +0200
  • 0254ee9795 significant improvement in microformats markup (#1063) Ben Roberts 2017-04-12 14:04:33 -0400
  • 5f148cfd87 fix error introduced when merging via github Ben Roberts 2017-04-12 14:02:56 -0400
  • 6e1a15bb89 Merge pull request #13 from pinfort/translate-selfwork pinfort 2017-04-13 03:01:57 +0900
  • 3b806f5334 Merge cfca9e8e8e into e32edd247f Adrian 2017-04-12 18:01:27 +0000
  • 61ddd81cd5 文字化け修正 pinfort 2017-04-13 03:00:25 +0900
  • 0bcc6b48e7 Merge branch 'master' into patch-1 wxcafé 2017-04-12 19:58:05 +0200
  • e32edd247f Update fr.yml (#1600) CgX 2017-04-12 19:56:09 +0200
  • 331b9ccc9a Fix incorrect notation in simple_form.ja.yml Grabacr07 2017-04-13 02:54:41 +0900
  • dab9b5bd3a locale-fr: fix typo (#1603) karlyeurl 2017-04-12 19:54:16 +0200
  • 6b18322d9a update form master pinfort 2017-04-13 02:53:08 +0900
  • 0d5dc59c2f update from parent pinfort 2017-04-13 02:50:41 +0900
  • ed2e313f06 Merge branch 'master' into master Ben Roberts 2017-04-12 13:48:21 -0400
  • 2d45aceb73 Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-04-12 19:36:35 +0200
  • 5cb3046045 Merge remote-tracking branch 'upstream/master' Thor H. Johansen 2017-04-12 19:35:58 +0200
  • e17b5b228d Improve docker update instructions (#1619) Eugen 2017-04-12 19:34:40 +0200
  • fffc97f805 update translate branch from parent pinfort 2017-04-13 02:33:30 +0900
  • 5fd75ed4c5 Fixes to Norwegian translation. Thor H. Johansen 2017-04-12 19:33:15 +0200
  • 79ae1b3f20 Improve docker update instructions Eugen Rochko 2017-04-12 19:32:29 +0200
  • 17fe5b7c2e update master from parent pinfort 2017-04-13 02:31:30 +0900
  • fa4218cd7f Merge pull request #11 from NeetShin/master pinfort 2017-04-13 02:25:28 +0900
  • 97f497f999 Merge 34022a712f into c4baa9fb6b Erik Bray 2017-04-12 17:13:51 +0000
  • a875546ad8 Merge edcb625079 into c4baa9fb6b Eric Blade 2017-04-12 17:11:58 +0000
  • c4baa9fb6b vector (svg) logo with correct inner shape and colors (#1362) Julien Deswaef 2017-04-12 13:10:52 -0400
  • c2a31b8032 Fix target blank on "open_in_web" link (#1612) David Libeau 2017-04-12 19:09:58 +0200
  • 0eb2298121 Do not show link preview card if toot has a spoiler blackle 2017-04-12 12:59:35 -0400
  • 06f7d17045 Merge branch 'master' of https://github.com/tootsuite/mastodon Alex McGivern 2017-04-12 17:54:58 +0100
  • b43e3646df deduplicating the max_users check Alex McGivern 2017-04-12 17:54:29 +0100
  • 5192aecaf1 Update ja.jsx 新都心(Neet Shin) 2017-04-12 22:10:16 +0530
  • 9e63bf446e Request documentation (#1616) Shel R 2017-04-12 12:27:33 -0400
  • f63ccd8787 Change deploy Eugen Rochko 2017-04-12 18:25:34 +0200
  • c44a700252 Quick best practice cleanup of views/helpers (#1546) Matt Jankowski 2017-04-12 12:24:18 -0400
  • 963f880d2a Merge branch 'master' into quick-cleanup Eugen 2017-04-12 18:23:50 +0200
  • aa90798386 Webfinger resource to extract username from resource string (#1607) Matt Jankowski 2017-04-12 12:22:38 -0400
  • 0930ce5560 Focus textarea when text is inserted (#1320) Rachel H 2017-04-12 09:21:07 -0700
  • 7f0a865b05 Allow import/export of mutes list (#1541) Matt Jankowski 2017-04-12 12:20:44 -0400
  • 07b40d72c6 Request documentation Shel R 2017-04-12 12:16:59 -0400
  • f57ac45c2f Merge branch 'master' into mastodon-reduced-toots Shel R 2017-04-12 12:04:25 -0400
  • 02c58ce45d Refactor to use Settings::Exports::BaseController and DRY up exports code Matt Jankowski 2017-04-12 11:59:45 -0400
  • 05b8932c18 [css] reduce spacing between text elements on about pages Alex Dunn 2017-04-10 20:00:09 -0700
  • acc7ee5b90 Merge pull request #10 from pinfort/revert-9-master pinfort 2017-04-13 00:49:12 +0900
  • 22c0fb47f1 Revert "多くの不自然な翻訳を解消しました。" pinfort 2017-04-13 00:48:21 +0900
  • 68386fda55 Merge pull request #9 from NeetShin/master pinfort 2017-04-13 00:47:17 +0900
  • 179b6da733 Remove unnecessary post field in unit test Yann 2017-04-12 17:35:36 +0200
  • 481d231f4c Allow importing of mutes list Matt Jankowski 2017-04-11 10:31:46 -0400
  • a02b520304 Allow export of mutes list Matt Jankowski 2017-04-10 21:27:11 -0400
  • f27be87313 Fix target blank on "open_in_web" link David Libeau 2017-04-12 17:26:39 +0200
  • 8ccf68e8f6 Use WebfingerResource in xrd#webfinger Matt Jankowski 2017-04-11 22:35:00 -0400
  • 51bf9f06d6 Add WebfingerResource class to extract usernames Matt Jankowski 2017-04-11 22:28:21 -0400
  • 08fce08217 Add unit tests for https://github.com/tootsuite/mastodon/pull/1574 (#1584) Henry Smith 2017-04-12 17:16:59 +0200
  • 3064ef96a1 Added missing Spanish translations strings (#1292) Carlos A. Escobar 2017-04-12 10:16:40 -0500
  • ee69ece7b5 [web] Moving docs link to tootsuite/documentation (#1581) lindwurm 2017-04-13 00:13:19 +0900
  • ccede9971d Use query methods instead of explicit .blank? checks Matt Jankowski 2017-04-11 10:45:13 -0400
  • 497a8dd3b7 Remove trailing whitespace Matt Jankowski 2017-04-11 10:41:58 -0400
  • d90d23699c Make Reporting admin section translatable (#1549) Thomas Citharel 2017-04-12 17:11:49 +0200
  • 1f5ff46fd9 Working translation for Norwegian. (#1611) Thor Harald Johansen 2017-04-12 17:07:51 +0200
  • 0d8508deeb Merge branch 'master' of github.com:thor-the-norseman/mastodon Thor H. Johansen 2017-04-12 17:04:00 +0200
  • db868526f0 Working translation for Norwegian. Thor H. Johansen 2017-04-12 17:03:30 +0200