Commit Graph

  • 3ab42f1779 Add color coding to audit log Eugen Rochko 2017-11-24 00:11:18 +0100
  • d0778a9f7d Merge c09d21895c into 801eee0ff3 Eugen Rochko 2017-11-23 22:57:14 +0000
  • 279780ad47
    Update en.yml Marcin Mikołajczak 2017-11-23 22:52:19 +0100
  • faad820458 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-11-23 21:17:14 +0000
  • 7696ffb69e 🇵🇱 (#5795) Marcin Mikołajczak 2017-11-23 21:55:13 +0100
  • 801eee0ff3 Disable Code Climate maintainability checks (#5798) Devon Blandin 2017-11-23 15:38:17 -0500
  • a71a672a5c
    Disable Code Climate maintainability checks Devon Blandin 2017-11-23 15:17:36 -0500
  • a1ff3f00ff
    Update terminology (e-mail blacklist) Marcin Mikołajczak 2017-11-23 20:02:17 +0100
  • 3f34743b15
    🇵🇱 Marcin Mikołajczak 2017-11-23 19:51:35 +0100
  • db62c7648b 通知音のカスタマイズ ahiru 2017-11-24 01:39:41 +0900
  • 6bf80abeca ふぁぼ♪りつい〜と♪ ahiru 2017-11-24 01:23:01 +0900
  • 41c71565c2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-11-23 02:17:12 +0000
  • bc4a726c24 i18n: (zh-CN) Add translations for #5746 & #5735 (#5764) SerCom_KC 2017-11-23 09:49:21 +0800
  • 1c8fcf7d16 Redesign audit log page Eugen Rochko 2017-11-23 00:41:47 +0100
  • 81471ee9dd Merge branch 'feature-mod-accountability' of github.com:tootsuite/mastodon into feature-mod-accountability Eugen Rochko 2017-11-22 23:49:55 +0100
  • 8ea0ded8e3 Split admin navigation into moderation and administration Eugen Rochko 2017-11-22 23:42:08 +0100
  • 013b604ca1 i18n: Update Polish translation (#5782) Marcin Mikołajczak 2017-11-22 14:34:20 +0100
  • 158c079106 i18n: Update Polish translation Marcin Mikołajczak 2017-11-22 06:00:43 +0100
  • 8382cd0fb0 Merge remote-tracking branch 'upstream/master' ahiru 2017-11-22 19:53:07 +0900
  • 95700b577b Delegate #version_number and #source_url to Mastodon::Version Yosuke Kabuto 2017-11-22 15:25:30 +0900
  • 7454ffad54 Add test for InstancePresenter#thumbnail Yosuke Kabuto 2017-11-22 15:24:12 +0900
  • 423a7ab983 changed to v2 ahiru 2017-11-22 12:47:55 +0900
  • 2585649b20 Styling fixes kibigo! 2017-11-21 19:00:07 -0800
  • 12c0011fee Update statuses on hidden toggle (Fixes #227) kibigo! 2017-11-21 18:27:34 -0800
  • 8812bab687 Minor fixes kibigo! 2017-11-21 18:17:38 -0800
  • b5d5063560 Log creates, updates and destroys with history of changes Eugen Rochko 2017-11-22 02:17:00 +0100
  • a37a1b38b8 Remove validation tests Yosuke Kabuto 2017-11-22 10:06:36 +0900
  • 2a5af9c10c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-11-21 17:17:11 +0000
  • 3c83b7e06e i18n: Update Polish translation - front-end added (#231) Marcin Mikołajczak 2017-11-21 17:53:13 +0100
  • fc2155019b Add Japanese translations. (#5769) mayaeh 2017-11-22 01:11:33 +0900
  • b7a7eb84dd
    update code of conduct email address beatrix 2017-11-21 11:01:28 -0500
  • f83af9629a Allow to open a modal for embedded photo Akihiko Odaki 2017-11-22 00:05:25 +0900
  • 1a07b83c69 i18n: Update Polish translation - back-end (#230) Marcin Mikołajczak 2017-11-21 16:36:22 +0100
  • 53b7b81b43 Update and fix Catalan translation (#5773) Joan Montané 2017-11-21 15:17:28 +0100
  • ff62c4677b
    Merge pull request #2 from m4sk1n/ca Joan Montané 2017-11-21 14:40:29 +0100
  • 5c2b46841d
    fix syntax errors in ca translations Marcin Mikołajczak 2017-11-21 14:22:33 +0100
  • 6ce6ef1d7f
    Merge pull request #1 from m4sk1n/patch-1 Joan Montané 2017-11-21 13:41:47 +0100
  • 343d24333f
    fix syntax error for ca translation Marcin Mikołajczak 2017-11-21 13:20:50 +0100
  • 03d43d38c1
    Update simple_form.ca.yml Joan Montané 2017-11-21 13:03:56 +0100
  • c55dd0dc9e
    Update doorkeeper.ca.yml Joan Montané 2017-11-21 12:57:12 +0100
  • 9e20dcb363
    Update devise.ca.yml Joan Montané 2017-11-21 12:43:12 +0100
  • 4b7b87d37f
    Update ca.yml Joan Montané 2017-11-21 12:28:49 +0100
  • 69df674f67
    Update activerecord.ca.yml Joan Montané 2017-11-21 11:50:50 +0100
  • b78c069038
    Update README.md NCLS 2017-11-21 17:14:50 +0900
  • f56fa0b98a
    Update README.md NCLS 2017-11-21 17:14:41 +0900
  • 4cd31ce03b Add tests for Streamable Yosuke Kabuto 2017-11-21 17:02:49 +0900
  • bdbbd06dad Finalized theme loading and stuff kibigo! 2017-11-20 22:13:37 -0800
  • 8f3e5f6128 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-11-21 05:17:12 +0000
  • 6f609dc4b4 Add tests for Remotable (#5768) ysksn 2017-11-21 13:59:36 +0900
  • 610563a21f Add Japanese translations. Maya Minatsuki 2017-11-21 13:54:06 +0900
  • a1172a799c Add tests for Remotable Yosuke Kabuto 2017-11-21 13:17:16 +0900
  • 3dce6cbbd7 Fixed duplicating URL of photo type of oEmbed (#5763) abcang 2017-11-21 04:45:54 +0900
  • 02611b35dc
    Merge pull request #75 from KnzkDev/feature/byebye-robots NCLS 2017-11-21 02:16:25 +0900
  • ab96ed5927 Bye-bye robots ANNotunzdY 2017-11-21 02:13:21 +0900
  • 315cb734c9 Fixed duplicating URL of photo type of oEmbed ABCanG 2017-11-21 02:03:22 +0900
  • 84596451eb Rubocop fixes aschmitz 2017-11-20 11:05:15 -0600
  • 8d52c228dc Allow hiding of reblogs from followed users aschmitz 2017-11-09 08:41:10 -0600
  • 90d125dbb9 i18n: (zh-CN) Add translations for #5746 & #5735 SerCom_KC 2017-11-20 22:14:13 +0800
  • a8d2bc5600
    Merge pull request #73 from KnzkDev/revert-72-change-order-column NCLS 2017-11-20 22:24:28 +0900
  • 24ebbf920c
    Merge pull request #74 from KnzkDev/revert-71-custom-tutorial NCLS 2017-11-20 22:24:17 +0900
  • a52997755e
    Revert "Custom Tutorial" NCLS 2017-11-20 22:24:00 +0900
  • a03eac4c9d
    Revert "Change default columns order" NCLS 2017-11-20 22:23:36 +0900
  • 1f1dd2ed04
    Merge pull request #71 from utam0k/custom-tutorial NCLS 2017-11-20 21:57:13 +0900
  • 9d2171e81b
    Merge pull request #72 from utam0k/change-order-column NCLS 2017-11-20 21:57:02 +0900
  • 8c260e62d1 Change default columns order utam0k 2017-11-20 21:25:11 +0900
  • c5eb47e6ee Custom Tutorial utam0k 2017-11-20 21:34:12 +0900
  • f546fe6270 Change default columns order utam0k 2017-11-20 21:25:11 +0900
  • 2e50619756 Merge branch 'change-favicon' ahiru 2017-11-20 21:16:12 +0900
  • 872c566d4f アイコン系を適当に変更 ahiru 2017-11-20 21:14:33 +0900
  • 05bdf1ff16 Refactor emojify in app/javascript/mastodon/features/emoji/emoji.js Akihiko Odaki 2017-10-30 13:07:35 +0900
  • c09d21895c Display deleted statuses inside reports Eugen Rochko 2017-11-20 03:21:30 +0100
  • 87457c85ea Soft-delete statuses, really delete after 30 days Eugen Rochko 2017-11-20 02:43:51 +0100
  • 2bef3ecf49 Update brakeman whitelist Eugen Rochko 2017-11-19 20:34:22 +0100
  • fe805b0f61 Add logging of admin actions Eugen Rochko 2017-11-19 20:23:41 +0100
  • d617596cd6 Merge 173e46443c into 2bcc81700c ThibG 2017-11-19 16:07:14 +0000
  • a36a2c1796 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-11-19 15:17:12 +0000
  • 2bcc81700c Fix NoMethodError at ActivityPub::FetchRemoteStatusService (#5753) abcang 2017-11-19 23:33:15 +0900
  • 53e95c4efc Fix N+1 at notification (#5752) abcang 2017-11-19 23:32:48 +0900
  • e45cb0837b Update .following_map examples with show-reblogs information. David Yip 2017-11-19 02:56:45 -0600
  • 90752d33fc Fix N+1 at notification ABCanG 2017-11-19 16:33:15 +0900
  • 8a8d0c004d Fix NoMethodError at ActivityPub::FetchRemoteStatusService ABCanG 2017-11-19 16:59:27 +0900
  • d083f7741a Merge remote-tracking branch 'tootsuite/master' David Yip 2017-11-19 01:30:29 -0600
  • 7a6474be09 Merge 30296f5c07 into 08deec4c84 ThibG 2017-11-19 03:40:07 +0000
  • d1bf3e6a4a Merge 2a2f6fda6d into 08deec4c84 ysksn 2017-11-19 03:25:54 +0000
  • 08deec4c84 i18n: Update ja translation for moderator badge. (#5731) mayaeh 2017-11-19 12:16:56 +0900
  • 2590aac863 Add tests for AccountInteractions (#5751) ysksn 2017-11-19 12:16:14 +0900
  • 3d1d3d9a20 Remove translations of default theme (#5741) Lynx Kotoura 2017-11-19 12:15:50 +0900
  • 8f638a2bf2 Add a test for Settings::Extend#settings (#5720) ysksn 2017-11-19 12:15:32 +0900
  • 9d9b1aff1e Add tests for Status#title (#5718) ysksn 2017-11-19 12:15:17 +0900
  • bfdcf76a64 Add “staff” badge to admin user pages (#5735) Yamagishi Kazutoshi 2017-11-19 12:13:57 +0900
  • acba1fa63d Add tests for instance methods of AccountInteractions Yosuke Kabuto 2017-11-19 10:56:01 +0900
  • c513a19bac Add tests for class methods of AccountInteractions Yosuke Kabuto 2017-11-19 10:55:14 +0900
  • bcda3f85ce
    Merge pull request #226 from glitch-soc/glitch-theme beatrix 2017-11-18 20:32:17 -0500
  • e29aac7c59 Merge d26bfa02ac into b380e9d2cb Johannes Löthberg 2017-11-18 23:24:43 +0000
  • 321fa41930 Merge remote-tracking branch 'cybre/theme_win95' into glitch-theme kibigo! 2017-11-18 15:18:00 -0800
  • a9ed857171 WIP static themeing kibigo! 2017-11-18 15:12:52 -0800
  • f1b0c6b4c5 Display list column Eugen Rochko 2017-11-18 22:14:52 +0100
  • b380e9d2cb i18n: Update Polish translation (#5749) Marcin Mikołajczak 2017-11-18 21:43:10 +0100
  • a1b532c083
    i18n: Update Polish translation Marcin Mikołajczak 2017-11-18 20:40:20 +0100
  • 92cc79be72 Enabled vanilla thmee kibigo! 2017-11-18 11:06:04 -0800