1138 Commits (2baa4d88baaef9dc4037af1394c3c28aa9392010)

Author SHA1 Message Date
Thibaut Girka fd18ed4cea Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko ca87d98d16 Revert "feat(auth/session_controller): Send Clear-Site-Data when logging out (8627)" (#9161)
6 years ago
Thibaut Girka c954f89bdd Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko cf2ab9c394 Include preview cards in status entity in REST API (#9120)
6 years ago
Thibaut Girka 65cc5faf80 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG b5042bbeeb Fix styling in /auth/edit (#9117)
6 years ago
Thibaut Girka c32a5f86b6 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko b110105a53 Allow inbox owner to view implicitly targeted ActivityPub payload (#9093)
6 years ago
Yamagishi Kazutoshi cad03e69b3 Set @body_classes to admin layout (#9081)
6 years ago
Thibaut Girka 46259a36d0 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 40d23fc4d1 Add option to block reports from domain (#8830)
6 years ago
Eugen Rochko 9ccae7feff Add "disable" button to report screen (#9024)
6 years ago
Eugen Rochko e3b2234382 Add unread indicator to conversations (#9009)
6 years ago
Thibaut Girka dbc1b36b61 Allow selecting both default flavour and theme
6 years ago
Eugen Rochko 27376e2457 Improve signature verification safeguards (#8959)
6 years ago
Eugen Rochko 0a5b65533d Improve signature verification safeguards (#8959)
6 years ago
ThibG 51c53e709f Set Content-Security-Policy rules through RoR's config (#8957)
6 years ago
Thibaut Girka 74e411f4e8 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 65d1a2d10a Remove dead code (#8919)
6 years ago
ashleyhull-versent ea57aca5e1 Replace SVG asset with Custom mascot (#8766)
6 years ago
Eugen Rochko c9b5168ebd Add conversations API (#8832)
6 years ago
Thibaut Girka bdbbbb1bdb Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 8b48543b77 Ensure only toots from the reported users are reported (#8916)
6 years ago
Thibaut Girka f627ea99e4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 1ae62b87ed Change admin accounts default sort to most recent (#8813)
6 years ago
Thibaut Girka f5eaefc485 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 5ddcdf3753 Support min_id-based pagination in REST API (#8736)
6 years ago
ふぁぼ原 bb8afc4608 Add a new preference to always hide all media (#8569)
6 years ago
Yamagishi Kazutoshi 449edebb1c Cache instance info (#8765)
6 years ago
Matt Sweetman 674865731a Add user preference to always expand toots marked with content warnings (#8762)
6 years ago
Thibaut Girka ae5c237607 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
luzpaz 1bce70d3c7 Misc. typos (#8694)
6 years ago
Thibaut Girka 19de7be7e6 Do not clear local storage on log out
6 years ago
Thibaut Girka 4dd208f482 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 72a8ca84e0 Add force_login option to OAuth authorize page (#8655)
6 years ago
Sorin Davidoi 0c756cfd54 feat(auth/session_controller): Send Clear-Site-Data when logging out (#8627)
6 years ago
Thibaut Girka 63fe7a2d7a Allow to show a specific status in the admin interface
6 years ago
Thibaut Girka 7134c1f522 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 00d1699a96 Whitelist report notification param in Settings::NotificationsController (#8560)
6 years ago
Eugen Rochko 601a0dc6cc Add preference for report notification e-mails, skip for duplicates (#8559)
6 years ago
Thibaut Girka daa6110ce7 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 108623e86d Self-notify on accepting follow requests (#8541)
6 years ago
Renato "Lond" Cerqueira c7423078ce Add animate custom emoji param to embed pages (#8507)
6 years ago
Thibaut Girka 4f4908311d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Jakub Mendyk 9c11d260e1 Make Api::V1::MutesController paginate properly (#8472)
6 years ago
Quint Guvernator 476ba6e4f0 Fix low-hanging rubocop gripes (#8458)
6 years ago
Thibaut Girka 69212ed0ad Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 94b7dddeac Add admin custom CSS setting (#8399)
6 years ago
Eugen Rochko 413a28499d Allow mods to disable login, improve message when login disabled (#8329)
6 years ago
Eugen Rochko 335b1520bb Fix regression when suspending not from report (#8400)
6 years ago
Jakub Mendyk 289b4f2838 Add ability to change an instance default theme from the administration panel (#7092) (#8381)
6 years ago
Thibaut Girka 86d2a9d480 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 9efb4edddd Override CSP setting in the embed controller to allow frames
6 years ago
Eugen Rochko 801b0f583f Add confirmation step to account suspensions (#8353)
6 years ago
Thibaut Girka 98dccee657 Merge branch 'master' into glitch-soc/master
6 years ago
ThibG 09fb9fb07e Add API endpoint to list featured accounts (fixes #8315) (#8317)
6 years ago
abcang af2122bcf9 Unuse ActiveRecord::Base#cache_key (#8185)
6 years ago
Thibaut Girka c043697caa Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 834df855e2 Add admin function to deactivate all invites (#8279)
6 years ago
Thibaut Girka 767cc06fe2 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 273e8f0474 Add remote interaction dialog for toots (#8202)
6 years ago
Thibaut Girka 334f478db1 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
ThibG 8cc34321d5 Do not error out when performing admin actions on no statuses (#8220)
6 years ago
Thibaut Girka 03ac196126 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 6c1e770658 Fix statuses batch checkboxes in admin panel (fixes #411)
6 years ago
ThibG 1d3b39e106 Ensure single user is a local user (fixes #8154) (#8157)
6 years ago
Thibaut Girka 5ed6f6db1d Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Thibaut Girka 3fd47f9bc0 Introduce OAuth scopes for bookmarks
6 years ago
Eugen Rochko 9e8366d4cb Update /terms and /about/more to use public layout (#8142)
6 years ago
Eugen Rochko 6e3cb11f3c Public profile endorsements (accounts picked by profile owner) (#8146)
6 years ago
Thibaut Girka 30c9fef4d4 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Yamagishi Kazutoshi 9e0015e834 Do not show pinned toots when min_id is set (#8111)
6 years ago
Thibaut Girka 1159490f00 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 934d50daf0 Add separate setting for sidebar text (site_short_description) (#8107)
6 years ago
Eugen Rochko a78672ae50 Compensate for scrollbar disappearing when media modal visible (#8100)
6 years ago
Eugen Rochko 7d51186e8e Order invites by recent first (#8091)
6 years ago
Eugen Rochko 13df3889f0 Redesign public profiles and toots (#8068)
6 years ago
Thibaut Girka 62b47edf17 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 2f6967913a Display trending hashtags on admin dashboard (#8038)
6 years ago
Thibaut Girka 4ec907e413 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Eugen Rochko 26bd3742e9 Fix typo in Admin::DashboardController#index
6 years ago
Eugen Rochko d0b14eaee2 Add admin dashboard (#8029)
6 years ago
Eugen Rochko 171c20ce72 Add federation relay support (#7998)
6 years ago
Thibaut Girka 7be52a7c16 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
mayaeh 3dc6c216ce Fix whole-word selection and i18n: Add Japanese translation for Whole-word (#8004)
6 years ago
Thibaut Girka 262f7d147d Migrate glitch-soc keyword mutes to Mastodon's
6 years ago
Thibaut Girka fc91260310 Set appropriate assets pack for the keyword filter page
6 years ago
Thibaut Girka cf8121376b Merge branch 'master' into glitch-soc/tentative-merge
6 years ago
ThibG 4c70bb6d6d Add option to not consider word boundaries when processing keyword filtering (#7975)
6 years ago
Eugen Rochko a7039e4fd3 Add API method to remove a suggestion (#7978)
6 years ago
Eugen Rochko 0dbaa1badf Fix missing irreversible in filters API, expires_in param (#7976)
6 years ago
Eugen Rochko 5bec5c3e6e Add admin setting to enable OG previews for sensitive media (#7962)
6 years ago
Eugen Rochko 08ee72640b If signed in, redirect autofollow invite to profile page (#7956)
6 years ago
Eugen Rochko 34fdf77f48 Add more granular OAuth scopes (#7929)
6 years ago
Eugen Rochko aa4e75166b Re-add follow recommendations API (#7918)
6 years ago
Eugen Rochko 23624f709a Improve embeds (#7919)
6 years ago
Marty McGuire 4aa3f667fc Typo in signature verification failure logging (#7916)
6 years ago
Eugen Rochko d878e3e945 Keyword/phrase filtering (#7905)
6 years ago
Thibaut Girka 44e49d2b52 Merge branch 'master' into glitch-soc/merge-upstream
6 years ago
Shuhei Kitagawa bc45dd2f97 Add tests for remote_unfollows_controller (#7879)
6 years ago
Thibaut Girka 636973707f Fix confirmations_controller
7 years ago
Thibaut Girka 8bd7b9b586 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Shuhei Kitagawa d61e647e8a Replace bypass option with bypass_sign_in (#7867)
7 years ago
Eugen Rochko f91fa10804 Allow selecting default posting language instead of auto-detect (#7828)
7 years ago
Eugen Rochko 499a9f5f11 Change language opt-out to language opt-in (#7823)
7 years ago
Thibaut Girka 3d6c594903 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 907694df6a Add autofollow option to invites (#7805)
7 years ago
David Yip 4692eed7bd Merge branch 'master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
David Yip f9c8642a11 Merge remote-tracking branch 'glitchsoc/master' into 454-allow-keyword-mutes-to-skip-mentions
7 years ago
Jenkins 695674b2fa Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Shuhei Kitagawa d230066746 Add tests for intents_controller (#7763)
7 years ago
Eugen Rochko b051d74029 Fix domain hiding logic (#7765)
7 years ago
David Yip a38c4c45da Add apply-to-mentions option to keyword mute UI. #454.
7 years ago
David Yip 9e830f7f37 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 650e3e346b Remove trending hashtags (#7711)
7 years ago
Thibaut Girka c822ecfa01 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 744d47dee2 Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)
7 years ago
tateisu 9a4bed4837 optimize direct timeline (#7614)
7 years ago
Eugen Rochko 8a3b9d26fb Track trending tags (#7638)
7 years ago
Thibaut Girka 3dc4f8e2ca Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 83b124d54b Catch ActionController::UnknownFormat and return HTTP 406 (#7621)
7 years ago
Thibaut Girka 28ccf0a464 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 32c3fc08fe Yeah, it was supposed to be #create?
7 years ago
Eugen Rochko fd007264dc Enforce order on authorized applications page (#7587)
7 years ago
Thibaut Girka 72c454e2b3 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko b634cb45dc Remove small pagination limit from context API (#7564)
7 years ago
Thibaut Girka c384e0f3de Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Eugen Rochko 7eaa12c83a Ensure push subscription is immediately removed when application is revoked (#7548)
7 years ago
David Yip 3c3e6d0e9b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko aeceb63275 Add preference to hide following/followers lists (#7532)
7 years ago
Jenkins c91bd06fa5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko db96a5ca80 Ensure unfilled fields are shown when errors are shown (#7523)
7 years ago
Eugen Rochko 71399bf1d5 HTTP signatures spec no longer requires algorithms field (#7525)
7 years ago
Thibaut Girka 7d5dbed502 Merge branch 'master' into glitch-soc/merge-upstream
7 years ago
Akihiko Odaki a81b1e6f10 Do not use permitted_for scope when querying pinned statuses (#7510)
7 years ago
Akihiko Odaki 5dadb6896b Raise Mastodon::RaceConditionError if Redis lock failed (#7511)
7 years ago
Thibaut Girka efd2441d1f Merge branch 'master' into glitch-soc/merge
7 years ago
Eugen Rochko b0e1211eec Fix 404 for GET /api/v1/push/subscription (#7472)
7 years ago
Eugen Rochko 7463d87ec3 Add GET /api/v1/push/subscription REST API (#7471)
7 years ago
Thibaut Girka d0b753db6b Merge branch 'master' into glitch-soc/merge
7 years ago
ThibG 6222c7def7 Update session activation time (fixes #5605) (#7408)
7 years ago
Shuhei Kitagawa fd0f2b675e Add tests for invites controller (#7441)
7 years ago
Eugen Rochko e86a4fe36b Add REST API for Web Push Notifications subscriptions (#7445)
7 years ago
Thibaut Girka af504e62ff Merge branch 'master' into glitch-soc/master
7 years ago
Eugen Rochko 7ff3c849d1 Bot nameplates (#7391)
7 years ago
abcang b9c17c6580 Fix distribute_add_activity and distribute_remove_activity (#7393)
7 years ago
Shuhei Kitagawa 8c8a850f8a Add resend confirmation for admin (#7378)
7 years ago
Eugen Rochko 0dcca6b6e8 Improve admin UI for accounts (#7360)
7 years ago
David Yip 087c79669a Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Jenkins 3fc6e7dabb Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
ThibG 8a6cba44aa Do not render first page of following and followers collections unless explicitly asked to (#7357)
7 years ago
Eugen Rochko 93b8db8f08 Better pagination for ActivityPub outbox (#7356)
7 years ago
David Yip c87f1d99e4 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko ca1c696dbd Slightly reduce RAM usage (#7301)
7 years ago
Eugen Rochko 4258e304c5 Allow updating bio fields via PUT /api/v1/accounts/update_credentials (#7288)
7 years ago
Eugen Rochko af240ff13c Disable API access when login is disabled (#7289)
7 years ago
Eugen Rochko e7b07f47ca Return HTTP 410 for suspended accounts in GET /api/v1/accounts/:id (#7287)
7 years ago
Eugen Rochko ba1f40c806 Fix "Show more" URL on paginated threads for remote statuses (#7285)
7 years ago
Eugen Rochko 24330e4fa7 Add RSS feeds for end-users (#7259)
7 years ago
Akihiko Odaki e22f682df0 Paginate descendant statuses in public page (#7148)
7 years ago
Yamagishi Kazutoshi 0939d9ede6 Fix spec for sr-Latn (#7203)
7 years ago
Eugen Rochko 354a6e4026 Improve report layout (#7188)
7 years ago
David Yip bae5435010 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Kaito Sinclaire 447741e456 Direct messages column (#4514)
7 years ago
abcang 5384e1e913 Improve web api protect (#6343)
7 years ago
Eugen Rochko 6e051e9c55 Set Referrer-Policy to origin in web UI and public pages of private toots (#7162)
7 years ago
Akihiko Odaki 540d2ddfe4 Redirect to account status page for page of status stream entry (#7104)
7 years ago
David Yip 9697c6d9f0 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 466442b764 Add bio fields (#6645)
7 years ago
David Yip 26f770cf72 Merge remote-tracking branch 'glitchsoc/master' into gs-master
7 years ago
David Yip 605016368d Merge pull request #419 from ThibG/glitch-soc/features/bookmarks
7 years ago
David Yip fd98bfd108 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Yamagishi Kazutoshi 9761b940ac Upgrade Rails to version 5.2.0 (#5898)
7 years ago
David Yip ac1ac20ee9 Merge remote-tracking branch 'tootsuite/master'
7 years ago
Thibaut Girka 12f8473561 Add backend support for bookmarks
7 years ago
Akihiko Odaki 6c2344d4dd Paginate ancestor statuses in public page (#7102)
7 years ago
Jenkins e4e0aa5d21 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 5a166a19a7 Feature: Improve reports ui (#7032)
7 years ago
Emelia Smith 765bfd0cf5 Feature: Allow staff to change user emails (#7074)
7 years ago
David Yip 337fc136fd Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Levi Bard 6828abc1d7 Enable updating additional account information from user preferences via rest api (#6789)
7 years ago
ThibG a91acd2010 Fix follow/unfollow buttons on public profile (fixes #7036) (#7040)
7 years ago
Alda Marteau-Hardi 17f77e51f2 Prevent admins and moderators eavesdropping in private and direct toots (#7067)
7 years ago
Jenkins 62ce70f28c Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Emelia Smith 078aa8b5ae Improve require_admin! and require_staff! filters (#7018)
7 years ago
Emelia Smith 5373b138e8 Feature: Report improvements (#6967) (#7000)
7 years ago
Emelia Smith 0408944627 Implement the ability for an Administrator or Moderator to remove an account avatar (#6998)
7 years ago
David Yip 21394c5462 Merge remote-tracking branch 'origin/master' into gs-master
7 years ago
Eugen Rochko 10fc551576 Fix unpermitted parameters warning when generating pagination URLs (#6995)
7 years ago
beatrix a7cd93032e Merge pull request #408 from ThibG/glitch-soc/fixes/admin-js
7 years ago
Thibaut Girka e282d19700 Add “public” pack to admin controller, as it is included in upstream admin layout
7 years ago
Thibaut Girka f7d23998c8 Fix migration page style
7 years ago
Jenkins 047346ce10 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko 77badbc85a If DEFAULT_LOCALE is set, enforce it instead of HTTP request locale (#6817)
7 years ago
Jenkins 828d10c327 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang f25dfde752 Improve performance of account_media_status_ids (#6729)
7 years ago
Jenkins 54608d0486 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko fdf409f3b6 If login redirects to omniauth, redirect logout to root_path (#6694)
7 years ago
Akihiko Odaki e68459fc5b Redirect from Web tag timeline to public tag timeline if not signed in (#6633)
7 years ago
Akihiko Odaki 008bc9f47d Set the default locale in config (#6580)
7 years ago
Eugen Rochko b1f8dfd3cf Federate pinned statuses over ActivityPub (#6610)
7 years ago
David Yip c08c971dd3 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 1a6e6a23a9 Add only_media param to public and hashtag timelines API (#6576)
7 years ago
Eugen Rochko f410afe59e Ensure that boolean params in the API are parsed for truthiness (#6575)
7 years ago
Eugen Rochko 9721b7746a Fix #942: Seamless LDAP login (#6556)
7 years ago
Eugen Rochko 0ebd2a1718 Federated reports (#6570)
7 years ago
Eugen Rochko 058b96ddf4 Improve public account cards (#6559)
7 years ago
Ian McCowan 88461c1abe Fix prev/next links on public profile page (#6497)
7 years ago
imncls 1e64435374 Fix data export page error
7 years ago
imncls c0aabbec0f Merge branch 'master' of https://github.com/tootsuite/mastodon
7 years ago
Ghislain Loaec d1806f5dc4 New variable OAUTH_REDIRECT_AT_SIGN_IN + Ref #6538 (not only SAML strategies) (#6540)
7 years ago
Eugen Rochko ad1f541bd7 Redesign landing page (again) (#6486)
7 years ago
Eugen Rochko eb5b1b45d9 Fix #6526: Only store redirect location if not in JSON format (#6528)
7 years ago
Eugen Rochko 865c7e7178 Focal points (#6520)
7 years ago
Eugen Rochko cdb12bd39b Fix bug in relationships API introduced by #6482 (#6527)
7 years ago
Eugen Rochko f6884555d7 Account archive download (#6460)
7 years ago
Jenkins e768ef35b1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Konrad Pozniak fa710fd496 add parameter locked to /api/v1/update_credentials (#6506)
7 years ago
David Yip 596deb050b Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
Eugen Rochko 9b7490cede Save video metadata and improve video OpenGraph tags (#6481)
7 years ago
David Yip 799b205766 Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 219b28e172 Add preference to always display sensitive media (#6448)
7 years ago
Jenkins 777559fa5f Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
abcang 1f2aa77758 Fix response of signature_verification_failure_reason (#6441)
7 years ago
David Yip 4f8122a98c Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
abcang 6e12cb4524 Exclude nil from relationships array (#6427)
7 years ago
Renato "Lond" Cerqueira 6528c0c101 Add option to show only local toots in timeline preview (#6292)
7 years ago
Eugen Rochko 5322013f25 CAS + SAML authentication feature (#6425)
7 years ago
David Yip 6d1023b2e9 Merge remote-tracking branch 'tootsuite/master' into merge-upstream
7 years ago
ThibG f7651c3449 Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207)
7 years ago
puckipedia 081ba8fc90 Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225)
7 years ago
Alexander 23ce0c86da pam authentication (#5303)
7 years ago
Jenkins 3cd4a0804b Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Eugen Rochko f378280e49 Fix #6331 (#6341)
7 years ago
Akihiko Odaki b5162e2aff Rename ResolveRemoteAccountService to ResolveAccountService (#6327)
7 years ago
David Yip a95ca95b7b Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Aboobacker MK a1979b50c9 Redirect to 2FA creation page when otp_secret is not available (#6314)
7 years ago
David Yip d45ebe26dc Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 92df0bba59 Fix regeneration marker not expiring (#6290)
7 years ago
David Yip b1155460ba Merge remote-tracking branch 'origin/master' into merge-upstream
7 years ago
Eugen Rochko 9cfbbbce1f Fix home regeneration (#6251)
7 years ago
Jenkins 8c41fb4acc Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
りんすき 1827d142ee implement web share target (#6278)
7 years ago
Jenkins 6e821c4273 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
Patrick Figel 2a27afc656 Suppress CSRF token warnings (#6240)
7 years ago
David Yip 53854707ce Thank you, Officer Murphy
7 years ago
David Yip ec1199404c The flavour parameter is unused, so omit it (#317)
7 years ago
David Yip 28e652d35d Allow for user object to be empty. Fixes #317.
7 years ago
Jenkins f9a0b246e5 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
7 years ago
nightpool eac9039a63 Refactor /api/web APIs to use the centralized axios instance (#6223)
7 years ago