mastodon

Commit Graph

Author	SHA1	Message	Date
Eugen Rochko	ad892dbc0c	Add _:atomUri property for deduplicating OStatus/ActivityPub legacy records (#4593 )	8 years ago
nullkal	075d6a1e13	Show what protocol is used for accounts in admin/accounts#index (#4622 ) * Show what protocol used for in admin/accounts#index * Add frozen_string_literal	8 years ago
nullkal	54a04e3658	Update charlock_holmes to 0.7.5 (#4620 )	8 years ago
Naoki Kosaka	462c30e26c	Update Japanese Translation. (Redesign public profiles) (#4612 )	8 years ago
m4sk1n	2a04bdc87a	i18n: Update Polish translation (#4613 ) * i18n: Update Polish translation * Update pl.json	8 years ago
Eugen Rochko	ca7ea1aba9	Redesign public profiles (#4608 ) * Redesign public profiles * Responsive design * Change public profile status filtering defaults and add options - No longer displays private/direct toots even if you are permitted access - By default omits replies - "With replies" option - "Media only" option * Redesign account grid cards * Fix style issues	8 years ago
Clworld	f814661fca	Make share intent modal to make "signed in as" shown. (#4611 ) * Make share intent modal to make "signed in as" shown. * fix glitch on mobile.	8 years ago
Quent-in	e33c28a6d8	Update ActivityPub (#4600 ) (#4609 ) Update: new string + more translations for the time in words	8 years ago
abcang	e120d09c98	Fix require_user! behavior when not logged in (#4604 )	8 years ago
Eugen Rochko	4fcbb1f838	Re-add missing transaction around status-from-OStatus creation (#4603 )	8 years ago
unarist	a855956185	Fix ActivityPub follow interaction and add more specs (#4601 )	8 years ago
unarist	5b9ae7981e	Update /admin/accounts/:id view for ActivityPub (#4600 ) * Add protocol field * Switch protocol specific information according to active protocol * Hide PuSH subscription related buttons if ActivityPub is active	8 years ago
Yamagishi Kazutoshi	5f22c0189d	Add support for searching AP users (#4599 ) * Add support for searching AP users * use JsonLdHelper	8 years ago
Eugen Rochko	26d26644ac	Require "inbox" to be set on actor to be ActivityPub-ready (#4595 )	8 years ago
Eugen Rochko	3c6503038e	Add protocol handler. Handle follow intents (#4511 ) * Add protocol handler. Handle follow intents * Add share intent * Improve code in intents controller * Adjust share form CSS	8 years ago
Yamagishi Kazutoshi	96e9ed13de	Fix search (regression from #4589 ) (#4594 )	8 years ago
Eugen Rochko	6df8bd277b	Set correct content-type for ActivityPub JSON (#4592 )	8 years ago
Eugen Rochko	4e75f0d889	Hook up URL-based resource look-up to ActivityPub (#4589 )	8 years ago
Eugen Rochko	a2aeacbfee	Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586 )	8 years ago
Eugen Rochko	b7370ac8ba	ActivityPub delivery (#4566 ) * Deliver ActivityPub Like * Deliver ActivityPub Undo-Like * Deliver ActivityPub Create/Announce activities * Deliver ActivityPub creates from mentions * Deliver ActivityPub Block/Undo-Block * Deliver ActivityPub Accept/Reject-Follow * Deliver ActivityPub Undo-Follow * Deliver ActivityPub Follow * Deliver ActivityPub Delete activities Incidentally fix #889 * Adjust BatchedRemoveStatusService for ActivityPub * Add tests for ActivityPub workers * Add tests for FollowService * Add tests for FavouriteService, UnfollowService and PostStatusService * Add tests for ReblogService, BlockService, UnblockService, ProcessMentionsService * Add tests for AuthorizeFollowService, RejectFollowService, RemoveStatusService * Add tests for BatchedRemoveStatusService * Deliver updates to a local account to ActivityPub followers * Minor adjustments	8 years ago
Eugen Rochko	ccdd5a9576	Add serializing/unserializing of "locked" actor attribute (#4585 )	8 years ago
Eugen Rochko	40be4ea239	Extend Devise remember_me longevity to 1 year instead of 2 weeks (#4587 ) Force SSL only cookies for remember_me, adjust confirmation expiration time to fit with the user cleanup scheduler	8 years ago
Eugen Rochko	3d47154c20	Only PuSH-resubscribe to OStatus accounts (#4583 )	8 years ago
Sylvhem	d0a217eb92	Minor fixes in the French translation (#4580 ) * Ajout de traductions manquantes Ajoute des traductions pour les chaînes n’en ayant pas en version 1.5.1. Add translations for the strings that are missing them in 1.5.1. * Remplace « ' » par « ’ » Retire de la traduction les apostrophes droites « ' » (U+0027) au profit des apostrophes typographiques « ’ » (U+2019). En typographie française, les apostrophes typographiques sont utilisées à la place des apostrophes droites. La traduction était incohérente et utilisait les deux. Remove from the translation all the vertical apostrophes (U+0027) in favor of the curly ones (U+2019). In French typography, typographic apostrophes are used instead of vertical ones. The translation was incoherent and used both. * Ajout d’espaces insécables Ajoute des espaces insécables suivant les régles nécessaires en typographie française. Add non-breaking spaces following rules of French typography. * Remplace « status » par « statut » Remplace le mot anglais « status » par sa traduction française « statut ». Replace the English word "status" by its French translation "statut". * Correction de la politique de confidentialité Apporte diverses corrections à la traduction de la politique de confidentialité. Add various fixes to the privacy policy's translation. * Remplace « mentionné » par « mentionné·e » Harmonise la traduction en remplaçant « mentionné » par sa forme épicène. Harmonize the translation by replacing "mentionné" (sure) by its epicene form. * Remplace « Coup d’œil » par « Jeter un coup d’œil… » Remplace la première traduction par une forme plus proche de la version originelle. Replace the first translation by something closer to the original version. * Remplace « Bon Appétoot ! » par « Bon appouetit ! » Remplace « Bon Appétoot ! » par « Bon appouetit ! » pour essayer de conserver le jeu de mot. Replace « Bon Appétoot ! » by « Bon appouetit ! » to keep the pun. * Remplace « Bon Appétoot ! » par « Bon appouetit ! » (2) Remplace « Bon Appétoot ! » par « Bon appouetit ! » pour essayer de conserver le jeu de mot. Replace « Bon Appétoot ! » by « Bon appouetit ! » to keep the pun.f * Corrections Corrige des fautes d’orthographe et change « appouetit » pour « appouétit ». Correct some mistakes and change "appouetit" to "appouétit".	8 years ago
Eugen Rochko	81c1303cd6	Handle ActivityPub follows correctly (#4571 ) * Handle ActivityPub follows correctly ActivityPub follows are follow-requests. Always require an Accept. If account is not locked, auto-accept. * Handle ActivityPub Accept/Reject-Follow * Fix wrong method * Fix wrong class	8 years ago
Quent-in	4b8e4dca26	l10n Update OC #4521 (#4577 ) * l10n Update OC #4521 Link => token provider => provesidor + more generalized way of using present participle * Update oc.yml	8 years ago
spla	10cdad3e7d	Added new catalan strings (#4574 ) * Add Catalan language * Add Catalan language * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update ca.json * Update settings_helper.rb * Update mastodon.js * Update index.js * Update application.rb * Update ca.yml * removed extra spaces at line 225 * Catalan translation update added activerecord.ca.yml * Update activerecord.ca.yml Done * Updated activerecord.ca.yml * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Catalan language updated * Update ca.json Removed : <<<<<<< HEAD "getting_started.support": "{faq} • {userguide} • {apps}", ======= >>>>>>> upstream/master * Syncing to master * Added new Catalan strings * removed config.secret_key line * Corrected <sotrong> tag to <strong> Line 515 * Removed extra line * Reverted * yarn.lock reverted	8 years ago
Yamagishi Kazutoshi	d9a1fb134a	Fix emoji picker scrollbar style (#4572 )	8 years ago
Eugen Rochko	fdea173237	Add Digest header to requests with body, handle acct and URI keyId (#4565 )	8 years ago
m4sk1n	4e1bf082ce	i18n: Improve admin panel translation (pl) (#4559 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
Ondřej Hruška	b1c8a702a4	Add favourited toot to favourites column (#4562 ) * Add faved toot to faves column * renamed append to prepend for clarity	8 years ago
Ondřej Hruška	820099813f	add scrollTop to ui/components/column (#4563 )	8 years ago
Gergely Nagy	2ebe4ff568	api/instances: Include the stats from the /about/more page (#4074 ) To be able to pull some basic statistics from a Mastodon instance, include the user, status and connected domain counters in the `/api/v1/instance` response. Fixes #3570. Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>	8 years ago
Ondřej Hruška	61bfce5aa9	add missing @ to the onboarding modal (#4560 )	8 years ago
Eugen Rochko	dd7ef0dc41	Add ActivityPub inbox (#4216 ) * Add ActivityPub inbox * Handle ActivityPub deletes * Handle ActivityPub creates * Handle ActivityPub announces * Stubs for handling all activities that need to be handled * Add ActivityPub actor resolving * Handle conversation URI passing in ActivityPub * Handle content language in ActivityPub * Send accept header when fetching actor, handle JSON parse errors * Test for ActivityPub::FetchRemoteAccountService * Handle public key and icon/image when embedded/as array/as resolvable URI * Implement ActivityPub::FetchRemoteStatusService * Add stubs for more interactions * Undo activities implemented * Handle out of order activities * Hook up ActivityPub to ResolveRemoteAccountService, handle Update Account activities * Add fragment IDs to all transient activity serializers * Add tests and fixes * Add stubs for missing tests * Add more tests * Add more tests	8 years ago
Lynx Kotoura	dcbc1af38a	Fix short description in about/more page (#4554 )	8 years ago
Yamagishi Kazutoshi	81c41d8681	Add coalesce option to avatar and header convert processor (#4552 ) Resolve #3199	8 years ago
雨宮美羽	ec3be87a2b	improve zh-CN translations (#4557 )	8 years ago
unarist	b42c018bb8	Add Content-Type header on throttled response to fix mojibake (#4558 ) application/json only allows Unicode, so this prevents from wrong charset detection.	8 years ago
TheInventrix	c9fd6f386c	unify short description styling (#4548 ) apply same style class to the About description on both the landing page and the about/more page	8 years ago
Yamagishi Kazutoshi	1b5d26735e	Revert "Set false to animated options for thumbnail processor" (#4550 ) * Revert "Adjust tags and accounts page (#4534)" This reverts commit `a3e53bd442`. * Revert "feat: Cache status height to avoid expensive renders (#4439)" This reverts commit `8eb6d171e6`. * Revert "Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)" This reverts commit `5942347407`. * Revert "Update dependencies for Ruby (#4543)" This reverts commit `22db947225`. * Revert "[Docker] Add multicore support to "make" and "bundler" (#4544)" This reverts commit `5d408fd9aa`. * Revert "It makes no sense to try using invalid or expired link again (#4521)" This reverts commit `47579ec58c`. * Revert "i18n: Update Polish translation (#4545)" This reverts commit `3363a05539`. * Revert "Set false to animated options for thumbnail processor (#4547)" This reverts commit `87f10d476c`.	8 years ago
Lynx Kotoura	a3e53bd442	Adjust tags and accounts page (#4534 ) * Adjust tag and accounts page * Remove units from 0px paddings	8 years ago
Sorin Davidoi	8eb6d171e6	feat: Cache status height to avoid expensive renders (#4439 ) * feat: Cache status height to avoid expensive renders * feat: Escape content and emojify in reducers * fix(css): Remove backface-visibility: hidden from .scrollable * fix(statuses): Avoid creating DOMParses inside a loop	8 years ago
Ondřej Hruška	5942347407	Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526 ) * Refactored Avatar and AvatarOverlay (DRY) to have 'account' as prop. Also removed animate attribute from compose navigation bar, which should have never been there. Added test for avatar overlay. * fix broken tests * god dammit another bug in tests! travis please let this pass * formatting in avatar overlay	8 years ago
Yamagishi Kazutoshi	22db947225	Update dependencies for Ruby (#4543 ) * Update twitter-text to version 1.14.7 * Update tilt to version 2.0.8 * Update statsd-instrument to version 2.1.4 * Update sidekiq to version 5.0.4 * Update sidekiq-scheduler to version 2.1.8 * Update sidekiq-unique-jobs to version 5.0.9 * Update redis-activesupport to version 5.0.3 * Update rails-settings-cached to version v0.6.6 * Update pkg-config to version 1.2.4 * Update parallel_tests to version 2.14.2 * Update jsonapi-renderer to version 0.1.3 * Update i18n-tasks to version 0.9.16 * Update httplog to version 0.99.7 * Update fabrication to version 2.16.2 * Update bootsnap to version 1.1.2 * Update aws-sigv4 to version 1.0.1 * Update aws-sdk-core to version 2.10.21 * Update hashdiff to version 0.3.5 * Update rails to version 5.1.3	8 years ago
Thomas Leister	5d408fd9aa	[Docker] Add multicore support to "make" and "bundler" (#4544 ) * Let make and bundler use multiple cores * Adds -j option to bundle install instead of bundle config	8 years ago
m4sk1n	47579ec58c	It makes no sense to try using invalid or expired link again (#4521 ) Signed-off-by: Marcin Mikołajczak <me@m4sk.in>	8 years ago
m4sk1n	3363a05539	i18n: Update Polish translation (#4545 )	8 years ago
Yamagishi Kazutoshi	87f10d476c	Set false to animated options for thumbnail processor (#4547 ) Resolve #3199 Fix the aspect ratio of animated GIF whose background is transparent.	8 years ago
Eugen Rochko	41c3389d76	Bump to 1.5.1	8 years ago

... 2 3 4 5 6 ...

4022 Commits (6994664a1391d6a027caec3d5ca9e022f41a0711) All Branches Search

4022 Commits (6994664a1391d6a027caec3d5ca9e022f41a0711)

All Branches