4614 Commits (399af266e57f68377194922d1141ad675d2f4b0e)

Author SHA1 Message Date
unarist 41452e8302 Fix TypeError on follow notification (#6950)
7 years ago
ThibG 9ed5eebd7c Do not ignore unknown media attachments, only skip them (#6948)
7 years ago
David Yip 4e45954280
Merge pull request #402 from ThibG/glitch-soc/fixes/accept-empty-toot-contents
7 years ago
Thibaut Girka 7db431eac6 Fix attachment lists
7 years ago
Thibaut Girka 53eab4470d Render toots with empty contents
7 years ago
Yuto Tokunaga 5021c4e9ca Add double-tap zoom functionary to `ZoomableImage` (#6944)
7 years ago
David Yip 1ed9500b52
Merge pull request #400 from vulpineclub/dev-gs-392-frontmatter
7 years ago
David Yip d2cdc2b5a3
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Rey Tucker 21b586436e Remove ignored 'u' parameter on regexp (#392)
7 years ago
David Yip f61aa8e0f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
unarist 3523aa440b Fix LoadMore on account media gallery (#6933)
7 years ago
Thibaut Girka 88790b91de [Glitch] Display AttachmentList in notifications
7 years ago
Thibaut Girka 3bc5452449 [Glitch] Display AttachmentList in timelines in compact style when media missing
7 years ago
unarist f5ed5f3860 Clone response before put it to the cache (#6932)
7 years ago
unarist 2f3ac14a43 Add missing null handling in notification reducer (#6930)
7 years ago
Akihiko Odaki ca42f9b0eb Cache media (#6902)
7 years ago
Yuto Tokunaga 31e7b73084 fix #6846 (#6914)
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
Stephen Burgess 18965cb0e6 feat(ShowMore): Add classname to show more/show less button (#6904)
7 years ago
Yuto Tokunaga f691afaae9 Refactor scss (#6913)
7 years ago
unarist 605a92b460 Fix moved account handling in IndexedDB feature (#6915)
7 years ago
Jenkins 837b3804bf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Marcin Mikołajczak 85a395fab6 i18n: Update Polish translation (#6903)
7 years ago
Akihiko Odaki cbf97c03bb Allow clients to fetch notifications made while they were offline (#6886)
7 years ago
Akihiko Odaki 9a1a55ce52 Allow clients to fetch statuses made while they were offline (#6876)
7 years ago
Akihiko Odaki 59657e24b9 Rename variables to have semantic meanings in notifications reducer (#6890)
7 years ago
Akihiko Odaki fe398a098e Store objects to IndexedDB (#6826)
7 years ago
Akihiko Odaki ff7941e652 Show media modal on public pages (#6801)
7 years ago
Marcin Mikołajczak 1c15329cce Change “Toots with replies” to “Toots and replies” (#6875)
7 years ago
Akihiko Odaki b2a4ffd3a9 Change columns in notifications nonnullable (#6764)
7 years ago
Akihiko Odaki fa310695fa Note if the user is already following the target when authorizing follow (#6325)
7 years ago
Jeroen 580835ab69 Invites: Add '1 week' as expire option (#6872)
7 years ago
Akihiko Odaki 54b273bf99 Close http connection in perform method of Request class (#6889)
7 years ago
Akihiko Odaki 4e71b104e6 Internationalize unexpected error message (#6887)
7 years ago
Yamagishi Kazutoshi 65c10c0bc8 Weblate translations (2018-03-23) (#6874)
7 years ago
David Yip 1772034ef2
Merge pull request #398 from ashkitten/compressed-notifs
7 years ago
Jenkins 03b2f701e7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Quentí ecdc5957a3 [i18n] Occitan update (#6869)
7 years ago
Ash Levy 58eeb92755 expanded notifications show like default
7 years ago
Eugen Rochko 9fe1619db9
Do not re-query mentions from serializers (#6858)
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
Eugen Rochko f66a786029
Hide floating action button on thread views (#6859)
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
Eugen Rochko 9381a7d9d5
Use username/domain to match existing accounts in ActivityPub (#6842)
7 years ago
Thibaut Girka 12b0ea0667 [Glitch] Cancel outdated pending compose suggestions
7 years ago
ThibG a5c6c748e0 Cancel outdated pending compose suggestions (#6838)
7 years ago
Rey Tucker 36b5703796 request: in the event of failure, try other IPs (#6761) (#6813)
7 years ago
David Yip 0fa0836e63
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip c074b226b6
Merge pull request #394 from ashkitten/compressed-notifs
7 years ago
Jenkins df70571bfe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG ff6b8a6443 Serialize mentions in the order they are added (#6836)
7 years ago
ThibG 6b76a6212d Display content warning in mail notification emails (#6832)
7 years ago
Alexander 0306e3e9be bugfixes and gem update (#6831)
7 years ago
ThibG 357f9298bd Fix e-mail changed notification (fixes #6778) (#6835)
7 years ago
Renato "Lond" Cerqueira f7c46fc113 Weblate translations 20180319 (#6827)
7 years ago
Ash Lea 5b00b8f0da fix .status__info__icons layout
7 years ago
David Yip ab04be2f84
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip 6a6f680d98
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip a387f99659
Merge pull request #388 from ThibG/glitch-soc/federated-pinned-toots
7 years ago
Eugen Rochko f02411da40
Ignore media validation when attaching to status during processing (#6822)
7 years ago
Eugen Rochko a568e3ca8e
Revert #6479, hide sensitive text/images from OpenGraph previews (#6818)
7 years ago
Eugen Rochko 3b440bd5af
Fix elephant graphic being draggable and selectable (#6819)
7 years ago
Ash Levy c68c1466ac fix compressed notifications again (#393)
7 years ago
Jenkins f2a9a13b32 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 39f27b6cf3
If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817)
7 years ago
Akihiko Odaki 721234230c Synchronize HTML page cache with sessions (#6815)
7 years ago
Jenkins 9341b982b6 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool 566ace2d64 Add entropy to download filenames (#6811)
7 years ago
Daniel Hunsaker 4a0a19fe54 Handle Mastodon::HostValidationError when pulling remoteable assets (#6782)
7 years ago
trwnh ca7e6a6d2e Properly center .nothing-here (#6787) (#6788)
7 years ago
Akihiko Odaki f0cd957c7a Cache HTML page with Service Worker (#6802)
7 years ago
David Yip fe17446af0
Merge pull request #391 from ashkitten/compressed-notifs
7 years ago
Ash Levy 33d5fe889a fix non-notification boosts
7 years ago
Thibaut Girka 6f0e50f9a0 [Glitch] Federate pinned statuses over ActivityPub
7 years ago
Thibaut Girka cd73af3bd0 [Glitch] Improve style of web UI account tabs
7 years ago
Thibaut Girka f00af46d70 [Glitch] Add "Toots/Toots with replies/Media" tab below profile header
7 years ago
David Yip 50f56ba375
Merge pull request #385 from ThibG/glitch-soc/features/port-reports-ui-changes
7 years ago
David Yip a3c86d8cb9
Merge pull request #386 from ashkitten/compressed-notifs
7 years ago
Thibaut Girka 9c40a5f3c8 Fix toot text color in the report modal
7 years ago
Thibaut Girka 19f7bd1582 Show media on report UI
7 years ago
Thibaut Girka 22870985da Add close modal icon to report dialog (#6591)
7 years ago
Thibaut Girka 9cf574d0d2 Port federated reports UI to glitchsoc
7 years ago
Jenkins d75a6054a0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Ash Levy 9317f6853e compress boost/fave notifications more
7 years ago
Marcin Mikołajczak fd385e256d i18n: Update Polish translation (#6780)
7 years ago
Renato "Lond" Cerqueira 03119c857b Weblate translations (2018-03-13) (#6777)
7 years ago
Eugen Rochko eb2425b53b
Hide loading bar on status interactions (#6774)
7 years ago
Eugen Rochko f0ae6b4cc5 Merge branch 'spoiler' of git://github.com/kagucho/mastodon into kagucho-spoiler
7 years ago
Eugen Rochko 9e3a6d6784
Log BackupWorker backtrace, delete Backup if retries exhausted (#6769)
7 years ago
Eugen Rochko 8bf3e750ab
Fix #6757: Adjust RTL styles for landing page (#6768)
7 years ago
Akihiko Odaki 18241ccbe1 Change the title of sensitive button by state (#6771)
7 years ago
Akihiko Odaki 0dccb398bd Change the title of spoiler button by state
7 years ago
Eugen Rochko 386365090c
Fix #6762: Do not overwrite some status attributes in reducer (#6767)
7 years ago
David Yip f8e934f955
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Gô Shoemake 22f2750578
Merge pull request #384 from ThibG/glitch-soc/features/no-media-url
7 years ago
Gô Shoemake 2395a4c313
Merge pull request #344 from chriswmartin/getting-started-badge-merge
7 years ago
Thibaut Girka 841ef606a9 Remove text requirement when media attached from statuses (fixes #381)
7 years ago
Akihiko Odaki 48b940d5c6 Insert space before shortcode if necessary (#6751)
7 years ago
Yamagishi Kazutoshi 6ae70a92c9 Hide pinned toots on with replies (#6753)
7 years ago
Yuto Tokunaga fa5c867e0e Avoid using JS to set height in MediaModal (#6750)
7 years ago
Eugen Rochko 4f7f6b3922
Fix follow relationships not loading after notifications fetch (#6746)
7 years ago
Yamagishi Kazutoshi 8b14726f5b Weblate translations (2018-03-11) (#6742)
7 years ago
Marcin Mikołajczak 9090b63831 i18n: Update Polish translation and “yarn manage:translations” (#6743)
7 years ago
Eugen Rochko 56eb5c3f34
Fix focal point cropping in MediaGallery, fix focal point modal (#6740)
7 years ago
Eugen Rochko 1aaec701bb
Fix #6715: Make catalan words with the L geminate letter work in hashtags (#6741)
7 years ago
Jenkins a0724cd742 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko b6003afcdb
Add show more/less toggle for entire threads in web UI (#6733)
7 years ago
David Yip 0c2a16fcbf
Merge pull request #379 from ThibG/glitch-soc/features/improved-account-header
7 years ago
Marcin Mikołajczak f5ee2d469b i18n: Update Polish translation (#6731)
7 years ago
abcang 37b043d447 Improve performance of account_media_status_ids (#6729)
7 years ago
Eugen Rochko 4476a45444
Fix #6717: Do not double html-encode page titles (#6720)
7 years ago
Jenkins e553905ba7 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Thibaut Girka 25c5223617 Port #6627 and #6636 to glitch-soc
7 years ago
Eugen Rochko 11697d6894
Fix thumbnail not filling entire space sometimes (#6709)
7 years ago
Renato "Lond" Cerqueira 5ba4c36f95 Weblate translations (2018-03-09) (#6708)
7 years ago
Jeong Arm ccd53e983c Missing Korean translations (#6703)
7 years ago
Jenkins 447d7e6127 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko ff44b2e92d
Add missing meta description to profiles, some other SEO stuff (#6706)
7 years ago
Yamagishi Kazutoshi 188aa3ea50 Add polyfill for Object.values (#6697)
7 years ago
Eugen Rochko a29d409e20
If login redirects to omniauth, redirect logout to root_path (#6694)
7 years ago
Eugen Rochko 5acd5315f2
Improve styling of closed registrations message, rename button (#6695)
7 years ago
Eugen Rochko b79ab15859
When enabled, always display media in gallery. Also: click to reveal (#6692)
7 years ago
Eugen Rochko 77406d3a09
Display AttachmentList in notifications (#6693)
7 years ago
Eugen Rochko 510c9049c7
For now, put a "." into no-text statuses with media for backcompat (#6691)
7 years ago
Eugen Rochko 64db9ed5f6
After blocking domain with reject_media, invalidate cache (#6679)
7 years ago
Yamagishi Kazutoshi 1085ef3836 Weblate translations (2018-03-08) (#6690)
7 years ago
Eugen Rochko 86a9de6753
Display AttachmentList in timelines in compact style when media missing (#6680)
7 years ago
Renato "Lond" Cerqueira 9aba44ea79 Rescue when there's no extension in the remotable (#6358)
7 years ago
MitarashiDango 6dcf96271e fix validation error (media only status) (#6684)
7 years ago
Eugen Rochko b170627ceb
Fix cover behaviour of thumbnails that are wider than taller (#6678)
7 years ago
Eugen Rochko a1b065700a
Fix focal point modals broken by #5956 (#6676)
7 years ago
Eugen Rochko 8de048fcdb
In wide layout, columnize Mastodon features on landing page (#6674)
7 years ago
Eugen Rochko cfa9b6e13a
Remove text requirement when media attached from statuses (#6672)
7 years ago
vpzomtrrfrt e26d5ca923 Don't escape statuses while truncating (#6671)
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 89a52d6280
Fix wrong target URIs in ActivityPub Add/Remove (#6668)
7 years ago
Eugen Rochko e6520c0270
Fix #6657 - Use target instead of origin in Remove activity (#6664)
7 years ago
Akihiko Odaki 913a38111f Remove pointer events on the entire UI when a dropdown menu is open (#6648)
7 years ago
Sylvhem cb74c0cfe4 Add headings to the security settings page (#6661)
7 years ago
Akihiko Odaki a07cfee644 Extract columns area from UI component (#6650)
7 years ago
Akihiko Odaki 13cf92df27 Use React.PureComponent instead of React.Component (#6653)
7 years ago
Akihiko Odaki 61e6275781 Use withRouter for TabsBar (#6652)
7 years ago
Eugen Rochko 78d772af86
Fix #3807: Increase avatars to 400x400 max (#6651)
7 years ago
Eugen Rochko 20d1be18af
Fix accounts' display name/bio not being set from initial state (#6644)
7 years ago
Akihiko Odaki b0664a5e6c Replace onScrollToBottom with onLoadMore (#6615)
7 years ago
Akihiko Odaki a38dbd9c8a Redirect from Web tag timeline to public tag timeline if not signed in (#6633)
7 years ago
Akihiko Odaki f6a8d835d3 Place dropdown menu top if it is closer to the bottom of the viewport (#6641)
7 years ago
ThibG 4746feaa1c Add “Domain hidden” badge (#6636)
7 years ago
Renato "Lond" Cerqueira bd40574476 Weblate translations (05-03-2018) (#6640)
7 years ago
Renato "Lond" Cerqueira 1674e2f34c Normalize translations (#6638)
7 years ago
Marcin Mikołajczak 3b2e783c1f i18n: Update Polish translation (#6632)
7 years ago
ThibG 46a9a23749 Make more apparent that an account is blocked or muted (fixes #6544) (#6627)
7 years ago
Yuto Tokunaga 4e929b2d17 [RFC] Improved media modal (#5956)
7 years ago
Akihiko Odaki ef44c62d17 Do not default site_title with site_hostname in InstanceHelper (#6624)
7 years ago
abcang 219aac7800 Show media on report UI (#6619)
7 years ago
Akihiko Odaki c110fa62ac Provide default OTP_SECRET value for development environment (#6617)
7 years ago
Akihiko Odaki 7a6eaad445 Do not require images in about.js and share.js (#6622)
7 years ago
Akihiko Odaki 460e380d38 Implement tag auto-completion by history (#6621)
7 years ago
Akihiko Odaki 778b37790b Do not fetch environment variables to determine default locale (#6618)
7 years ago
Eugen Rochko b66ec3bf95
Fix #6611: Typo in change password template (#6616)
7 years ago
Akihiko Odaki 51d760960c Set the default locale in config (#6580)
7 years ago
Eugen Rochko 9110db41c5
Federate pinned statuses over ActivityPub (#6610)
7 years ago
Akihiko Odaki 45feb439bd Finalize location on scrollable notifications when unmounting (#6614)
7 years ago
Eugen Rochko 44829d8216
Fix missing focalPoint in ActivityPub JSON (#6609)
7 years ago
Aboobacker MK 49092945ab Fix 500 while searching after deleting a post (#6604)
7 years ago
David Yip 65e2a4645e
Use glitchsoc TimelineComponent's margin/padding on about page.
7 years ago
David Yip 6176e278f4
Copy in new CSS for about page.
7 years ago
Jeong Arm c82a2358bd Translate Korean (#6608)
7 years ago
David Yip 1b8fcd4df5
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko e72db6d9dd
Move "compose" on mobile to floating action button (#6594)
7 years ago
Eugen Rochko 036dd98abb
Responsively enforce 16:9 ratio on all media thumbnails in web UI (#6590)
7 years ago
Eugen Rochko 7901f9f63e
When search enabled, display hint in search popout (#6593)
7 years ago
Yamagishi Kazutoshi 0963b6fd22 Weblate translations (2018-03-02) (#6588)
7 years ago
Eugen Rochko 379cdfaac5
Fix #6586: Add close modal icon to report dialog (#6591)
7 years ago
Eugen Rochko 38b9af76a2
Improve style of web UI account tabs (#6589)
7 years ago
mayaeh e7d741ece3 i18n: Update Japanese translations (#6581)
7 years ago
Eugen Rochko a3c4138197
Add contact_account and languages to instance API (#6574)
7 years ago
Marcin Mikołajczak 51b7a22ea7 i18n: Update Polish translation (#6578)
7 years ago
Eugen Rochko 68218d97c8
Add only_media param to public and hashtag timelines API (#6576)
7 years ago
Eugen Rochko 5131012505
Add "Toots/Toots with replies/Media" tab below profile header (#6572)
7 years ago
Eugen Rochko 473a69ab18
Fix margin on top action button, fix width of counters on frontpage (#6573)
7 years ago
Eugen Rochko fce8464077
Ensure that boolean params in the API are parsed for truthiness (#6575)
7 years ago
Eugen Rochko 47bdb9b33b
Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko e852872846
Fix #5708: Reject->Follow will remove the follow if it exists (#6571)
7 years ago
Eugen Rochko 41a01bec23
Federated reports (#6570)
7 years ago
David Yip d8e964456c
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
Lynx Kotoura 7150f2e9d3 Grid layout for tag pages (#6545)
7 years ago
Lynx Kotoura a40167cf4d Better grid layout for the landing page (#6543)
7 years ago
Eugen Rochko 18513a978a
Improve public account cards (#6559)
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
yuzulabo 43cc79aaa0
Fix border-radius of owner avatar in /about/more
7 years ago
Akihiko Odaki 2e8a492e88 Raise Mastodon::HostValidationError when host for HTTP request is private (#6410)
7 years ago
Akihiko Odaki 7cb49eaa3a Do not use function name to track components (#6542)
7 years ago
Jenkins 2edf7128f2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Akihiko Odaki f8f0572ee0 Do not push status to feed if its reblog is already inserted (#6488)
7 years ago
imncls f2f19e1f8a
Update SCSS
7 years ago
imncls 7bff3243ae
Update columns.scss
7 years ago
imncls ef1d46948a
Update containers.scss
7 years ago
imncls 82408904a1
Update index.scss
7 years ago
imncls 3afc6174f5
Fix data export page error
7 years ago
imncls fa3641df7f
Update about.scss
7 years ago
imncls 697f289597
Use absolute URL for focus reticle
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 b8535ad4df
Fix nil error in focal_point? (#6537)
7 years ago
Eugen Rochko 5f3bee345d
Fix container regression (#6531)
7 years ago
beatrix 755aad534a fix typo in image serializer (#6530)
7 years ago
Eugen Rochko c71aa468b5
Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko d8bc64bb09
Fix #6526: Only store redirect location if not in JSON format (#6528)
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 4bc625166e
Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Eugen Rochko 61ed133fea
Account archive download (#6460)
7 years ago
りんすき c1e77b56a9 fix #6523 (#6524)
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 cbb69d41f6
Fix media spoiler design (#6507)
7 years ago
Konrad Pozniak bb26cdda24 add parameter locked to /api/v1/update_credentials (#6506)
7 years ago
HellPie bc6751ecce Remove outline from body window (Fixes #6501) (#6502)
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
Eugen Rochko 1122579216
Do not hide NSFW media/CW'd text in OpenGraph tags (#6479)
7 years ago
Eugen Rochko 478ca39e5e
After click to embed video, autoplay it (#6480)
7 years ago
Eugen Rochko f7765acf9d
Fix #5173: Click card to embed external content (#6471)
7 years ago
abcang ecdac9017e Fix media button type (#6478)
7 years ago
Marcin Mikołajczak ba8ec4eed6 i18n: Update Polish translation (#6470)
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
beatrix 136458eaf4
Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing
7 years ago
Thibaut Girka fb6f131fa1 Revert 245816ab27 (fixes #348)
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
ThibG 411c9ecb4b Fix password recovery (#6459)
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 2ef9d0e101
Change web UI "posts" to "toots" on profile for consistency (#6447)
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
abcang cf32f7da5c Fix response of signature_verification_failure_reason (#6441)
7 years ago
Akihiko Odaki 67f7ffa792 Change user_id column non-nullable (#6435)
7 years ago
Jenkins 3405ea6dd9 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Daniel King 95c8232109 match hashtag regex in js client with server (#6431)
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
abcang 9b6223f5e2 Validation of count works even when text of status is nil (#6429)
7 years ago
abcang 3f35d43222 Exclude nil from relationships array (#6427)
7 years ago
abcang c156a83e7d Make sure status is not nil (#6428)
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
Jenkins 530fcc1c14 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ncls7615 15a5b3372a
Fix detailed-status
7 years ago
takayamaki d75d2a9f99 fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417)
7 years ago
David Yip 4c1fd9a19c
Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
abcang 33f56811e3 Fix column header button (#6411)
7 years ago
abcang 7e5c433dfc Fix saving of oEmbed image (#6409)
7 years ago
Akihiko Odaki c1efe0aa1d Set minimum height for mastodon on drawer (#6142)
7 years ago
ThibG ac1093256c Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)
7 years ago
Charlotte Fields af40824998 moved save button (#3792)
7 years ago
Akihiko Odaki 77dd9e7d27 Remove wave from list drawer (#6381)
7 years ago
Akihiko Odaki 5da5c65db8 Unify links container implementation in about pages (#6382)
7 years ago
Akihiko Odaki 0be9a1e321 Accept ActivityPub announce from the author of the original note (#6236)
7 years ago
puckipedia 8e4cf6282b Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)
7 years ago
Alexander 04fef7b888 pam authentication (#5303)
7 years ago
abcang ffb2b8ef8c Fix button hiding when header title is too long (#6406)
7 years ago
Jenkins ad3a2dfb66 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Evgeny Petrov 3ed194b67d Russian language updated (#6397)
7 years ago
David Yip f4b2478af1
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 47eda1e5fb
Fix padding bug in landing page column header (#6374)
7 years ago
Eugen Rochko 79bc3d5845
Add direction tags to HTML e-mails for RTL languages (#6373)
7 years ago
Renato "Lond" Cerqueira 106efba800 Weblate translations (#6370)
7 years ago
Quenty31 bd8d8ad894 l10n Occitan update (#6367)
7 years ago
Jenkins 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang a3c0a20373 Fix initial_state me in push_notification_register (#6349)
7 years ago
codl 9abb5becf4
remove escapes from server-side γaml handler
7 years ago
abcang 8cd2828e91 Fix hide and show media button on admin page (#6347)
7 years ago
Quenty31 7650506b39 l10n Occitan language update (#6346)
7 years ago
Eugen Rochko daefbd66a6
Fix style of legacy column headers (#6342)
7 years ago
Eugen Rochko 1cc44cba81
Fix #6331 (#6341)
7 years ago
ThibG 4ec9d8b4d9 Display deleted users' role as “Suspended” (#6339)
7 years ago
Eugen Rochko 2fc2725076
Fix e-mail icon for reblog being stretched (#6336)
7 years ago
Thibaut Girka 2107891edb Remove some leftover code, I guess
7 years ago
cwm 0ddeed9377 add 'this.props' to fetchLists
7 years ago
Eugen Rochko 69f13e7bca
Fix regression from #6199: Make entire column header clickable (#6334)
7 years ago
cwm 939075899e remove unused openOnboardingModal from getting_started
7 years ago
cwm 00be9eb3fe merge tootsuite pr #6313 into glitch
7 years ago
Akihiko Odaki 613e7c7521 Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
Akihiko Odaki 17cecd75ca Rename FetchRemoteResourceService to ResolveURLService (#6328)
7 years ago
Akihiko Odaki 8cc65cde27 Resolve URL for local account in follow authorization success view (#6324)
7 years ago
Renato "Lond" Cerqueira b7f6ddeaf1 Weblate translations (#6323)
7 years ago
David Yip 48d79007f6
Merge remote-tracking branch 'origin/master' into merge-upstream-20180121
7 years ago
Norayr Chilingarian 48cd6dc6ca armenian translations initial commit (#6320)
7 years ago
David Yip 1253279feb
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
codl cfd2b06821 fix filter search index being too strict when looking for line breaks (#6318)
7 years ago
Aboobacker MK 112b1fa265 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
Eugen Rochko 31d1485887
Display number of follow requests in getting started menu, and (#6313)
7 years ago
Eugen Rochko 1287de1b83
Fix invalid value passed to full_asset_url in mailers (#6312)
7 years ago
David Yip 2c578a01d8
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
David Yip e7a0840f8c
Merge pull request #336 from ThibG/glitch-soc/features/tag-warning
7 years ago
David Yip 24b6e4121f
Merge pull request #342 from glitch-soc/merge-upstream
7 years ago
Iijima Yasushi 72f9eab3d6 Change mailer avatar url (#6309)
7 years ago
David Yip 3cae362214
Merge new onboarding styles; delete refs to PNGs.
7 years ago
David Yip 38f6d8130d
Eliminate stray conflict markers.
7 years ago
David Yip 071c2c9c85
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
SerCom_KC 80b3ca0f6f Update Simplified Chinese translations (#6306)
7 years ago
Eugen Rochko 45afdf1781
Fix #6269 - Render LOCAL_DOMAIN as unicode in presentational views (#6305)
7 years ago
Eugen Rochko 79b34a0fa2
Restore onboarding modal (#6303)
7 years ago
Eugen Rochko 872a0d5bd8
Improve HTML e-mails based on Litmus tests (#6301)
7 years ago
Eugen Rochko 01421999ae
Make text e-mails consistent with HTML ones in UserMailer (#6291)
7 years ago
David Yip 2ca965c704
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Thibaut Girka 1619efd735 Do not discard statuses obtained via websocket when API request finishes
7 years ago
ThibG 0b888acfd4 Do not throw away statuses obtained via websocket when API request finishes (#6302)
7 years ago
Yamagishi Kazutoshi 238de58e65 Change belongs_to_required_by_default to true (#5888)
7 years ago
ThibG b1e03197fa Process mentions and reblogs even from resolved threads (#6299)
7 years ago
ThibG a0de3222dd Retry delivering toots over ActivityPub for about 2 days (#6298)
7 years ago
Eugen Rochko 540b3f37ae
Replace drawer elephant graphic with a vector image (#6286)
7 years ago
Thibaut Girka 1287b2782b Display a warning when composing unlisted toots with something looking like a hashtag
7 years ago
David Yip 26ecee79bf
Merge pull request #332 from glitch-soc/merge-upstream
7 years ago
Eugen Rochko 9b3b40df66
Fix regeneration marker not expiring (#6290)
7 years ago
Eugen Rochko d799921c75
Replace tutorial modal with welcome e-mail (#6273)
7 years ago
David Yip 766d6aac44
Strip trailing whitespace on win95.scss
7 years ago
David Yip d3f64812a6
Merge remote-tracking branch 'cybrespace/theme_win95' into win95-update
7 years ago
David Yip 3896cd5d79
Use absolute paths for new working/not-found SVGs
7 years ago
David Yip bcd86404da
Port 7badad7797 to glitch frontend
7 years ago
David Yip 1964a0f941
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
David Yip e27eedbd08
Merge branch 'gs-master' into merge-upstream
7 years ago
David Yip 708ec07e27
Style fixes to make eslint happier, hopefully
7 years ago
Renato "Lond" Cerqueira e56404be41 When must_be_following_dm is on, only notify if recipient dm'ed user (#6283)
7 years ago
David Yip 201e82686f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 7badad7797
Fix home regeneration (#6251)
7 years ago
Renato "Lond" Cerqueira 59797ee233 Weblate translations (#6284)
7 years ago
Jenkins aa2bf07281 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
りんすき fbe7756da6 implement web share target (#6278)
7 years ago
Yamagishi Kazutoshi 0a103c7749 Upgrade ESLint to version 4.x (#6276)
7 years ago
SerCom_KC fb16c37d2a Update Simplified Chinese translations (#6280)
7 years ago
Eugen Rochko 6f244ba82c
Use better reblog icon and improve contrast in HTML e-mails (#6272)
7 years ago
mayaeh eed7484cd6 Change mailer image url (#6279)
7 years ago
Eugen Rochko 02194838dd
HTML e-mails for NotificationMailer (#6263)
7 years ago
Yamagishi Kazutoshi 9a28052e92 Change image URL in mailer to full path (#6264)
7 years ago
kibi! 60ff086960 Fixed improper mailer import
7 years ago
kibi! cda845ae0e Fix mailer to use webpack core
7 years ago
David Yip 89a9d629f7
Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 5276c0a090
HTML e-mails for UserMailer (#6256)
7 years ago
Eugen Rochko 7861c5f108
Surround mid-text display names with bdi tags (#6257)
7 years ago
Eugen Rochko 3987bd18a4
Fix #6128 - Display unfollow button even if account moved (#6258)
7 years ago
Jenkins 0c7dc6c781 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
puckipedia 74c1c9ec01 Allow attributedTo in a status to be an embedded object (#6238)
7 years ago
Patrick Figel 537d2939b1 Suppress CSRF token warnings (#6240)
7 years ago
neetshin 2091ae92be Make columns-area unscrollable when modal opened (#6241)
7 years ago
Eugen Rochko ed867eca9d
Move e-mail digest task to sidekiq, reduce workload, improve hint (#6252)
7 years ago
Gô Shoemake 08e4c78e78 Fix column headers accessibility (#6199)
7 years ago
kibi! 8ee6ed358f Increase priority of favstar gold
7 years ago
kibi! 1ee0e91fb6 Fixes to notification styling
7 years ago
kibi! b9f4896830 Fixes to drawer and CWs
7 years ago
beatrix cd6674606f
Merge pull request #329 from KnzkDev/scss-refactor
7 years ago
beatrix 39f231f3da
Merge pull request #328 from glitch-soc/feature/glitchy-elephant-friend
7 years ago
kibi! 0fb3bd09e9 Oops this should have been a part of last commit
7 years ago
kibi! 1fa03e026a Fixes onboarding modal (#318)
7 years ago
kibi! a5931e1f48 Fixed autocollapse detection
7 years ago
David Yip c2669f93d0
Fix eslint errors. #294.
7 years ago
David Yip 756a9cd139
Run slightly less afoul of accessibility checks. #294.
7 years ago
David Yip e64cc311dd
Introduce a bit of luck into the elefriend selection. #294.
7 years ago
David Yip 53cbc9933e
Add wave background; blend elefriend in a bit more. #294.
7 years ago
David Yip cd1377de7f
Bind click event to elefriend cycling. #294.
7 years ago
David Yip 1dbb6b5e08
Set glitchy elephant friend variant in initial state. #294.
7 years ago
David Yip 1e0b707018
Add the shrinking glitchy elefriend. #294.
7 years ago
David Yip 835eec8a4c
Prototype out glitchy elephant friend. #294.
7 years ago
ncls7615 f9b08e2142
Fix collapsed toot style
7 years ago
ncls7615 1ebe66b78c
Fix un-fullwidth media style
7 years ago
ncls7615 be2bac05aa
Fix media detailed style
7 years ago
ncls7615 b5476f6c75
Fix confirmation modal bug
7 years ago
ncls7615 bc0524834e
Fix letterbox bug
7 years ago
ncls7615 6ecf81cacf
Improve scss refactor 5
7 years ago
ncls7615 64425dbb77
Improve scss refactor 4
7 years ago
ncls7615 a16d885ac9
Improve scss refactor 3
7 years ago
ncls7615 5f35b39f6f
Improve scss refactor 2
7 years ago
ncls7615 bb2ca23839
Improve scss refactor 1
7 years ago
ncls7615 a9be680807
Fix padded-blocks error
7 years ago
ncls7615 6a73c8c8a2
Initial scss refactor
7 years ago
Gô Shoemake 3a0b47982d
load public.js on vanilla#admin
7 years ago
Gô Shoemake 9b9b7fa005
Load packs/public.js for glitch#admin
7 years ago
David Yip 0210e59759
Merge remote-tracking branch 'remotes/origin/fix-column-headers-accessibility'
7 years ago
Marcin Mikołajczak ee7217bc94 i18n: Update Polish translation
7 years ago
ncls7615 cf5789146b
Fix dropdown text
7 years ago
Jenkins 9fa79bc317 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 704053d221 Handle sessions that can't be translated (#6245)
7 years ago
David Yip 395e64e858
Thank you, Officer Murphy
7 years ago
David Yip 514db316f7
The flavour parameter is unused, so omit it (#317)
7 years ago
David Yip 6fcb870d96
Allow for user object to be empty. Fixes #317.
7 years ago
David Yip 095a00ef3d
Merge pull request #316 from glitch-soc/fix-async
7 years ago
kibigo! 35be02f21d Renamed glitch async chunks
7 years ago
David Yip 622c8fdb75
Merge pull request #314 from chriswmartin/merge-vanilla-updates-2
7 years ago
David Yip 991371af5f
Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 35b84985a8
Skip ActivityPub Announces of non-public objects (#6230)
7 years ago
Eugen Rochko d41f0b66cc
Fix #6204: Use content warning for page title when present (#6231)
7 years ago
cwm aef4b1af66 Refactor /api/web APIs to use the centralized axios instance (tootsuite pr #6223)
7 years ago
cwm f43c2f12f3 Fix overflowing audit logs (tootsuite pr #6184)
7 years ago
cwm 9bdbe66316 Set background to the navigation of Getting Started column (tootsuite pr #6163)
7 years ago
cwm b535f24fe5 Use const instead of let for constant (tootsuite pr #6106)
7 years ago
cwm 0d4dcb5fb2 change key to path in timeline settings containers
7 years ago
cwm 6d1c325167 Rename key to path in actions and reducers for settings (tootsuite pr #6105)
7 years ago
cwm 7f4374d97d Fix newlines-to-spaces functionality (tootsuite pr #6158)
7 years ago
cwm 8a0e4bb9a4 Hide moved account's follow button in search result (tootsuite pr #5913)
7 years ago
cwm 5963630c63 Prevent duplicate load of favourites (tootsuite pr #5931)
7 years ago
Jenkins e780d5951b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Renato "Lond" Cerqueira 9f04b0d4b1 Weblate translations (#6228)
7 years ago
David Yip ce7f4aef16
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip ec0bdd6c1a
Merge pull request #312 from glitch-soc/tag-sensitive-imgs
7 years ago
David Yip df04da098a
Merge pull request #311 from glitch-soc/dont-show-solo-skins
7 years ago
Jenkins 7c719c567c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
kibigo! 60433d03f5 Add missing comma
7 years ago
kibigo! 5d2ef7a616 Show SENSITIVE tag on sensitive images (#267)
7 years ago
kibigo! 44792de49a Don't show skins selector when there's only one (#256)
7 years ago
kibigo! 824a790e63 Threads now inherit privacy directly (#309)
7 years ago
puckipedia 628358aeea Add the author of a status to cc if reblogged (#6226)
7 years ago
Andrew fe6663ef50 Minor style fixes
7 years ago
nightpool c235711ffe Refactor /api/web APIs to use the centralized axios instance (#6223)
7 years ago
ncls7615 ef0b7d1e76
fix list editor scss
7 years ago
David Yip 65986b6f0b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 2dc4fbbd1a
When pulling out max_toot_chars, handle nulls
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 722b3f567f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko e4a241abef
Fix bad URL schemes being accepted (#6219)
7 years ago
Eugen Rochko 93555182c3
Do not display elephant friend in single-column layout (#6222)
7 years ago
puckipedia 0eff42d688 Move Article from supported to converted types (#6218)
7 years ago
David Yip f7c4d4464b
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
7 years ago
David Yip 70c99a9f34
Use error pack when rendering error pages. Fixes #305.
7 years ago
Jenkins c2e1bfd9ae Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Yamagishi Kazutoshi 1d92b90be9 Fix force_ssl conditional (#6201)
7 years ago
Yamagishi Kazutoshi da809f9eec Fix unintended cache (#6214)
7 years ago
SerCom_KC c4d36d024c Update Simplified Chinese translations (#6215)
7 years ago
David Yip 5083311d64
Merge remote-tracking branch 'ykzts/fix-unintended-cache' into gs-master
7 years ago
Yamagishi Kazutoshi 2af307bce4 Fix unintended cache
7 years ago
Andrew 56312df73b Z indexes and colors
7 years ago
Andrew 7a93acd803 To 2.1.2
7 years ago
Jenkins bcbdd4f88d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Jeong Arm 9e97fbf0af Translate Korean (#6212)
7 years ago
kibigo! b5874c1428 Fixes to search dropdown
7 years ago
beatrix 61ef8d643e
fix typo in vanilla names.yml
7 years ago