4129 Commits (9cf574d0d2230bd96e8e8ce659adefcb30a2af8f)

Author SHA1 Message Date
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