tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 94c5a11cda Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2017-11-17 20:17:12 +00:00
  • 45f18b8f49 Merge pull request #218 from glitch-soc/themed-prefetching David Yip 2017-11-17 14:01:23 -06:00
  • 4a2fc2d444 Increase contrast of Admin badges (#5740) Lynx Kotoura 2017-11-18 03:59:53 +09:00
  • e1ebf36352 Fix regression #5467: fixes emoji copy (#5739) Clworld 2017-11-18 02:22:31 +09:00
  • ae6dd08121 Change libinconv download URL to HTTPS (#5738) Alex Coto 2017-11-17 12:21:05 -05:00
  • f6355f6ffb Update StatusPolicy to check current_account for local_only? toots. David Yip 2017-11-17 09:07:21 -06:00
  • e28b33c89c Move "Permissions" row into main table in /admin/accounts/:id (#5734) unarist 2017-11-17 23:18:20 +09:00
  • 2a386ad88d Add trailing comma in mapStateToProps David Yip 2017-11-17 00:24:22 -06:00
  • fbf76feb37 Merge pull request #219 from glitch-soc/no-spin David Yip 2017-11-17 00:14:24 -06:00
  • 392945f9a3 Throw layout, isWide, navbarUnder back into mapStateToProps. David Yip 2017-11-17 00:11:01 -06:00
  • 4dd19054d6 Removes spin theme kibigo! 2017-11-16 21:50:07 -08:00
  • 585758a373 Themed prefetching kibigo! 2017-11-16 21:35:25 -08:00
  • b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master David Yip 2017-11-16 22:52:37 -06:00
  • dc6e031364 Redirect to reports when moderator (#5733) Yamagishi Kazutoshi 2017-11-17 11:26:34 +09:00
  • 9dd5e329ab Remove empty strings (#5732) ysksn 2017-11-17 10:52:30 +09:00
  • 3e90987c8b Fix some rubocop style issues (#5730) Eugen Rochko 2017-11-17 02:06:26 +01:00
  • 2151fd3150 Display moderator badge (green), admin badge changed to red (#5728) Eugen Rochko 2017-11-17 01:22:38 +01:00
  • ad207456d6 Improve language filter (#5724) Renato "Lond" Cerqueira 2017-11-16 10:51:38 -02:00
  • 9e3d24a150 Fix AccountFinderConcern::AccountFinder#with_usernames (#5722) ysksn 2017-11-16 20:13:03 +09:00
  • ee560abdbe Merge pull request #216 from glitch-soc/merge-upstream-3023725 Surinna Curtis 2017-11-16 01:38:26 -06:00
  • 35fbdc36f9 Merge tootsuite/master at 3023725936 Surinna Curtis 2017-11-16 01:21:16 -06:00
  • 556c07df1f Add tests for Status#verb (#5717) ysksn 2017-11-16 15:46:29 +09:00
  • 88627fd7aa Merge pull request #217 from monsterpit-daggertooth/fix-streaming-host-env David Yip 2017-11-15 23:40:07 -06:00
  • c2a92dffc9 Add some examples for Glitch::KeywordMute::TagMatcher. #208. David Yip 2017-11-15 23:31:49 -06:00
  • 7e17e764a5 Allow streaming server to take bindhost from HOST env Daggertooth 2017-11-14 08:32:24 +00:00
  • 3023725936 Add tests for Status#hidden? (#5719) ysksn 2017-11-16 11:07:27 +09:00
  • 08652baab0 Replace =~ with #matches?. #208. David Yip 2017-11-15 18:26:21 -06:00
  • 8fc54890e5 Prefix cache keys with the matcher type. #208. David Yip 2017-11-15 18:08:03 -06:00
  • cb4ef24ac9 Match keyword mute filter on hashtags. #208. David Yip 2017-11-15 17:26:29 -06:00
  • 431503bae2 Also run the keyword matcher on a status' tags. #208. David Yip 2017-11-06 16:48:36 -06:00
  • 04508868b0 Merge pull request #212 from aschmitz/feat/mute-reblogs beatrix 2017-11-15 12:01:17 -05:00
  • 3e4b01b47d [Nanobox] Apply Release Notes Changes (#5670) Daniel Hunsaker 2017-11-15 08:26:53 -07:00
  • 19e8b861a2 Delegate some methods of User to @settings (#5706) ysksn 2017-11-16 00:05:20 +09:00
  • 7d7df877ef Add a test for Tag#to_param (#5705) ysksn 2017-11-16 00:04:41 +09:00
  • c73a1fb537 reusable-streaming (#5709) masarakki 2017-11-16 00:04:15 +09:00
  • f6bc6399e2 Add Japanese translation for DM block option. (#5704) mayaeh 2017-11-15 11:57:09 +09:00
  • 031a5a8f92 Optional notification muting (#5087) Surinna Curtis 2017-11-14 20:56:41 -06:00
  • 6d7e05ec1f Add tests for StreamEntry (#5687) ysksn 2017-11-15 10:00:58 +09:00
  • 58bca7b1e4 Filter searched toots to be consistent with blocking behaviors (#5383) ThibG 2017-11-15 01:53:33 +01:00
  • 1c25853842 Use already-known remote user data if resolving temporarily fails in mentions (#5702) ThibG 2017-11-15 01:06:49 +01:00
  • 546257bc7f Allow specifying STATSD_NAMESPACE (#5700) Eugen Rochko 2017-11-14 23:22:43 +01:00
  • fbef909c2a Add option to block direct messages from people you don't follow (#5669) Eugen Rochko 2017-11-14 21:12:57 +01:00
  • c3ec1e87b8 Updating Chinese (Simplified) translations (#5643) SerCom_KC 2017-11-15 03:44:42 +08:00
  • 48e27c47a7 Add a test for SiteUpload#cache_key (#5685) ysksn 2017-11-15 04:44:11 +09:00
  • 1f1838420f Refactor remote_follow_spec.rb (#5690) Yamagishi Kazutoshi 2017-11-15 04:41:17 +09:00
  • 20150659e6 Add uniqueness to block email domains (#5692) Yamagishi Kazutoshi 2017-11-15 04:37:17 +09:00
  • 8087aa83d4 i18n: Update Polish translation (#5699) Marcin Mikołajczak 2017-11-14 20:36:11 +01:00
  • ca5440b93d Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific. Lain Iwakura 2017-11-14 17:56:38 +01:00
  • dae8916544 Code style fixes. Lain Iwakura 2017-11-14 16:54:04 +01:00
  • d11b1a1aa7 Handle character limit in initial state in frontend. Lain Iwakura 2017-11-14 16:24:10 +01:00
  • a4dcabc11b Return character limit in API and initial state. Lain Iwakura 2017-11-14 16:23:12 +01:00
  • 6cd192b9fb Make character limit configurable. Lain Iwakura 2017-11-14 16:22:34 +01:00
  • c238444188 Updates and fixes to win95 theme Andrew 2017-11-14 01:22:48 -08:00
  • 249b0fe107 Add Japanese translations for moderator roles and its own admin actions. (#5689) mayaeh 2017-11-14 15:53:14 +09:00
  • a6682a3000 i18n: fix typo in Polish translation (#5688) Marcin Mikołajczak 2017-11-14 07:52:32 +01:00
  • 4112a0631f Add tests for Setting (#5683) ysksn 2017-11-14 11:08:04 +09:00
  • 0e6c4cb796 l10n: PT-BR translation updated (#5681) Anna e só 2017-11-14 00:07:38 -02:00
  • bfd9230d61 Merge pull request #214 from glitch-soc/keyword-mute David Yip 2017-11-13 12:33:19 -06:00
  • 656d54e945 Maintain case-insensitivity when merging multiple matchers (#213) David Yip 2017-11-13 11:06:02 -06:00
  • 92aaa55f06 Add code of conduct from GitHub generator (#5674) Eugen Rochko 2017-11-13 17:28:55 +01:00
  • 5df8e30415 fix Code Climate badge on README.md (#5671) takayamaki 2017-11-13 11:49:54 +09:00
  • 60f247c2e7 Add tests for SessionActivation (#5668) ysksn 2017-11-13 09:54:48 +09:00
  • cf7e840990 Update model annotations to use BIGINT for IDs (#5461) Daniel Hunsaker 2017-11-12 08:18:50 -07:00
  • 252d0fe020 Fix #5652 - Notify too short when abbrev in JA (#5664) KEINOS 2017-11-12 16:51:47 +09:00
  • 2fb722397d Add tests for RemoteProfile (#5665) ysksn 2017-11-12 16:23:31 +09:00
  • 9a42f7cbed Actually filter blocked reblogs from feed aschmitz 2017-11-11 22:10:49 -06:00
  • 07f7192bc3 Fix #5632 - Reset column loading status after fetch fail (#5659) Eugen Rochko 2017-11-12 04:51:07 +01:00
  • 48c705bbad Don't update follower counts on reblog toggle aschmitz 2017-11-11 21:42:22 -06:00
  • fcb9533549 i18n: Update Polish translation (for #5635) (#5661) Marcin Mikołajczak 2017-11-11 22:31:20 +01:00
  • 5128c4261e Updates per code review aschmitz 2017-11-11 14:37:23 -06:00
  • 7bb8b0b2fc Add moderator role and add pundit policies for admin actions (#5635) Eugen Rochko 2017-11-11 20:23:33 +01:00
  • 2b1190065c Retry thread resolving (#5599) ThibG 2017-11-11 16:49:04 +01:00
  • b95c48748c Per-user reblog hiding implementation/fixes/tests aschmitz 2017-11-10 20:11:10 -06:00
  • 56720ba590 Add tests for RemoteFollow (#5651) ysksn 2017-11-11 00:56:02 +09:00
  • e5aa4128f6 Update en.yml (#5648) Matt 2017-11-10 14:58:33 +13:00
  • f9e7336296 Fix focused background color of direct toots (#5642) Lynx Kotoura 2017-11-10 03:40:34 +09:00
  • 4944515020 "Show reblogs" per-follower UI/database changes aschmitz 2017-11-09 08:41:10 -06:00
  • 07cca6e364 Add tests for Notification (#5640) ysksn 2017-11-09 22:37:10 +09:00
  • 54b42901df Add and Remove tests for FollowRequest (#5622) ysksn 2017-11-09 22:36:52 +09:00
  • d200e041fe Rewrite account_controller_spec (#5633) Nanamachi 2017-11-09 22:36:17 +09:00
  • 49a285ce15 Show confirmation dialog on leaving WebUI while composing (#5616) unarist 2017-11-09 22:34:41 +09:00
  • cfd7b7a0b7 i18n: Update Polish translation (#5639) Marcin Mikołajczak 2017-11-09 14:23:06 +01:00
  • 36376b5e23 Translate ja (#5637) nullkal 2017-11-09 22:22:55 +09:00
  • eb97bd8af6 i10n OC: Memorial (#5615) + #5467 (#5623) Quenty31 2017-11-08 15:19:49 +01:00
  • 4c0a85ef9b In remove_remote, exclude removed media attachments. (#5626) Naoki Kosaka 2017-11-08 23:19:22 +09:00
  • 64cc129225 Add tests for MediaAttachment (#5620) ysksn 2017-11-08 15:29:07 +09:00
  • 97fc2da2e0 Add tests for CustomEmoji#local? and #object_type (#5621) ysksn 2017-11-08 15:28:17 +09:00
  • 889ada5ee2 Fix process mentions for local users, as local users are considered to use OStatus (#5618) ThibG 2017-11-07 22:15:15 +01:00
  • 3f16caaa50 Eliminate space around emoji (#5474) nullkal 2017-11-08 03:09:53 +09:00
  • 5d5c0f4f43 Twidere mention workaround (#5552) ThibG 2017-11-07 19:08:14 +01:00
  • 1032f3994f Add ability to disable login and mark accounts as memorial (#5615) Eugen Rochko 2017-11-07 19:06:44 +01:00
  • cbbeec05be Fix spell miss (SWIIFT_OBJECT_URL -> SWIFT_OBJECT_URL) (#5617) MitarashiDango 2017-11-08 03:06:30 +09:00
  • e618edf85a fix: slang to adequate word (#5453) voidSatisfaction 2017-11-07 22:49:50 +09:00
  • b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467) nullkal 2017-11-07 22:49:32 +09:00
  • 782224c991 Avoid emojifying on invisible text (#5558) MIYAGI Hikaru 2017-11-07 22:48:13 +09:00
  • 84cfee2488 Do not process undeliverable mentions (#5598) ThibG 2017-11-07 14:47:39 +01:00
  • 7bea1530f4 Resolve remote accounts when mentioned even if they are already known (#5539) ThibG 2017-11-07 14:31:57 +01:00
  • 47b0c61853 Unify file upload to using fog (#5604) Yamagishi Kazutoshi 2017-11-07 22:30:31 +09:00
  • 864c4d869f Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160) (#5611) nullkal 2017-11-07 22:24:55 +09:00
  • d8cd9000d9 Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613) kedama 2017-11-07 22:24:21 +09:00