tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,094 Commits 10 Branches 0 Tags
2bbf987a0a352a36ef0cc7f06fe366b60593e89c
Commit Graph
4094 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Eugen RochkoandGitHub 4cbb638604 Fix visual line-break glitch with .invisible parts of links (#4655) 2017-08-21 17:59:34 +02:00
Eugen RochkoandGitHub 3534e115e5 Do not try to re-subscribe to unsubscribed accounts (#4653) 2017-08-21 17:32:41 +02:00
abcangandEugen Rochko ea958cae7f Refactoring streaming connections (#4645) 2017-08-21 15:04:34 +02:00
Yamagishi KazutoshiandEugen Rochko 10e9a9a3f9 Use URI.join even when S3 enabled (#4652) 2017-08-21 12:42:16 +02:00
Eugen RochkoandGitHub 6e9eda5331 ActivityPub migration procedure (#4617) 
* ActivityPub migration procedure

Once one account is detected as going from OStatus to ActivityPub,
invalidate WebFinger cache for other accounts from the same domain

* Unsubscribe from PuSH updates once we receive an ActivityPub payload

* Re-subscribe to PuSH unless already unsubscribed, regardless of protocol
 2017-08-21 01:14:40 +02:00
m4sk1nandYamagishi Kazutoshi 4c23544714 i18n: Minor changes in Polish translation (#4649) 
* i18n: Minor changes in Polish translation

* i18n: pl
 2017-08-21 07:57:28 +09:00
Eugen RochkoandGitHub 74e5078795 Fix #4637 - Re-add missing doorkeeper_authorize for /api/v1/verify_credentials (#4650) 2017-08-21 00:41:08 +02:00
Yamagishi KazutoshiandEugen Rochko 110227ac5e Remove status from favorites list when unfavorited (#4597) 2017-08-20 23:23:05 +02:00
unaristandEugen Rochko f26758dc01 Fix .information-board style for Safari (#4602) 
flex-basis: 0 allows make flexbox smaller than its contents on Safari <10.

https://github.com/philipwalton/flexbugs#1-minimum-content-sizing-of-flex-items-not-honored
 2017-08-20 20:45:44 +02:00
abcangandEugen Rochko 23792f5a7c Fix hasUnread on HashtagTimeline (#4644) 2017-08-20 17:12:06 +02:00
Eugen RochkoandGitHub fe5b66aa08 Handle duplicate ActivityPub activities (#4639) 
* Handle duplicate ActivityPub activities

Only perform side-effects when record processed for the first time

* Fast-forward repeat follow requests
 2017-08-20 16:53:47 +02:00
Quent-inandYamagishi Kazutoshi 93d4192a67 l10n update OC : Redesign public profiles (#4608) (#4646) 
New strings added to be shown on the new profile page
 2017-08-20 21:49:12 +09:00
takayamakiandYamagishi Kazutoshi d5acf4275f Improve about ja translation standalone.public_title (#4641) 2017-08-20 20:27:14 +09:00
Eugen RochkoandGitHub 412ea87306 Improve ActivityPub/OStatus compatibility (#4632) 
*Note: OStatus URIs are invalid for ActivityPub. But we have them for
as long as we want to keep old OStatus-sourced content and as long as
we remain OStatus-compatible.*

- In Announce handling, if object URI is not a URL, fallback to object URL
- Do not use specialized ThreadResolveWorker, rely on generalized handling
- When serializing notes, if parent's URI is not a URL, use parent's URL
 2017-08-19 18:44:48 +02:00
Eugen RochkoandGitHub 774b8661bc Revert #4616 (#4638) 2017-08-19 02:23:47 +02:00
Eugen RochkoandGitHub c7d2619ab1 Parse OStatus tag URIs in ActivityPub handlers when those are local (#4631) 2017-08-18 11:24:44 +02:00
Yamagishi KazutoshiandEugen Rochko 2edfdab6e6 Don't send Link header when don't know prev and next links (#4633) 2017-08-18 10:42:59 +02:00
Eugen RochkoandGitHub 4edf9d849f Make ActivityPub::TagManager#local_uri? recognize local URIs with ports (#4628) 2017-08-18 03:21:59 +02:00
Eugen RochkoandGitHub 10489b4e4a If url attribute not present in Note, fallback to id attribute (#4629) 2017-08-18 02:29:12 +02:00
Eugen RochkoandGitHub 40c45f5dd9 Put ActivityPub alternate link into Atom, prefer it when processing Atom (#4623) 2017-08-18 01:03:18 +02:00
nightpoolandEugen Rochko efec02f153 use existing inflections instead of custom helper (#4624) 
* use existing inflections instead of custom helper

* use ActiveSupport versions
 2017-08-17 23:20:50 +02:00
Eugen RochkoandGitHub 116b8a6363 Fix #4607 - Accept/reject activities use FollowRequest, which has inverse relations (#4616) 2017-08-17 22:15:37 +02:00
Eugen RochkoandGitHub ad892dbc0c Add _:atomUri property for deduplicating OStatus/ActivityPub legacy records (#4593) 2017-08-17 21:35:00 +02:00
nullkalandEugen Rochko 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
 2017-08-17 17:52:40 +02:00
nullkalandEugen Rochko 54a04e3658 Update charlock_holmes to 0.7.5 (#4620) 2017-08-17 14:46:53 +02:00
Naoki KosakaandYamagishi Kazutoshi 462c30e26c Update Japanese Translation. (Redesign public profiles) (#4612) 2017-08-17 06:19:37 +09:00
m4sk1nandEugen Rochko 2a04bdc87a i18n: Update Polish translation (#4613) 
* i18n: Update Polish translation

* Update pl.json
 2017-08-16 22:14:23 +02:00
Eugen RochkoandGitHub 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
 2017-08-16 17:12:58 +02:00
ClworldandEugen Rochko 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.
 2017-08-16 16:48:44 +02:00
Quent-inandYamagishi Kazutoshi e33c28a6d8 Update ActivityPub (#4600) (#4609) 
Update: new string + more translations for the time in words
 2017-08-16 17:21:34 +09:00
abcangandEugen Rochko e120d09c98 Fix require_user! behavior when not logged in (#4604) 2017-08-15 14:14:12 +02:00
Eugen RochkoandGitHub 4fcbb1f838 Re-add missing transaction around status-from-OStatus creation (#4603) 2017-08-14 21:37:21 +02:00
unaristandEugen Rochko a855956185 Fix ActivityPub follow interaction and add more specs (#4601) 2017-08-14 16:57:46 +02:00
unaristandEugen Rochko 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
 2017-08-14 14:09:00 +02:00
Yamagishi KazutoshiandEugen Rochko 5f22c0189d Add support for searching AP users (#4599) 
* Add support for searching AP users

* use JsonLdHelper
 2017-08-14 14:08:34 +02:00
Eugen RochkoandGitHub 26d26644ac Require "inbox" to be set on actor to be ActivityPub-ready (#4595) 2017-08-14 11:27:25 +02:00
Eugen RochkoandGitHub 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
 2017-08-14 04:53:31 +02:00
Yamagishi KazutoshiandEugen Rochko 96e9ed13de Fix search (regression from #4589) (#4594) 2017-08-14 04:50:56 +02:00
Eugen RochkoandGitHub 6df8bd277b Set correct content-type for ActivityPub JSON (#4592) 2017-08-14 04:16:43 +02:00
Eugen RochkoandGitHub 4e75f0d889 Hook up URL-based resource look-up to ActivityPub (#4589) 2017-08-14 02:29:36 +02:00
Eugen RochkoandGitHub a2aeacbfee Add alternate links to ActivityPub resources from HTML/HEAD variants (#4586) 2017-08-13 00:45:04 +02:00
Eugen RochkoandGitHub 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
 2017-08-13 00:44:41 +02:00
Eugen RochkoandGitHub ccdd5a9576 Add serializing/unserializing of "locked" actor attribute (#4585) 2017-08-12 17:41:03 +02:00
Eugen RochkoandGitHub 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
 2017-08-12 16:30:59 +02:00
Eugen RochkoandGitHub 3d47154c20 Only PuSH-resubscribe to OStatus accounts (#4583) 2017-08-12 02:54:54 +02:00
SylvhemandEugen Rochko 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".
 2017-08-12 01:33:30 +02:00
Eugen RochkoandGitHub 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
 2017-08-10 22:33:12 +02:00
Quent-inandEugen Rochko 4b8e4dca26 l10n Update OC #4521 (#4577) 
* l10n Update OC #4521

Link => token
provider => provesidor
+ more generalized way of using present participle

* Update oc.yml
 2017-08-10 22:15:26 +02:00
splaandYamagishi Kazutoshi 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
 2017-08-10 21:52:40 +09:00
Yamagishi KazutoshiandEugen Rochko d9a1fb134a Fix emoji picker scrollbar style (#4572) 2017-08-10 13:41:12 +02:00