3535 Commits (58a133978b5ecd387839c3cdeed341d708c62f89)

Author SHA1 Message Date
beatrix 27ca589183 Merge pull request #208 from yipdw/keyword-mute
7 years ago
Jenkins cea7dec340 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
SerCom_KC e618b6c136 Updating Chinese (Simplified) translations (#5725)
7 years ago
kibigo! 5466150ea4 Removed glitch tests
7 years ago
kibigo! 7c5614c667 Restore vanilla components
7 years ago
kibigo! 68304a6ce5 Forking glitch theme
7 years ago
beatrix 61585f2c42 Merge pull request #223 from glitch-soc/glitchsoc/feature/configurable-status-size
7 years ago
David Yip 08751360a0 Update annotations on Follow, FollowRequest, and Mute.
7 years ago
David Yip f1279d8ff3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e149067561 Lists (#5703)
7 years ago
David Yip ce27681a76 Merge pull request #222 from yipdw/merge/tootsuite/master
7 years ago
David Yip e5a2158e2a Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size
7 years ago
beatrix 57e301c5be Merge pull request #221 from glitch-soc/local-only-policy
7 years ago
Jenkins 065e2388ba Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip 87c1f91505 Merge pull request #218 from glitch-soc/themed-prefetching
7 years ago
Lynx Kotoura 731c859097 Increase contrast of Admin badges (#5740)
7 years ago
Clworld 6547ebee48 Fix regression #5467: fixes emoji copy (#5739)
7 years ago
David Yip bcdd0f8b9d Update StatusPolicy to check current_account for local_only? toots.
7 years ago
unarist 5982d570de Move "Permissions" row into main table in /admin/accounts/:id (#5734)
7 years ago
David Yip ff4e474bcd Add trailing comma in mapStateToProps
7 years ago
David Yip c687853d80 Merge pull request #219 from glitch-soc/no-spin
7 years ago
David Yip 801ecbfa5a Throw layout, isWide, navbarUnder back into mapStateToProps.
7 years ago
kibigo! bbef750b04 Removes spin theme
7 years ago
kibigo! 5845057adb Themed prefetching
7 years ago
David Yip 5f689cdf78 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
ysksn 08cb63c360 Remove empty strings (#5732)
7 years ago
Eugen Rochko 3df46ce5a8 Fix some rubocop style issues (#5730)
7 years ago
Eugen Rochko 21d01d5809 Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
Renato "Lond" Cerqueira f366a83c6c Improve language filter (#5724)
7 years ago
ysksn bf1d4a2cb9 Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)
7 years ago
Surinna Curtis 02ae609d9a Merge tootsuite/master at ab48f2b239
7 years ago
David Yip b4725cad17 Replace =~ with #matches?. #208.
7 years ago
David Yip 21e138379d Prefix cache keys with the matcher type. #208.
7 years ago
David Yip 2c6a2d588c Match keyword mute filter on hashtags. #208.
7 years ago
David Yip dd29a41b61 Also run the keyword matcher on a status' tags. #208.
7 years ago
beatrix ed1cf698a2 Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 475b7cecb5 Delegate some methods of User to @settings (#5706)
7 years ago
masarakki 7d3b67e1c8 reusable-streaming (#5709)
7 years ago
Surinna Curtis 582dd1b7c7 Optional notification muting (#5087)
7 years ago
ThibG 74de5566d4 Filter searched toots to be consistent with blocking behaviors (#5383)
7 years ago
ThibG 4531b67c3e Use already-known remote user data if resolving temporarily fails in mentions (#5702)
7 years ago
Eugen Rochko 80873c1134 Add option to block direct messages from people you don't follow (#5669)
7 years ago
SerCom_KC 66a0141691 Updating Chinese (Simplified) translations (#5643)
7 years ago
Yamagishi Kazutoshi 3a51544e9a Add uniqueness to block email domains (#5692)
7 years ago
Marcin Mikołajczak fa89e5d911 i18n: Update Polish translation (#5699)
7 years ago
Lain Iwakura a77e03ede4 Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.
7 years ago
Lain Iwakura f517cbae22 Code style fixes.
7 years ago
Lain Iwakura 3de2814a5a Handle character limit in initial state in frontend.
7 years ago
Lain Iwakura a45f3cdc69 Return character limit in API and initial state.
7 years ago
Lain Iwakura 666540f4a8 Make character limit configurable.
7 years ago
Andrew 1d0a72c00b Updates and fixes to win95 theme
7 years ago
Anna e só c4c9003f84 l10n: PT-BR translation updated (#5681)
7 years ago
David Yip 13ec4a9a20 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
Daniel Hunsaker 96504fd1ec Update model annotations to use BIGINT for IDs (#5461)
7 years ago
aschmitz 3fe59e7d97 Actually filter blocked reblogs from feed
7 years ago
Eugen Rochko 9caf162432 Fix #5632 - Reset column loading status after fetch fail (#5659)
7 years ago
aschmitz 869cfdfda6 Don't update follower counts on reblog toggle
7 years ago
aschmitz 76008c3e8c Updates per code review
7 years ago
Eugen Rochko 97178b6d86 Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
ThibG df882d5a59 Retry thread resolving (#5599)
7 years ago
aschmitz 2f1fdd37d3 Per-user reblog hiding implementation/fixes/tests
7 years ago
Lynx Kotoura 37992a1012 Fix focused background color of direct toots (#5642)
7 years ago
aschmitz 2aedd8eaad "Show reblogs" per-follower UI/database changes
7 years ago
ysksn 26f52a2551 Add and Remove tests for FollowRequest (#5622)
7 years ago
unarist 1cb6606055 Show confirmation dialog on leaving WebUI while composing (#5616)
7 years ago
Quenty31 a7db7bdd96 i10n OC: Memorial (#5615) + #5467 (#5623)
7 years ago
ThibG 5abd97e5ba Fix process mentions for local users, as local users are considered to use OStatus (#5618)
7 years ago
nullkal 863958ce09 Eliminate space around emoji (#5474)
7 years ago
ThibG 4912f539c3 Twidere mention workaround (#5552)
7 years ago
Eugen Rochko 7f1a0241c1 Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
voidSatisfaction dc63306620 fix: slang to adequate word (#5453)
7 years ago
nullkal 19f82492ab Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
MIYAGI Hikaru 3506668438 Avoid emojifying on invisible text (#5558)
7 years ago
ThibG 02608c2292 Do not process undeliverable mentions (#5598)
7 years ago
ThibG a8249d2486 Resolve remote accounts when mentioned even if they are already known (#5539)
7 years ago
nullkal 64fbf1d6e5 Make fullscreen video in detailed status plays in fullscreen (Partly Fix #5160) (#5611)
7 years ago
kedama 82e9df5e3c Hide disabled custom emojis from emoji picker and emoji auto suggestions. (#5613)
7 years ago
kibigo! f9e8e1357e Mastodon GO! -> v0.1.1
7 years ago
kibigo! b0f88fbdc1 Autocollapse boosts option
7 years ago
MIYAGI Hikaru 70726e0f72 don't display any descendants of .invisible (#5567)
7 years ago
beatrix 0f6d6186b6 Merge pull request #204 from glitch-soc/with-mastodon-go
7 years ago
kibigo! 23a15bd315 Introducing: Mastodon GO!
7 years ago
Quenty31 b6f057365d l10n Occitan (#5586)
7 years ago
MitarashiDango 3068add21d add account search condition (instance domain) (#5577)
7 years ago
Sorin Davidoi 2c6bb251c5 refactor(features/ui): Avoid useless renders in WrappedSwitch (#5580)
7 years ago
Yamagishi Kazutoshi c858c1a2b8 Replace react-router-scroll to react-router-scroll-4 (#5568)
7 years ago
Nolan Lawson 4a7046e607 Refactor initial state: auto_play_gif (#5576)
7 years ago
Nolan Lawson ba22580c06 Add ServiceWorker caching for static assets (#5524)
7 years ago
Nolan Lawson b89628424d Refactor initial state: "me" (#5563)
7 years ago
SerCom_KC 282f0d7479 Updating Chinese (Simplified) translations (#5508)
7 years ago
ThibG fec32921d5 Update remote ActivityPub users when fetching their toots (#5545)
7 years ago
Nolan Lawson aa85f4cf73 Avoid modifying emoji data inline (#5548)
7 years ago
Nolan Lawson 6c6c67b52b Add margin to account for Edge disappearing scrollbar (#5522)
7 years ago
Nolan Lawson fc075b16d9 Reactor unfollow_modal, boost_modal, delete_modal (#5505)
7 years ago
Herbert Kagumba c652eefd3c Separate Follow/Unfollow and back buttons (#5496)
7 years ago
ThibG b41ed24f74 Instantiate service classes for each call (fixes #5540) (#5543)
7 years ago
Nolan Lawson 6a7deb8fc8 Avoid unnecessary Motion components in icon_button.js (#5544)
7 years ago
Nolan Lawson 7286e6dcf0 Directly use <Motion/> if not reducing motion (#5546)
7 years ago
Nolan Lawson 2085c1fa33 Refactor initial state: reduce_motion and auto_play_gif (#5501)
7 years ago
David Yip 2aec3c073b Merge branch 'master' into gs-master
7 years ago
nullkal 0a9cc96cdc Feature: Unlisted custom emojis (#5485)
7 years ago
puckipedia 2c06b21883 Allow ActivityPub Note's tag and attachment to be single objects (#5534)
7 years ago
Andrew 120fc4ef61 Theme: Windows 95
7 years ago
Jenkins c388f66ecc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
erin fe11a72c0b Fix copying emojos: redirect to the page you were on (#5509)
7 years ago
David Yip d3db08b69f Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
りんすき e6f7ccb786 Fix column design broken with very long title (#5493)
7 years ago
Nolan Lawson afe5176ee8 Remove translateZ(0) on modal overlay (#5478)
7 years ago
beatrix ce738197b9 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip eef50289c6 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
Jenkins cfc46d7334 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Ratmir Karabut 51d4add08d Update Russian translation (#5517)
7 years ago
Olivier Nicole fe8646f078 Complete Esperanto translation (#5520)
7 years ago
David Yip b8c462c42b Remove nil check in Glitch::KeywordMute#=~.
7 years ago
David Yip 53c2ea1a86 Assume Glitch::KeywordMute#destroy! works and error out if it doesn't.
7 years ago
David Yip 2da4eca986 Use edit template for displaying errors in update.
7 years ago
David Yip 22f9b4f2c0 Also filter notifications containing muted keywords.
7 years ago
David Yip 7caca589c1 Override Action View name inference in settings/keyword_mutes.
7 years ago
David Yip 05fecda52d Switch to Regexp.union for building the mute expression.
7 years ago
Ondřej Hruška 77cad0daf0 option to add title to <Button>, use for toot buttons (#197)
7 years ago
David Yip 763fd4b275 Only cache the regex text, not the regex itself.
7 years ago
David Yip 2b753ac54f Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Matthew Walsh 897931099c Changes to match other timelines in 2.0
7 years ago
Matthew Walsh 737ab88c86 Added a timeline for Direct statuses
7 years ago
David Yip e8314ee2a6 KeywordMute matcher: more closely mimic Regexp#=~ behavior.
7 years ago
David Yip 4ab1534f6c Address unused translation errors.
7 years ago
David Yip 156ebf53f6 Use current_account from ApplicationController.
7 years ago
David Yip 3b2bf30644 Don't add \b to whole-word keywords that don't start with word characters.
7 years ago
David Yip 8d69329b8e keyword mutes: also check spoiler (CW) text and reblogged statuses.
7 years ago
Marcin Mikołajczak 67992e1b7e i18n: Update Polish Translation (#5494)
7 years ago
David Yip b2ad79547c Apply keyword mutes to reblogs.
7 years ago
David Yip 74141adca1 Move KeywordMute into Glitch namespace.
7 years ago
David Yip e3f5ec2652 Fill in create, edit, update, and destroy for keyword mutes interface.
7 years ago
David Yip 05ee0aeb8b Allow keywords to match either substrings or whole words.
7 years ago
David Yip 018657a0e0 Spike out index and new views for keyword mutes controller.
7 years ago
David Yip ebfec40698 Set up /settings/keyword_mutes. #164.
7 years ago
David Yip be472f276d Invalidate cached matcher objects on KeywordMute commit. #164.
7 years ago
David Yip aa57929688 Use more idiomatic string concatentation. #164.
7 years ago
David Yip f3a57932c0 Make use of the regex attr_reader. #164.
7 years ago
David Yip a3ee8592a8 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip ddcb129101 Spec out KeywordMute interface. #164.
7 years ago
David Yip c123b710ad Add KeywordMute model.
7 years ago
Ondřej Hruška 067e4e2404 Compose buttons bar redesign + generalize dropdown (#194)
7 years ago
beatrix eed9808f5f hide mentions of muted accounts (in home col) (#190)
7 years ago
kibigo! 9e2b6657c0 Updates to bio metadata script
7 years ago
Nolan Lawson 1a8b2157d0 Remove unnecessary translateZ(0) when doing scale() (#5473)
7 years ago
David Yip 8b8eeb0fbf Make the compose area optionally scrollable.
7 years ago
David Yip 2325bf7423 Merge pull request #185 from glitch-soc/fix-null-status
7 years ago
Ondřej Hruška 0a9b3b1415 formatting fix for eslint
7 years ago
David Yip 722fe5fda8 Remove unused filesAttached property.
7 years ago
David Yip c17395266c Update stylesheet imports in glitch components.
7 years ago
David Yip dd4f9f18cb Merge tag 'v2.0.0' into gs-master
7 years ago
Sho Kusano 85e47a4423 Suppress type error(not a function) on calling fastSeek (#5452)
7 years ago
Renato "Lond" Cerqueira a761e02bd1 Fix pt-BR translation strings related to advanced search. (#5449)
7 years ago
Technowix 8eea3bd6d8 Revert #5438 for FR (#5450)
7 years ago
Håkan Eriksson ecef91e5ca Some typos and supplementation in sentence structures (#5441)
7 years ago
JohnD28 8e386ca547 fr.json typo (realtive time) (#5447)
7 years ago
YaQ cd59b66680 Make theme directory and Rename application.scss (#5336)
7 years ago
Eugen Rochko 8eee4b3d35 When unreblog arrives over streaming API, just delete in UI (#5439)
7 years ago
JeanGauthier a18201f690 i18n better wording (OC/CA/FR) + string added in FR (#5438)
7 years ago
Nolan Lawson 845b2f4ad9 Fix scrolling of dropdown when offscreen (#5434)
7 years ago
Eugen Rochko 24155c5890 Fix unwanted content warning gap in CSS (#5436)
7 years ago
Eugen Rochko fef7c55bce When status is fetched instead of delivered, do not stream it (#5437)
7 years ago
unarist 8b2ee20dfa Don't capture scheme-less URLs in the status (#5435)
7 years ago
JeanGauthier e1efabf979 i18n update (#5427) in OC/CA/FR/ES (#5431)
7 years ago
unarist 90fb04f1bb Fix React warning about tabIndex on status with CW (#5432)
7 years ago
Jakob Kramer 15ae7fe6b2 Update German translation (#5425)
7 years ago
Yamagishi Kazutoshi d7063885bc Add Japanese translations (#5427)
7 years ago
aschmitz 4dbdda6b89 Clean up reblog tracking keys, related improvements (#5428)
7 years ago
Håkan Eriksson c06052b7cf Swedish translation (#5406)
7 years ago
Jeroen 289723dd1c Small update Dutch (nl) strings (#5424)
7 years ago
Ondřej Hruška 26b5013865 Fix dual toot button wrong behavior after compose re-design
7 years ago
Ondřej Hruška 57555bf432 workaround for null status
7 years ago
beatrix cda8575ae3 Merge pull request #184 from tootsuite/master
7 years ago
David Yip 02887e0953 Merge pull request #182 from glitch-soc/wide-tootbox-panel
7 years ago
Ondřej Hruška adec2b6716 satisfy eslint and jest
7 years ago
Ondřej Hruška c3ded60ec9 rem a comment
7 years ago
Ondřej Hruška f1d386a3ad double-decker tootbox
7 years ago
Ondřej Hruška e2b44d03ee Merge remote-tracking branch 'upstream/master' into upstream-merge-again
7 years ago
Ondřej Hruška 26e7e5f0ef fix some lint errors
7 years ago
Nolan Lawson d7b8208a37 Fix reduced motion breaking public galleries (#5423)
7 years ago
Eugen Rochko 7571d79c8d Keep references to all reblogs of a status on home feed (#5419)
7 years ago
David Yip c5888ff3a8 Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
David Yip e19bc7835a Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Eugen Rochko 8a276b4d43 Ensure that feed renegeration restores non-zero items (#5409)
7 years ago
Eugen Rochko 55642feb4b Filter out duplicate IDs in timelines reducer (#5417)
7 years ago
unarist 1fa6d20981 Fix un-reblogged status being at wrong position in the home timeline (#5418)
7 years ago
voidSatisfaction 7ae6d55b8a Add up-to-date korean translation on client (#5402)
7 years ago
KY e1357265ed Fix #5082 - disable retweet link for followers only toot (#5397)
7 years ago
Marcin Mikołajczak 8953c2a918 i18n: Update Polish translation (#5416)
7 years ago
JeanGauthier c102025e2c i18n ultim hour «More» dropdown title + reduce motion (#5415)
7 years ago
Yamagishi Kazutoshi dd505c5d8c Enable ESLint rules import/* (#5414)
7 years ago
Nolan Lawson a54c272a1f Add option to reduce motion (#5393)
7 years ago
Nolan Lawson a5d60195fc Fix offline-plugin warning in dev mode (#5411)
7 years ago
Yamagishi Kazutoshi fb5040885c Replace JavaScript Testing Framework from Mocha to Jest (#5412)
7 years ago
Nolan Lawson cb0c479fd4 i18n "More" dropdown title (#5410)
7 years ago
Nolan Lawson 0e9e72f228 Refactor and simplify icon_button.js (#5413)
7 years ago
David Yip ec18363c3b Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip d199a8c612 Merge pull request #180 from STJrInuyasha/glitch-soc/avatar-unification
7 years ago
Matthew Walsh 078319992b 1.6 changed files for unified avatar styling -- updated to restore unity
7 years ago