merge develop
[akkoma] / lib / pleroma / web / activity_pub / activity_pub_controller.ex
2019-07-12 Roman Chvanikovmerge develop
2019-07-10 kaniiniMerge branch 'localization' into 'develop'
2019-07-10 Egor KislitsynWrap error messages into gettext helpers
2019-06-23 Sachin JoshiMerge branch 'develop' into 'remove-avatar-header'
2019-06-03 Mark FelderMerge branch 'develop' into feature/digest-email
2019-06-03 Mark FelderMerge branch 'develop' into update-oauth-template
2019-06-03 lambdaMerge branch 'align-mastodon-conversations' into 'develop'
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'...
2019-06-01 rinpatchResolve merge conflicts
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm...
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop'
2019-05-30 lambdaMerge branch 'use-pleroma-config' into 'develop'
2019-05-30 Egor KislitsynUse Pleroma.Config everywhere
2019-05-29 Roman ChvanikovMerge develop
2019-05-23 Sachin Joshifix merge conflict
2019-05-22 lambdaMerge branch 'feature/object-pruning' into 'develop'
2019-05-22 lambdaMerge branch 'refactor/keys' into 'develop'
2019-05-22 William Pitcockmove key generation functions into Pleroma.Keys module
2019-05-08 Roman ChvanikovMerge develop
2019-05-07 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-02 lambdaMerge branch 'iss-849' into 'develop'
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 lambdaMerge branch 'bugfix/web-notification-special-char...
2019-05-01 lambdaMerge branch 'harmonize_return_types_in_user_module...
2019-05-01 Alex Stest fixes
2019-05-01 Alex SMerging with develop
2019-04-23 kaniiniMerge branch 'security/fix-html-class-scrubbing' into...
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-20 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-19 kaniiniMerge branch 'feature/database-compaction' into 'develop'
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-18 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-17 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-16 kaniiniMerge branch 'feature/788-separate-email-addresses...
2019-04-16 kaniiniMerge branch 'fix/remote-follow-auth' into 'develop'
2019-04-16 HaelwennMerge branch 'bugfix/relax-spam-protection' into 'develop'
2019-04-16 William Pitcockactivitypub: allow indirect messages from users being...
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-13 lambdaMerge branch 'features/add-credo-to-ci' into 'develop'
2019-03-13 Haelwenn (lanodan... [Credo] fix Credo.Check.Readability.AliasOrder
2019-03-04 Karen KonouMerge branch 'bugfix/delete-activity-audience' of git...
2019-03-03 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-02-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-02-23 kaniiniMerge branch 'add-apache-cache-config' into 'develop'
2019-02-23 kaniiniMerge branch 'card-handling' into 'develop'
2019-02-22 lainMove visibility into own module.
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 lambdaMerge branch 'set-cache-on-user-tag-update' into 'develop'
2019-02-19 lambdaMerge branch 'fix/check-follower-collection-in-is_priva...
2019-02-19 lambdaMerge branch 'fix/ap_id-unique_constraint' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-11 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-11 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-10 kaniiniMerge branch 'update-mastofe/glitch-soc-2019-02-10...
2019-02-10 kaniiniMerge branch 'feather_mention' into 'develop'
2019-02-10 kaniiniMerge branch 'fix/credo-issues' into 'develop'
2019-02-09 Haelwenn (lanodan... de-group alias/es
2019-02-09 Haelwenn (lanodan... Credo fixes: alias grouping/ordering
2019-02-08 Karen KonouMerge branch 'develop' into feature/thread-muting
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into...
2019-02-06 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-05 kaniiniMerge branch 'fix-dm-index' into 'develop'
2019-02-05 kaniiniMerge branch 'feature/ap-c2s-whoami' into 'develop'
2019-02-04 William Pitcockactivitypub: c2s: add /api/ap/whoami endpoint for andstatus
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-04 rinpatchMerge branch 'fix/rich-media-relative-path' into 'develop'
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-01 hrefMerge branch 'develop' into 'develop'
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-01-31 Egor KislitsynMerge remote-tracking branch 'MAIN/develop' into featur...
2019-01-29 Ivan Tashkinov[#534] Made federation push sender be determined basing...
2019-01-28 Egor Kislitsynadd a job queue
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`.
2019-01-28 Ivan Tashkinov[#534] Refactoring / tweaks per MR review.
2019-01-24 Ivan Tashkinov[#534] Updating external instances reachability on...
2019-01-18 rinpatchFix merge conflict
2019-01-14 rinpatchMerge branch 'media-url-escape' into 'develop'
2019-01-14 lambdaMerge branch 'load-all-dms' into 'develop'
2019-01-14 kaniiniMerge branch 'feature/add-oembed-parser' into 'develop'
2019-01-14 kaniiniMerge branch 'activitypub-likes' into 'develop'
2019-01-14 kaniiniMerge branch 'fix-nginx-caching' into 'develop'
next