862 Commits (269edc0e48886ea90455283f08a646c86387cfbc)

Author SHA1 Message Date
Eugen Rochko 78ed4ab75f
Add bio fields (#6645)
7 years ago
David Yip d66192f21c
Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip b7804028c2
Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip ed490b781f
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 50529cbceb Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip a817f084ea
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Thibaut Girka 50eb8f1f61 Add backend support for bookmarks
7 years ago
Akihiko Odaki 519119f657 Paginate ancestor statuses in public page (#7102)
7 years ago
Jenkins 33c2bbdda7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith d9b62e34da Feature: Improve reports ui (#7032)
7 years ago
Paul Woolcock 8f800ad691 Change custom emoji search to `ILIKE` instead of `=` (#7099)
7 years ago
Emelia Smith 219a4423d8 Feature: Allow staff to change user emails (#7074)
7 years ago
MIYAGI Hikaru e6e93ecd8a Fix GIFV encoding params (#7098)
7 years ago
Akihiko Odaki 498327b2e3 Exclude status itself from context query (#7083)
7 years ago
Jenkins 6611100480 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith e85cffb236 Feature: Report improvements (#6967) (#7000)
7 years ago
David Yip eb39db7f93
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Underwood 123a343d11 [WIP] Enable custom emoji on account pages and in the sidebar (#6124)
7 years ago
David Yip d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip f61aa8e0f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 2a90da1837
Fix UniqueUsernameValidator comparison (#6926)
7 years ago
Akihiko Odaki 40e5d2303b Validate HTTP response length while receiving (#6891)
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki b2a4ffd3a9 Change columns in notifications nonnullable (#6764)
7 years ago
Akihiko Odaki 54b273bf99 Close http connection in perform method of Request class (#6889)
7 years ago
Jenkins 03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko da70aca28e
Restore username validation to disallow dots, for now (#6863)
7 years ago
ThibG 6f531d140b Fix MENTION_RE to not match nil usernames (#6862)
7 years ago
Jenkins 6290cd7969 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 93897134ca
Permit dots in usernames with conditions (#6844)
7 years ago
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Alexander 0306e3e9be bugfixes and gem update (#6831)
7 years ago
Jenkins 9341b982b6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel Hunsaker 4a0a19fe54 Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)
7 years ago
David Yip f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1aaec701bb
Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 9aba44ea79 Rescue when there's no extension in the remotable (#6358)
7 years ago
Eugen Rochko cfa9b6e13a
Remove text requirement when media attached from statuses (#6672)
7 years ago
Effy Elden dd9d00d293 Add additional first_name and last_name SAML attribute statement options, and modify Omniauthable concern to use full_name or first_name + last_name if not available (#6669)
7 years ago
Eugen Rochko 78d772af86
Fix #3807: Increase avatars to 400x400 max (#6651)
7 years ago
Akihiko Odaki c110fa62ac Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko 41a01bec23
Federated reports (#6570)
7 years ago
Ian McCowan c33931b613 Fix prev/next links on public profile page (#6497)
7 years ago
Eugen Rochko 5cc716688a
Ensure the app does not even start if OTP_SECRET is not set (#6557)
7 years ago
imncls bb6988a7ac
Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec e668180044 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Ghislain Loaec 3084fe4959 New env variable: SAML_SECURITY_ASSUME_EMAIL_IS_VERIFIED + fixes #6533 (#6538)
7 years ago
Eugen Rochko 90f12f2e5a
Focal points (#6520)
7 years ago
Eugen Rochko d3a62d2637
Fix #6525: Make sure file is opened in LazyThumbnail processor (#6529)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
Eugen Rochko a7171af0a3
Fix avatar and header issues by using custom geometry detector (#6515)
7 years ago
Jenkins 1445ba1703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 66105929e0
Don't resize avatars/headers if their dimensions are already right (#6508)
7 years ago
Eugen Rochko cba2897108
Cache relationships in API (#6482)
7 years ago
Eugen Rochko a71af98401
Push discovered status through streaming API within a time window (#6484)
7 years ago
David Yip 3d033a4687
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9dbae6e8a1
Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
Jenkins efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
David Yip b6159bcb0a
Merge remote-tracking branch 'origin/merge-upstream'
7 years ago
David Yip f1f67c46c5
Use Html2Text to generate plaintext for keyword mutes. #236.
7 years ago
David Yip 53c86b29f0
Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234.
7 years ago
David Yip d263e3bc2d
Fill out some examples for Glitch::FilterHelper. #234.
7 years ago
David Yip 29b5b46c87
Strip HTML from keyword mute input. #234.
7 years ago
Eugen Rochko 3ebc0ad4d3
Full-text search for authorized statuses (#6423)
7 years ago
David Yip 020b40efdb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 76f3d5d16b
Add preference to always display sensitive media (#6448)
7 years ago
Jenkins 5ba2c300d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 298c81c00f Clear account cache of notification target_status (#6442)
7 years ago
Akihiko Odaki 67f7ffa792 Change user_id column non-nullable (#6435)
7 years ago
David Yip a6fb1c58ee
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 38e0133e1b
Make PAM gem optional, allow configuration over environment (#6415)
7 years ago
Renato "Lond" Cerqueira 4e4f1b0dcb Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 26f21fd5a0
CAS + SAML authentication feature (#6425)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Alexander 04fef7b888 pam authentication (#5303)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 1cc44cba81
Fix #6331 (#6341)
7 years ago
Akihiko Odaki 613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Yamagishi Kazutoshi 238de58e65 Change belongs_to_required_by_default to true (#5888)
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
Jenkins 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ed867eca9d
Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
7 years ago
Jenkins f839ac694c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko dbda87c31f
Revert #5772 (#6221)
7 years ago
Jenkins c69a23ae46 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 5ec25ff3e1 Fix email confirmation link not updating email (#6187)
7 years ago
Jenkins fc884d015a Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki 161c72d66d Allow to dereference Follow object for ActivityPub (#5772)
7 years ago
Jenkins 933840bebf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 04ecf44c2f Add confirmation step for email changes (#6071)
7 years ago
David Yip 4cca1d1e7e
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 38fc1b498d
Add more instance stats APIs (#6125)
7 years ago
David Yip 82b2e224a2
Merge branch 'gs-master' into prevent-local-only-federation
7 years ago
David Yip e35a350119
Examples for Status#set_locality and .as_tag_timeline.
7 years ago
Jenkins 82236a3703 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ad75ec8b5b
Add filters to admin UI for custom emojis (#6003)
7 years ago
Eugen Rochko 20a6584d2d
Clean up admin UI for accounts (#6004)
7 years ago
David Yip a057ed5cfe
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Akihiko Odaki 14c4a33cd9 Change account_id non-nullable in lists (#5979)
7 years ago
Eugen Rochko 481fac7c84
Exclude moved accounts from search results (#5984)
7 years ago
Erin c5a4eda694 move outbox filtering to Status#permitted_for (as per @ekiru)
7 years ago
Erin 288f1293ef set local_only in a before_create callback instead of status service
7 years ago
Erin 0c46058a43 remove vestigial Status#local_only? definition
7 years ago
Erin 24f36ca912 Status#not_local_only scope should match nils too
7 years ago
Erin 6bd18e43ba filter local-only statuses from public pages
7 years ago
Erin 08519cd4f4 status: stub local_only?, add scope, add marked_local_only?
7 years ago
Erin 434c70fd98 add a local_only column to the statuses table
7 years ago
Andrea Scarpino 6a82939adb Fix account and tag searches with leading/trailing spaces (#5965)
7 years ago
cwm abe95b614b add initial components based off of tootsuite pr #1507
7 years ago
Eugen Rochko 2f4c5f504f
Limit users to 50 lists, remove pagination from lists API (#5933)
7 years ago
Eugen Rochko c36b9cc5a6
Ensure link thumbnails are not stretched to super low quality (#5932)
7 years ago
Jenkins 744447b3c0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 0c4ca3e549 Remove duplicate annotate (#5910)
7 years ago
Akihiko Odaki c083816c24 Add embed_url to preview cards (#5775)
7 years ago
beatrix 81b0145759
Merge pull request #229 from glitch-soc/glitch-theme
7 years ago
Jenkins 8ca91cef45 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi b21db9bbde Using double splat operator (#5859)
7 years ago
Eugen Rochko 42bcbd36b7 Remove rabl dependency (#5894)
7 years ago
Eugen Rochko d68868ca14
Lists redis clean-up (#5886)
7 years ago
Eugen Rochko e20895f251
Add list of lists component to web UI (#5811)
7 years ago
David Yip d9800a5647
Merge branch 'gs-master' into glitch-theme
7 years ago
kibigo! bc4fa6b198 Rename themes -> flavours ? ?
7 years ago
Jenkins 933eafdcd3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 74320971e2 Add invite filter (#5862)
7 years ago
kibigo! 541fe9b110 Skins support
7 years ago
Jenkins ad46bc9772 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 85e97ecab6
Fix too many forwards (#5854)
7 years ago
David Yip 95c270f5b1
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 15fab79cfa Show "expired" in invite index (#5838)
7 years ago
aschmitz eeaec39888 Allow hiding of reblogs from followed users (#5762)
7 years ago
nullkal 1b57d4dd3a Fix account migration feature (#5837)
7 years ago
David Yip 7463d80ff4
Merge remote-tracking branch 'tootsuite/master'
7 years ago
Eugen Rochko 706e534455
Add UI for setting up account migration (#5832)
7 years ago
David Yip e77c3996a5
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 740f8a95a9
Add consumable invites (#5814)
7 years ago
Jenkins 86f4f8e158 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
William Pitcock 32987004c9 status: preserve visibility attribute when reblogging (infoleak fix) (#5789)
7 years ago
abcang 269a445c0b Fix unnecessary order (#5807)
7 years ago
Jenkins 167fe2ab08 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e84fecb7e9
Add logging of admin actions (#5757)
7 years ago
Jenkins a36a2c1796 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 53e95c4efc Fix N+1 at notification (#5752)
7 years ago
David Yip d083f7741a Merge remote-tracking branch 'tootsuite/master'
7 years ago
Yamagishi Kazutoshi bfdcf76a64 Add “staff” badge to admin user pages (#5735)
7 years ago
Eugen Rochko 58cede4808
Profile redirect notes (#5746)
7 years ago
beatrix dec960c828
Merge pull request #208 from yipdw/keyword-mute
7 years ago
David Yip 130aa90d55 Update annotations on Follow, FollowRequest, and Mute.
7 years ago
David Yip 1ab12ba38e Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 24cafd73a2
Lists (#5703)
7 years ago
David Yip b28b405b97 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 3e90987c8b Fix some rubocop style issues (#5730)
7 years ago
Eugen Rochko 2151fd3150
Display moderator badge (green), admin badge changed to red (#5728)
7 years ago
ysksn 9e3d24a150 Fix AccountFinderConcern::AccountFinder#with_usernames (#5722)
7 years ago
Surinna Curtis 35fbdc36f9 Merge tootsuite/master at 3023725936
7 years ago
David Yip 08652baab0 Replace =~ with #matches?. #208.
7 years ago
David Yip 8fc54890e5 Prefix cache keys with the matcher type. #208.
7 years ago
David Yip cb4ef24ac9 Match keyword mute filter on hashtags. #208.
7 years ago
beatrix 04508868b0
Merge pull request #212 from aschmitz/feat/mute-reblogs
7 years ago
ysksn 19e8b861a2 Delegate some methods of User to @settings (#5706)
7 years ago
Surinna Curtis 031a5a8f92 Optional notification muting (#5087)
7 years ago
Yamagishi Kazutoshi 20150659e6 Add uniqueness to block email domains (#5692)
7 years ago
David Yip 656d54e945 Maintain case-insensitivity when merging multiple matchers (#213)
7 years ago
Daniel Hunsaker cf7e840990 Update model annotations to use BIGINT for IDs (#5461)
7 years ago
aschmitz 5128c4261e Updates per code review
7 years ago
Eugen Rochko 7bb8b0b2fc
Add moderator role and add pundit policies for admin actions (#5635)
7 years ago
aschmitz b95c48748c Per-user reblog hiding implementation/fixes/tests
7 years ago
aschmitz 4944515020 "Show reblogs" per-follower UI/database changes
7 years ago
ysksn 54b42901df Add and Remove tests for FollowRequest (#5622)
7 years ago
ThibG 5d5c0f4f43 Twidere mention workaround (#5552)
7 years ago
Eugen Rochko 1032f3994f
Add ability to disable login and mark accounts as memorial (#5615)
7 years ago
nullkal b6e2e999bd Show the local couterpart of emoji when it exists in /admin/custom_emojis (#5467)
7 years ago
David Yip 870d71b78b Merge branch 'master' into gs-master
7 years ago
nullkal 781105293c Feature: Unlisted custom emojis (#5485)
7 years ago
beatrix a2612d0d38 Merge pull request #179 from glitch-soc/keyword-mute
7 years ago
David Yip 42f2045c21 Merge remote-tracking branch 'STJrInuyasha/feature/direct-timeline' into gs-direct-timeline
7 years ago
David Yip e40fe4092d Remove nil check in Glitch::KeywordMute#=~.
7 years ago
David Yip f5a3283976 Switch to Regexp.union for building the mute expression.
7 years ago
David Yip 8410d33b49 Only cache the regex text, not the regex itself.
7 years ago
Matthew Walsh 3db80f75a6 Added a timeline for Direct statuses
7 years ago
David Yip af8f06413e KeywordMute matcher: more closely mimic Regexp#=~ behavior.
7 years ago
David Yip 4b68e82a19 Don't add \b to whole-word keywords that don't start with word characters.
7 years ago
David Yip ad86c86fa8 Apply keyword mutes to reblogs.
7 years ago
David Yip 670e6a33f8 Move KeywordMute into Glitch namespace.
7 years ago
David Yip 4a64181461 Allow keywords to match either substrings or whole words.
7 years ago
David Yip b4b657eb1d Invalidate cached matcher objects on KeywordMute commit. #164.
7 years ago
David Yip 693c66dfde Use more idiomatic string concatentation. #164.
7 years ago
David Yip a4851100fd Make use of the regex attr_reader. #164.
7 years ago
David Yip 603cf02b70 Rework KeywordMute interface to use a matcher object; spec out matcher. #164.
7 years ago
David Yip 4745d6eeca Spec out KeywordMute interface. #164.
7 years ago
David Yip 9093e2de7a Add KeywordMute model.
7 years ago
David Yip dbb1fce94d Merge remote-tracking branch 'upstream/master' into gs-master
7 years ago
Nolan Lawson fa0be3f834 Add option to reduce motion (#5393)
7 years ago
David Yip 6cd5b3bbe5 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist a1c54220e8 Optimize Status#permitted_for 500x (account timeline) (#5373)
7 years ago
Eugen Rochko b8db386e05 Fix UserTrackingConcern firing on every request, optimize some queries (#5368)
7 years ago