logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
DateCommit messageAuthorFiles+-
2019-02-07 15:41Pleroma.Formatter: Replace with/height on emojis to class='emoji'Haelwenn (lanodan) Monnier1+1-3
2019-02-03 14:13download-mastofe-build.sh: New scriptHaelwenn (lanodan) Monnier1+28-0
2018-10-16 01:57rebase.sh: script (legacy)Haelwenn (lanodan) Monnier1+6-0
2018-09-16 21:09[PleromaFE] Update frontendHaelwenn (lanodan) Monnier24+1208-81
2018-10-30 01:04.mailmap: Link lanodan’s Gitlab to regular commitsHaelwenn (lanodan) Monnier1+1-0
2018-04-30 00:31lib/pleroma/web/router.ex: Remove complete globbing allowing to 404 on unknown APIsHaelwenn (lanodan) Monnier1+10-1
2018-03-22 05:43priv/static/instance/panel.html: Personnal configHaelwenn (lanodan) Monnier1+7-4
2018-02-03 23:23upgrade.sh: CreateHaelwenn (lanodan) Monnier3+42-1
2019-02-20 18:21Merge branch 'feature/improve-error-logging' into 'develop'lambda2+16-4
2019-02-20 16:51Merge branch 'feature/reports' into 'develop'kaniini18+347-5
2019-02-20 16:42Merge branch 'nicer-share-urls' into 'develop'kaniini2+9-2
2019-02-20 16:15Merge branch '468_oauth2_scopes' into 'develop'lambda24+735-219
2019-02-20 13:19Merge branch 'muting' into 'develop'lambda9+205-22
2019-02-19 22:45Merge branch 'set-activation-status-admin-api' into 'develop'kaniini4+65-0
2019-02-19 14:20Merge branch 'set-cache-on-user-tag-update' into 'develop'lambda1+1-1
2019-02-19 14:08Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'lambda1+6-1
2019-02-19 14:07Merge branch 'fix/ap_id-unique_constraint' into 'develop'lambda1+1-0
2019-02-18 19:43Merge branch 'feature/jobs' into 'develop'kaniini16+370-152
2019-02-18 04:11Merge branch 'patch-image-description' into 'develop'kaniini2+18-2
2019-02-18 04:02Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'kaniini6+109-1
2019-02-18 04:01Merge branch 'features/flavour-switching' into 'develop'kaniini6+95-5
2019-02-18 04:01Merge branch 'follow-request-count' into 'develop'kaniini9+91-18
2019-02-18 03:59Merge branch 'csv-export' into 'develop'kaniini2+12-1
2019-02-17 17:53Merge branch 'docs/add-clients-to-ex_doc' into 'develop'lambda1+1-0
2019-02-17 17:38Merge branch 'docker-speedup' into 'develop'lambda2+4-3
2019-02-17 17:37Merge branch 'mastoapi-stop-capping-attachments' into 'develop'lambda3+19-2
2019-02-17 16:57Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'lambda2+49-26
2019-02-16 17:39Merge branch 'welcome-message' into 'develop'rinpatch5+56-1
2019-02-15 14:58Merge branch 'bugfix/oauth-token-padding' into 'develop'lambda4+12-6
2019-02-15 13:18Merge branch 'hellthread-filter-fix' into 'develop'rinpatch3+113-23
2019-02-15 12:27Merge branch 'bugfix/actor-containment' into 'develop'rinpatch3+12-4
2019-02-14 19:54Merge branch 'bugfix/activitypub-reserialization' into 'develop'lambda2+67-7
2019-02-14 10:10Merge branch 'fix/mediaproxy-s3' into 'develop'href2+22-0
2019-02-14 03:55Merge branch 'fix/credo-issues-test' into 'develop'kaniini30+109-52
2019-02-14 03:40Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'Haelwenn2+36-14
2019-02-14 02:50Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'kaniini4+68-8
2019-02-13 23:42Merge branch 'feature/better-login-errors' into 'develop'kaniini2+30-0
2019-02-13 13:04Merge branch 'mass-follow-fixes' into 'develop'rinpatch2+6-3
2019-02-13 07:51Merge branch 'doc/mark-streaming-feature-for-apps-2' into 'develop'kaniini1+2-0
2019-02-13 07:32Merge branch 'bugfix/mdii-uploader' into 'develop'kaniini1+1-1
2019-02-12 22:41Merge branch 'feature/csp_mastofe-dev' into 'develop'kaniini2+19-3
2019-02-12 02:44Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'Haelwenn1+2-2
2019-02-12 02:35Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'Haelwenn1+11-0
2019-02-11 18:45Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'kaniini2+138-22
2019-02-11 15:02Merge branch 'feature/thread-muting' into 'develop'rinpatch9+170-2
2019-02-11 12:33Merge branch 'feature/rich-media-limits' into 'develop'lambda1+8-1
2019-02-11 08:22Merge branch 'revert-e0de0fcf' into 'develop'lambda4+19-53
2019-02-10 21:28Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'kaniini371+557-564
2019-02-10 21:16Merge branch 'feather_mention' into 'develop'kaniini1+4-0
2019-02-10 20:54Merge branch 'fix/credo-issues' into 'develop'kaniini73+396-227
2019-02-10 19:25Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'kaniini2+6-5
2019-02-10 14:21Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'lambda1+5-4
2019-02-10 13:47Merge branch 'docs/pleroma-clients' into 'develop'lambda2+84-14
2019-02-10 07:39Merge branch 'object-creation' into 'develop'rinpatch4+53-19
2019-02-09 21:03Merge branch 'follow-enhancements' into 'develop'kaniini2+12-11
2019-02-09 11:39Merge branch 'add-media-path-to-caddy-cache' into 'develop'lambda1+5-0
2019-02-09 11:38Merge branch 'feature/keyword-policy' into 'develop'lambda5+222-0
2019-02-08 12:18Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'lambda1+3-3
2019-02-08 12:10Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'lambda1+5-4
2019-02-08 12:09Merge branch 'oauth2_strengthening' into 'develop'lambda2+9-9
2019-02-07 02:19Merge branch 'remove-pawoo-apps-from-readme' into 'develop'kaniini1+0-1
2019-02-07 02:18Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'kaniini1+3-3
2019-02-06 22:40Merge branch 'rename-followings' into 'develop'kaniini9+27-27
2019-02-06 18:39Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn2+59-2
2019-02-06 18:19Merge branch 'add-admin-and-moderator-fields' into 'develop'kaniini5+78-9
2019-02-06 18:02Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'Haelwenn2+21-1
2019-02-06 17:47Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch1+2-0
2019-02-06 09:47Merge branch '2019-02-06-update-frontend' into 'develop'lambda21+84-77
2019-02-05 21:01Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'rinpatch1+4-14
2019-02-05 20:27Merge branch 'fix-dm-index' into 'develop'kaniini2+31-1
2019-02-05 20:26Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini2+9-0
2019-02-05 20:13Merge branch 'testfix/twitter-api' into 'develop'kaniini1+1-1
2019-02-05 18:56Merge branch 'feature/split-hide-network-v2' into 'develop'kaniini10+90-45
2019-02-05 18:53Merge branch 'bugfix/rich-media-image-nil' into 'develop'kaniini2+7-2
2019-02-05 11:30Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'lambda1+2-0
2019-02-05 11:29Merge branch 'patch-2' into 'develop'lambda1+1-0
2019-02-05 11:28Merge branch 'bugfix/rich-media-nil' into 'develop'lambda1+2-0
2019-02-04 19:20Merge branch 'feature/mrf-tag' into 'develop'Haelwenn2+173-0
2019-02-04 17:32Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'rinpatch1+4-1
2019-02-04 16:52Merge branch 'mime-riff' into 'develop'kaniini1+9-1
2019-02-04 16:01Merge branch 'fix/rich-media-relative-path' into 'develop'rinpatch1+14-3
2019-02-04 12:36Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch4+47-11
2019-02-03 21:06Merge branch 'mogrify-orient' into 'develop'kaniini2+3-3
2019-02-03 18:19Merge branch '589-fix-cache' into 'develop'lambda8+51-19
2019-02-03 15:47Merge branch '582_federation_retirement_optimization' into 'develop'kaniini8+178-43
2019-02-02 10:48Merge branch 'fix/oauth-page-responsiveness' into 'develop'rinpatch1+2-1
2019-02-01 20:23Merge branch 'revert-0a82a7e6' into 'develop'kaniini10+45-88
2019-02-01 19:45Merge branch 'hotfix/object-normalize-cache' into 'develop'href1+2-2
2019-02-01 19:39Merge branch 'streaming-api-url-fix' into 'develop'href2+5-1
2019-02-01 19:18Merge branch 'develop' into 'develop'href3+85-8
2019-02-01 17:27Merge branch 'bugfix/get_list_return_404' into 'develop'Haelwenn1+4-1
2019-02-01 17:05Merge branch 'feature/split-hide-network' into 'develop'kaniini10+88-45
2019-02-01 14:24Merge branch 'serve-sw-pleroma.js' into 'develop'lambda2+2-2
2019-02-01 09:33Merge branch 'fix-rich-media-toggle' into 'develop'lambda1+1-1
2019-02-01 09:14Merge branch '534_federation_targets_reachability' into 'develop'href24+775-115
2019-01-31 22:28Merge branch 'docs/pleroma-api-invite-token' into 'develop'Haelwenn1+1-0
2019-01-31 18:50Merge branch 'user-follow-all-unique' into 'develop'kaniini2+23-1
2019-01-31 16:54Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda4+4948-13
2019-01-31 16:28Merge branch 'develop' into 'develop'kaniini1+1-1
2019-01-31 16:22Merge branch 'fix/rich-media-disable-in-config' into 'develop'kaniini3+7-1
2019-01-31 12:16Merge branch 'revert-4d3655c4' into 'develop'lambda5+0-1240
2019-01-31 11:29Merge branch 'spc-fix-3' into 'develop'kaniini5+1240-0
2019-01-31 10:16Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn9+162-11
2019-01-31 10:12Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'Haelwenn551+1417-659
2019-01-30 21:38Merge branch 'add-wiki-reference-to-readme' into 'develop'kaniini1+28-27
2019-01-30 20:18Merge branch 'multiple-hackney-pools' into 'develop'lambda3+3-3
2019-01-30 20:17Merge branch '2019-1-30-update-frontend' into 'develop'lambda36+140-93
2019-01-30 19:01Merge branch 'multiple-hackney-pools' into 'develop'kaniini8+86-12
2019-01-30 18:50Merge branch 'better-following' into 'develop'kaniini3+38-29
2019-01-30 10:56Merge branch 'docs/fix-frontend_config' into 'develop'Haelwenn1+1-1
2019-01-30 10:38Merge branch 'docs/fix-frontend_config' into 'develop'kaniini1+2-2
2019-01-29 19:24Merge branch 'docs/fix-pleroma-api-title' into 'develop'lambda1+1-5
2019-01-29 14:47Merge branch 'bugfix/fix-rejects' into 'develop'kaniini2+21-2
2019-01-29 13:54Merge branch 'hj-happiness-improvement' into 'develop'kaniini8+159-19
2019-01-29 05:11Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'Haelwenn17+159-131
2019-01-28 14:31Merge branch 'app-list-changes' into 'develop'kaniini1+8-5
2019-01-28 11:48Merge branch 'safe-render-activities' into 'develop'Haelwenn1+0-1
2019-01-28 10:49Merge branch 'oauth-login-failure-bug' into 'develop'href2+27-1
2019-01-28 08:23Merge branch 'patch-2' into 'develop'Haelwenn1+1-1
2019-01-27 22:01Merge branch 'notice-404-to-fe' into 'develop'rinpatch2+7-4
2019-01-27 20:10Merge branch 'safe-render-activities' into 'develop'lambda3+29-2
2019-01-27 19:10Merge branch 'discard-invalid-likes' into 'develop'kaniini1+5-5
2019-01-27 15:22Merge branch 'hotfix/favorites-index' into 'develop'kaniini1+8-0
2019-01-27 15:16Merge branch 'flake-random-worker-id' into 'develop'kaniini1+3-18
2019-01-27 14:28Merge branch 'docs/emoji-endpoint-similarities' into 'develop'rinpatch1+1-0
2019-01-27 12:45Merge branch 'features/mastoapi-multi-hashtag' into 'develop'kaniini4+108-4
2019-01-27 09:45Merge branch 'features/masto-account-view-rights' into 'develop'Haelwenn2+9-3
2019-01-26 17:30Merge branch 'hardening/mastodon-rich-media' into 'develop'Haelwenn1+10-2
2019-01-26 17:27Merge branch 'webpush-endpoint-size' into 'develop'kaniini1+9-0
2019-01-26 16:17Merge branch 'flake-from-int' into 'develop'kaniini2+5-0
2019-01-26 15:57Merge branch 'join-in-preloads' into 'develop'kaniini2+10-3
2019-01-26 15:47Merge branch 'features/mastoapi-cards' into 'develop'kaniini6+70-12
2019-01-26 14:10Merge branch 'documentation/mastalab' into 'develop'kaniini1+1-0
2019-01-26 13:41Merge branch 'bugfix/content_nil_lenght_check' into 'develop'kaniini2+12-1
2019-01-25 15:16Merge branch 'oembed_provider' into 'develop'kaniini13+476-22
2019-01-25 10:23Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'lambda10+25-25
2019-01-25 05:19Merge branch 'fix/tusky-dm' into 'develop'kaniini9+79-52
2019-01-25 04:59Merge branch 'classic-flakeids' into 'develop'kaniini21+542-37
2019-01-25 04:57Merge branch 'update/pleroma-fe-20190125' into 'develop'kaniini16+67-66
2019-01-24 13:22Merge branch 'fix-activity_visibility-autovacuum' into 'develop'kaniini1+37-0
2019-01-24 10:20Merge branch 'feature/mrf-anti-followbot' into 'develop'href2+114-0
2019-01-23 23:47Merge branch 'fix/hide-network-setting' into 'develop'kaniini2+5-0
2019-01-23 13:25Merge branch 's3-namespace' into 'develop'kaniini1+9-1
2019-01-23 13:20Merge branch 'fix-info-id' into 'develop'href1+9-0
2019-01-23 12:14Merge branch 'rename/pleroma_activity_consistency' into 'develop'lambda20+57-64
2019-01-22 16:10Merge branch 'mr/20190122-activity-visibility-update' into 'develop'href1+36-0
2019-01-22 14:28Merge branch 'fix/activity_get_by_id' into 'develop'Haelwenn1+4-0
2019-01-22 14:18Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'lambda2+12-1
2019-01-22 09:03Merge branch 'uploader-controller' into 'develop'kaniini3+63-4
2019-01-21 20:02Merge branch 'fix-buggy-test' into 'develop'rinpatch1+2-2
2019-01-21 16:19Merge branch 'proxy-no-default-plug-cache' into 'develop'lambda1+18-5
2019-01-21 13:03Merge branch '530_federator_user_info_overwrite_fix' into 'develop'lambda2+6-7
2019-01-21 12:35Merge branch 'feature/dm-sanity' into 'develop'lambda8+186-4
2019-01-21 05:22Merge branch 'bugfix/gen_signing_salt' into 'develop'rinpatch2+4-1
2019-01-20 23:06Merge branch '116-send-delete-event' into 'develop'kaniini3+44-10
2019-01-20 10:58Merge branch 'add-custom-emoji-test' into 'develop'lambda1+7-0
2019-01-20 10:42Merge branch '2019-1-20-update-frontend' into 'develop'lambda20+70-70
2019-01-20 10:24Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'lambda7+230-41
2019-01-19 23:44Merge branch 'bugfix/improve-boost-targeting' into 'develop'kaniini5+32-13
2019-01-19 07:36Merge branch '491_full_mentions_in_user_bio' into 'develop'kaniini5+45-15
2019-01-17 19:27Merge branch '502_instance_stats_active_users_count_fix' into 'develop'kaniini3+15-5
2019-01-17 19:22Merge branch 'bad-copy-paste' into 'develop'kaniini1+1-1
2019-01-17 19:21Merge branch 'attachment-links' into 'develop'kaniini4+11-3
2019-01-17 19:21Merge branch 'change-mix-location' into 'develop'kaniini1+13-5
2019-01-17 03:19Merge branch 'resilient-user-view-2' into 'develop'kaniini4+57-14
2019-01-16 09:06Merge branch 'feature/improve-microformats' into 'develop'lambda7+37-27
2019-01-16 08:59Merge branch '518_instance_stats_fix' into 'develop'lambda2+24-7
2019-01-15 20:02Merge branch 'bugfix/websub-hardening' into 'develop'lambda2+13-0
2019-01-15 20:00Merge branch 'bugfix/tesla-query-params' into 'develop'lambda2+9-1
2019-01-15 08:51Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'lambda1+3-2
2019-01-15 07:01Merge branch 'bugfix/upload_with_question_mark' into 'develop'rinpatch2+22-1
2019-01-14 18:52Merge branch 'media-url-escape' into 'develop'rinpatch2+16-1
2019-01-14 18:49Merge branch 'load-all-dms' into 'develop'lambda1+0-10
2019-01-14 07:28Merge branch 'feature/add-oembed-parser' into 'develop'kaniini5+77-1
2019-01-14 07:27Merge branch 'activitypub-likes' into 'develop'kaniini8+200-3
2019-01-14 07:25Merge branch 'fix-nginx-caching' into 'develop'kaniini1+3-1
2019-01-14 07:23Merge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'kaniini1+29-0
2019-01-13 16:01Merge branch 'bugfix/favourites-link-header' into 'develop'lambda2+34-4
2019-01-11 23:09Merge branch 'bugfix/pinned-statuses' into 'develop'kaniini2+24-0
2019-01-11 10:02Merge branch 'fix-spellign' into 'develop'scarlett1+1-1
2019-01-10 18:49Merge branch 'fix-varnish-chunked' into 'develop'kaniini1+51-25
2019-01-10 18:42Merge branch 'activitypub-dereference-activity-id' into 'develop'kaniini3+57-14
2019-01-10 18:09Merge branch 'feature/add-twitter-card-parser' into 'develop'kaniini6+72-27
2019-01-10 18:03Merge branch 'twapi-follower-pagination' into 'develop'kaniini3+83-8
2019-01-10 03:54Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'Haelwenn2+50-2
2019-01-10 02:39Merge branch 'feature/pinned-posts' into 'develop'kaniini19+370-14
2019-01-10 02:33Merge branch 'mass-follow' into 'develop'kaniini2+31-4
2019-01-10 02:31Merge branch 'dm-optimizations' into 'develop'kaniini3+95-14
2019-01-10 01:08Merge branch 'fix-alphasort' into 'develop'kaniini1+21-21
2019-01-09 18:42Merge branch 'hotfix/ogp-cachex-fix' into 'develop'rinpatch1+1-1
2019-01-09 16:26Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'lambda4+20-7
2019-01-09 07:09Merge branch 'hotfix/media-proxy-uri' into 'develop'kaniini3+97-12
2019-01-08 22:58Merge branch 'autofollow' into 'develop'rinpatch4+38-2
2019-01-07 22:25Merge branch 'features/syslog_logger' into 'develop'kaniini4+19-2
2019-01-07 20:39Merge branch 'spc-fix-2' into 'develop'kaniini2+10-5
2019-01-07 17:09Merge branch 'resilient-user-view' into 'develop'kaniini3+52-1
2019-01-07 12:20Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop'lambda2+26-5
2019-01-05 22:54Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop'kaniini2+43-1
2019-01-05 22:34Merge branch 'fix/user-search-null-name' into 'develop'kaniini2+11-1
2019-01-05 22:33Merge branch 'fix_486' into 'develop'kaniini1+8-2
2019-01-05 22:29Merge branch 'activitypub-tombstone-fix' into 'develop'kaniini3+29-0
2019-01-05 21:52Merge branch 'emoji-in-summary' into 'develop'scarlett4+34-5
2019-01-04 23:56Merge branch 'feature/rich-media-cachex' into 'develop'rinpatch2+19-1
2019-01-04 23:35Merge branch 'fix/html-cache-content-collision' into 'develop'kaniini3+21-28
2019-01-04 20:50Merge branch 'feature/rich-media' into 'develop'kaniini9+179-1
2019-01-04 20:32Merge branch 'activitypub-c2s-delete-activity' into 'develop'kaniini2+101-17
2019-01-03 22:30Merge branch 'mr/retry-queue-remove-fold' into 'develop'kaniini1+1-2
2019-01-03 22:29Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'kaniini1+1-7
2019-01-03 18:53Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'kaniini1+1-0
2019-01-03 17:04Merge branch 'captcha' into 'develop'rinpatch10+125-97
2019-01-03 08:59Merge branch 'fix-chat' into 'develop'rinpatch1+13-0
2019-01-02 16:23Merge branch 'fix/reserve-media-username' into 'develop'rinpatch1+2-1
2019-01-01 20:12Merge branch 'pool-usage' into 'develop'kaniini4+9-12
2019-01-01 18:55Merge branch 'configurable-federator' into 'develop'rinpatch4+27-14
2019-01-01 16:55Merge branch '2019-1-1-update-frontend' into 'develop'lambda19+69-69
2019-01-01 13:48Merge branch 'cleanup/admin-api-useless-if' into 'develop'lambda1+2-7
2018-12-31 15:49Merge branch 'features/admin-api-user-views' into 'develop'kaniini3+19-6
2018-12-31 15:49Merge branch 'docs/admin-api' into 'develop'kaniini3+105-3
2018-12-31 15:43Merge branch 'maintenance/copyright-2019' into 'develop'kaniini137+137-137
2018-12-31 09:56Merge branch 'fix/scrubber-cache' into 'develop'lambda6+70-9
2018-12-30 21:47Merge branch 'mr/retry-queue' into 'develop'kaniini2+202-24
2018-12-30 19:50Merge branch 'activitypub-c2s' into 'develop'kaniini5+186-7
2018-12-29 17:30Merge branch 'fix_485' into 'develop'Haelwenn1+1-1
2018-12-29 13:47Merge branch '2018-12-29-update-frontend' into 'develop'lambda20+78-74
2018-12-29 11:46Merge branch 'carrot-bullying' into 'develop'kaniini4+29-1
2018-12-29 11:34Merge branch '483_blocks_import_export' into 'develop'kaniini8+173-19
2018-12-29 11:32Merge branch 'support/issue_480' into 'develop'kaniini3+18-4
2018-12-29 03:03Merge branch '471_invalid_accounts_rendering' into 'develop'kaniini3+86-61
2018-12-28 20:14Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'kaniini1+2-0
2018-12-28 18:33Merge branch 'fix/no-attachment-links' into 'develop'kaniini1+1-1
2018-12-28 18:30Merge branch 'fix/public-timeline-auth' into 'develop'kaniini2+61-1
2018-12-27 22:10Merge branch '396_elixir_1.7' into 'develop'Haelwenn2+3-3
2018-12-27 19:37Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'kaniini9+53-13
2018-12-27 19:35Merge branch 'reserve-user-names' into 'develop'kaniini5+61-3
2018-12-27 19:22Merge branch 'feature/exclude_reblogs' into 'develop'kaniini5+74-0
2018-12-26 20:11Merge branch 'fix/ci-set-mix-env-globally' into 'develop'Haelwenn1+5-4
2018-12-25 17:53Merge branch 'legal-boilerplate' into 'develop'lambda224+896-0
2018-12-23 14:46Merge branch 'bugfix/trans_fix_url_videos' into 'develop'lambda7+97-14
2018-12-23 13:17Merge branch 'hotfix/activity-without-content' into 'develop'lambda1+5-3
2018-12-23 11:28Merge branch 'feature/hellthread-mitigation' into 'develop'kaniini3+23-0
2018-12-20 16:31Merge branch 'ci-test-fix' into 'develop'lambda1+2-2
2018-12-20 13:28Merge branch '114_email_confirmation' into 'develop'kaniini21+398-24
2018-12-20 09:35Merge branch 'support/issue_413' into 'develop'kaniini2+16-9
2018-12-20 09:06Merge branch 'fix/readme-md-config-typo' into 'develop'kaniini1+1-1
2018-12-20 04:12Merge branch 'readme' into 'develop'kaniini1+4-4
2018-12-20 04:01Merge branch 'documentation/copy-pleroma-api' into 'develop'kaniini4+100-3
2018-12-19 00:12Merge branch 'userless-admin' into 'develop'kaniini4+78-2
2018-12-18 21:11Merge branch 'fix/ci-cache-improved' into 'develop'lambda1+2-0
2018-12-18 20:23Merge branch 'fix/formatter-ignore-html-chars' into 'develop'lambda2+15-3
2018-12-18 15:42Merge branch 'feature/new-user-routes' into 'develop'lambda1+2-2
2018-12-18 15:41Merge branch 'new-routes-integration' into 'develop'lambda19+68-68
2018-12-18 15:18Merge branch 'ci-test-fix' into 'develop'lambda1+2-0
2018-12-18 10:42Merge branch 'runtime-static-plug' into 'develop'lambda7+107-3
2018-12-17 20:36Merge branch '2018-12-17-update-frontend' into 'develop'lambda30+118-103
2018-12-17 20:24Merge branch 'fix-test' into 'develop'lambda1+6-1
2018-12-17 20:16Merge branch '459_fix_user_profile_crash' into 'develop'lambda1+4-1
2018-12-17 20:11Merge branch 'support/issue_449' into 'develop'lambda2+22-1
2018-12-17 19:45Merge branch 'captcha' into 'develop'lambda12+288-25
2018-12-17 19:38Merge branch 'fix-tags' into 'develop'lambda3+20-3
2018-12-17 19:37Merge branch 'test-mix-tasks' into 'develop'lambda5+370-13
2018-12-17 19:30Merge branch 'phoenix14' into 'develop'lambda16+500-211
2018-12-17 09:19Merge branch 'testfix/webfinger-jrd' into 'develop'lambda2+14-1
2018-12-16 13:19Merge branch 'netbsd-script' into 'develop'scarlett1+57-0
2018-12-16 12:13Merge branch 'develop' into 'develop'Haelwenn3+114-0
2018-12-16 11:21Merge branch 'fix/masto-put-settings' into 'develop'eal3+23-4
2018-12-16 11:08Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'eal1+1-0
2018-12-15 15:31Merge branch 'bugfix/webfinger-jrd' into 'develop'lambda2+38-0
2018-12-15 15:23Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'lambda1+6-0
2018-12-15 15:22Merge branch 'tests-warning-as-errors' into 'develop'lambda1+1-6
2018-12-15 15:21Merge branch 'feature/mix-task-instance-port-specification' into 'develop'lambda2+11-7
2018-12-14 20:30Merge branch 'fix/issue_433' into 'develop'href7+49-11
2018-12-14 20:22Merge branch '114_email_invites' into 'develop'href7+145-2
2018-12-14 20:20Merge branch 'fix/issue_272' into 'develop'href2+49-2
2018-12-14 18:50Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'href8+154-110
2018-12-14 13:00Merge branch 'feature/file-size-checking' into 'develop'href1+8-0
2018-12-14 09:16Merge branch '114_user_registration_emails' into 'develop'href13+169-2
2018-12-14 08:26Merge branch 'fix/double-rt-or-fav' into 'develop'lambda2+44-2
2018-12-14 08:25Merge branch 'fix/qvitter-fav-object' into 'develop'lambda2+9-0
2018-12-14 08:23Merge branch '2018-12-13-update-frontend' into 'develop'lambda37+1307-107
2018-12-13 15:13Merge branch 'username-underscores' into 'develop'lambda4+23-9
2018-12-13 15:10Merge branch 'fix/mix-tasks-set-user-info' into 'develop'lambda1+26-17
2018-12-12 20:38Merge branch 'fix/nginx-safari' into 'develop'lambda1+5-0
2018-12-12 07:28Merge branch 'support/issue_442' into 'develop'kaniini32+204-184
2018-12-10 23:32Merge branch 'new-fe-options' into 'develop'scarlett3+14-2
2018-12-10 19:55Merge branch '2018-12-10-update-frontend' into 'develop'lambda19+66-65
2018-12-10 19:08Merge branch 'fix_empty_bio_crash' into 'develop'lambda2+23-2
2018-12-10 19:06Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'lambda1+9-2
2018-12-10 19:06Merge branch 'fix/config-md-typos' into 'develop'lambda1+3-3
2018-12-10 19:05Merge branch 'support/bugfix_272' into 'develop'lambda2+66-49
2018-12-10 19:04Merge branch 'fix/theora-detection-read-bytes' into 'develop'lambda1+1-1
2018-12-10 19:03Merge branch 'anonymize-filter-text' into 'develop'lambda2+27-3
2018-12-10 18:28Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'lambda58+240-288
2018-12-09 13:53Merge branch 'angristan-docker' into 'develop'Haelwenn1+1-1
2018-12-08 09:12Merge branch 'fix/add-upload.ex' into 'develop'lambda1+98-0
2018-12-08 09:12Merge branch 'fix/nodeinfo-nil-features' into 'develop'lambda1+22-17
2018-12-08 09:11Merge branch 'fix/media-proxy-url-encoded' into 'develop'lambda3+51-2
2018-12-08 09:08Merge branch 'fix/typo-relay-ex' into 'develop'lambda1+1-1
2018-12-07 18:49Merge branch 'fix/gopher-respect-ip' into 'develop'lambda1+1-1
2018-12-07 18:48Merge branch 'media-proxy-follow-redirect' into 'develop'lambda1+1-1
2018-12-07 18:25Merge branch '394_user_tags' into 'develop'lambda10+168-7
2018-12-07 18:13Merge branch 'emoji-alphabetical-ordering' into 'develop'lambda1+1-1
2018-12-07 09:23Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'lambda1+5-1
2018-12-07 09:19Merge branch 'fix/typo-in-relay-doc' into 'develop'lambda1+1-1
2018-12-07 06:48Merge branch 'fix/add-common.ex' into 'develop'eal1+24-0
2018-12-06 22:09Merge branch 'refactor/mix-tasks' into 'develop'kaniini21+568-573
2018-12-06 16:01Merge branch 'fix/mastodon-api-settings' into 'develop'kaniini3+10-7
2018-12-06 15:57Merge branch 'correct-and-improve-http-options' into 'develop'kaniini8+20-27
2018-12-06 15:36Merge branch 're-mrf' into 'develop'kaniini2+41-0
2018-12-06 15:35Merge branch 'feature/compat/push-subscriptions' into 'develop'kaniini15+291-10
2018-12-06 07:36Merge branch '210_twitter_api_uploads_alt_text' into 'develop'kaniini11+180-46
2018-12-05 21:41Merge branch 'follower-hiding' into 'develop'kaniini7+241-13
2018-12-05 20:47Merge branch 'dev_vald_fe/data_tag' into 'develop'kaniini7+31-23
2018-12-05 17:55Merge branch 'support/oauth_fetch_token' into 'develop'lambda2+112-18
2018-12-05 17:53Merge branch 'fix/mix-tasks-userinfo' into 'develop'lambda3+27-23
2018-12-05 08:28Merge branch 'bugfix/408' into 'develop'lambda2+13-0
2018-12-04 19:00Merge branch 'optional-retry-queue' into 'develop'kaniini1+9-1
2018-12-04 18:41Merge branch 'feature/integration_tesla' into 'develop'kaniini37+1067-923
2018-12-04 18:36Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'lambda1+1-1
2018-12-03 16:31Merge branch 'fix/parse-user-bio' into 'develop'lambda7+64-20
2018-12-03 16:14Merge branch 'fix-media-proxy-defaults' into 'develop'lambda1+2-2
2018-12-03 06:03Merge branch 'update-pleroma-frontend' into 'develop'kaniini14+60-58
2018-12-02 23:07Merge branch 'user_info_fixes_again' into 'develop'Haelwenn4+11-3
2018-12-01 22:11Merge branch 'validate-user-info' into 'develop'kaniini46+634-405
2018-12-01 15:17Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'lambda1+5-6
2018-12-01 03:09Merge branch 'feature/anonymize-filenames' into 'develop'kaniini2+24-0
2018-11-30 18:15Merge branch 'feature/reverse-proxy' into 'develop'kaniini31+1217-423
2018-11-30 17:57Merge branch 'config-delete' into 'develop'lambda2+29-0
2018-11-30 17:56Merge branch 'supervisor-order' into 'develop'lambda2+42-35
2018-11-30 04:36Merge branch 'bugfix/server-true-in-prod' into 'develop'kaniini1+0-1
2018-11-29 09:34Merge branch 'enable-ci-cache' into 'develop'lambda1+5-0
2018-11-28 21:10Merge branch 'fix-list-stream-privacy' into 'develop'lambda2+110-2
2018-11-27 23:20Merge branch 'revert-02e43d44' into 'develop'kaniini1+0-2
2018-11-27 22:59Merge branch 'chore/mix-lock-update' into 'develop'kaniini1+2-0
2018-11-27 17:10Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'kaniini1+1-1
2018-11-27 16:55Merge branch 'ogg-theora-detection' into 'develop'kaniini1+7-1
2018-11-27 00:12Merge branch 'feature/mrf-user-allowlist' into 'develop'Haelwenn3+42-0
2018-11-26 23:59Merge branch 'fix/pleromafe-title' into 'develop'kaniini1+3-1
2018-11-26 22:24Merge branch 'bugfix/csp-no-https' into 'develop'kaniini1+5-1
2018-11-26 19:56Merge branch 'add-manifest-src-to-csp' into 'develop'Haelwenn1+1-0
2018-11-25 02:54Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'kaniini3+84-13
2018-11-22 00:28Merge branch 'feature/admin-api' into 'develop'kaniini9+412-14
2018-11-21 16:53Merge branch 'feature/improve-version' into 'develop'kaniini6+58-13
2018-11-20 22:25Merge branch 'runtime-fixes' into 'develop'kaniini9+26-22
2018-11-20 19:04Merge branch 'feature/retry-queue' into 'develop'Haelwenn5+150-25
2018-11-20 18:09Merge branch 'fix/mediaproxy-empty-url' into 'develop'kaniini2+117-2
2018-11-18 17:29Merge branch 'update/pleroma-fe-20181118' into 'develop'kaniini13+58-58
2018-11-17 22:43Merge branch 'security/as2-object-render-hardening' into 'develop'lambda2+52-1
2018-11-17 22:20Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop'lambda2+41-3
2018-11-17 21:52Merge branch 'security/spoofing-hardening' into 'develop'lambda7+195-17
2018-11-17 18:33Merge branch 'security/actor-containment' into 'develop'lambda7+107-7
2018-11-17 16:41Merge branch 'feature/uploader-mdii' into 'develop'kaniini2+30-0
2018-11-16 23:34Merge branch 'bugfix/dm-timeline-scope' into 'develop'kaniini2+10-3
2018-11-16 18:13Merge branch 'feature/pleromafe-usersearch' into 'develop'lambda5+42-2
2018-11-16 17:47Merge branch 'bugfix/csp-remove-form-action' into 'develop'kaniini1+0-1
2018-11-16 15:52Merge branch 'fix/test' into 'develop'lambda1+2-0
2018-11-14 18:17Merge branch 'fix-media-proxy-filename' into 'develop'lambda2+2-2
2018-11-14 16:10Merge branch 'update/pleroma-fe-20181114' into 'develop'kaniini16+73-59
2018-11-14 08:52Merge branch 'twitter-api-direct-messages' into 'develop'kaniini5+75-2
2018-11-13 15:15Merge branch 'media-proxy-safety' into 'develop'lambda3+46-5
2018-11-13 13:23Merge branch 'security/cookie-hardening' into 'develop'lambda1+6-1
2018-11-13 12:24Merge branch 'add-MIX_ENV-to-systemd-example' into 'develop'lambda1+1-0
2018-11-13 12:22Merge branch 'whalebird' into 'develop'lambda1+2-1
2018-11-12 17:08Merge branch 'twitter-api-null-display-name' into 'develop'scarlett2+13-2
2018-11-12 15:30Merge branch 'feature/csp-plug' into 'develop'kaniini10+155-52
2018-11-11 16:44Merge branch 'update-readme' into 'develop'Haelwenn1+3-1
2018-11-11 13:41Merge branch 'fix-list-streaming' into 'develop'kaniini1+7-3
2018-11-11 05:49Merge branch 'bugfix/corsplug-config' into 'develop'kaniini2+14-10
2018-11-11 05:34Merge branch 'bugfix/oauth-padding' into 'develop'kaniini1+3-0
2018-11-10 12:37Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'lambda3+71-1
2018-11-10 12:25Merge branch 'feature/documentation' into 'develop'kaniini17+198-137
2018-11-10 11:50Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'kaniini3+46-4
2018-11-10 11:37Merge branch 'bugfix/local-jsonld-context' into 'develop'kaniini3+28-3
2018-11-10 11:17Merge branch 'tests/prismo-url-map' into 'develop'kaniini4+83-0
2018-11-09 16:00Merge branch 'bugfix/no-cc-mentions' into 'develop'lambda7+204-38
2018-11-08 17:42Merge branch 'feature/jsonld-context-cleanup' into 'develop'kaniini2+2-13
2018-11-08 16:23Merge branch 'small-jsonld-refactor' into 'develop'lambda4+9-22
2018-11-07 22:33Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'kaniini5+116-0
2018-11-07 22:32Merge branch 'runtime-config' into 'develop'kaniini18+191-163
2018-11-07 16:04Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'lambda1+6-0
2018-11-06 21:24Merge branch 'patch-2' into 'develop'kaniini1+0-1
2018-11-06 16:18Merge branch 'unify-mastodon-oauth' into 'develop'kaniini4+52-49
2018-11-06 15:35Merge branch 'runtime-router' into 'develop'kaniini11+183-35
2018-11-06 15:09Merge branch 'remove-config-agent' into 'develop'lambda7+61-26
2018-11-06 07:37Merge branch 'use-the-same-example-domain-and-use-it-as-variable' into 'develop'kaniini3+36-24
2018-11-06 07:33Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'kaniini1+1-1
2018-11-05 18:40Merge branch 'runtime-emojis' into 'develop'lambda5+205-126
2018-11-04 03:09Merge branch 'tests-for-emtpy-content' into 'develop'kaniini1+18-0
2018-11-03 15:36Merge branch 'feature/cors-again' into 'develop'kaniini3+4-1
2018-11-03 13:54Merge branch 'bugfix/harden_status_output' into 'develop'Haelwenn1+4-4
2018-11-03 12:40Merge branch 'hashtag-search-case-sensitivity-test' into 'develop'lambda1+11-2
2018-11-02 20:05Merge branch 'fix_hashtag_search' into 'develop'lambda1+1-0
2018-11-02 18:55Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'lambda2+17-0
2018-11-01 14:14Merge branch 'hotfix/prismo-twitterapi' into 'develop'Haelwenn1+1-1
2018-11-01 10:48Merge branch 'feature/as2-page-support' into 'develop'kaniini4+4-4
2018-11-01 09:31Merge branch 'bugfix/filter-id' into 'develop'kaniini3+110-11
2018-11-01 09:10Merge branch 'feature/relay-tests' into 'develop'kaniini9+125-8
2018-11-01 09:05Merge branch 'bugfix/prismo.news_article_url' into 'develop'Haelwenn2+23-1
2018-11-01 08:51Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini7+59-15
2018-11-01 07:43Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini4+41-5
2018-11-01 05:58Merge branch 'bugfix/caching-activity-delete' into 'develop'Haelwenn1+2-1
2018-10-31 22:36Merge branch 'bugfix/allow-self-like' into 'develop'kaniini1+0-2
2018-10-30 23:22Merge branch 'allow-abbr' into 'develop'kaniini1+2-0
2018-10-30 20:30Merge branch 'reactivate' into 'develop'kaniini5+20-5
2018-10-29 20:14Merge branch 'feature/upload-limits' into 'develop'kaniini6+103-56
2018-10-29 18:07Merge branch 'feature/s3-force-media-proxy' into 'develop'kaniini3+17-4
2018-10-29 17:33Merge branch 'bugfix/mediaproxy-leaks-2-electric-boogaloo' into 'develop'kaniini1+2-0
2018-10-29 15:28Merge branch 'bugfix/mediaproxy-leaks' into 'develop'kaniini2+5-4
2018-10-28 19:54Merge branch 'feature/unsubscribe-user-task' into 'develop'kaniini1+32-0
2018-10-28 05:52Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'kaniini1+3-2
2018-10-28 05:49Merge branch 'psql-setup-cleanup' into 'develop'kaniini1+2-5
2018-10-26 19:03Merge branch 'update-pleroma-frontend' into 'develop'kaniini15+76-56
2018-10-26 06:45Merge branch 'feature/broken-thread-filtering' into 'develop'kaniini4+85-1
2018-10-26 06:39Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'kaniini1+1-1
2018-10-26 03:14Merge branch 'bugfix/fd-exhaustion' into 'develop'kaniini1+2-1
2018-10-26 01:36Merge branch 'bugfix/unshared-inbox-check' into 'develop'kaniini1+5-0
2018-10-25 23:49Merge branch 'feature/nodeinfo-frontend-config' into 'develop'kaniini1+20-4
2018-10-25 18:24Merge branch 'finmoji-optional' into 'develop'kaniini2+10-3
2018-10-25 05:30Merge branch 'bugfix/user-inbox-bcc' into 'develop'kaniini4+74-3
2018-10-25 04:38Merge branch 'bugfix/ap-uri-user-search' into 'develop'kaniini1+2-0
2018-10-25 04:35Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'Haelwenn2+30-6
2018-10-25 04:16Merge branch 'feature/add-in-reply-to-profileurl' into 'develop'kaniini5+20-14
2018-10-25 03:11Merge branch 'feature/in-reply-to-screen-name' into 'develop'kaniini5+28-0
2018-10-25 00:16Merge branch 'update-pleroma-frontend' into 'develop'kaniini14+59-56
2018-10-25 00:15Merge branch 'security/add-security-directives-to-systemd-example' into 'develop'kaniini1+10-0
2018-10-23 00:56Merge branch 'bugfix/html-scrub-comments' into 'develop'kaniini1+2-4
2018-10-23 00:50Merge branch 'new-frontend-options' into 'develop'kaniini2+6-2
2018-10-20 10:14Merge branch 'pleroma-list-belongs' into 'develop'eal4+46-0
2018-10-18 14:36Merge branch 'bugfix/html-scrub-schemes' into 'develop'kaniini3+34-31
2018-10-17 19:33Merge branch 'bugfix/osada-mention' into 'develop'kaniini5+153-1
2018-10-17 04:24Merge branch 'import-maybe-direct-follow' into 'develop'Haelwenn1+1-1
2018-10-14 20:42Merge branch 'feature/markdown-enable-tags' into 'develop'kaniini1+1-0
2018-10-14 19:29Merge branch 'security/clear-oauth-with-password' into 'develop'kaniini5+77-2
2018-10-11 10:56Merge branch 'security/fix-local-locked-accounts' into 'develop'kaniini2+19-1
2018-10-10 08:00Merge branch 'bugfix/length-enforce-subjects' into 'develop'kaniini1+2-1
2018-10-07 01:34Merge branch 'feature/mrf-transparency-opt-out' into 'develop'Haelwenn2+19-14
2018-10-07 01:16Merge branch 'security/follow-always-async' into 'develop'kaniini7+53-32
2018-10-07 01:10Merge branch 'patch-2' into 'develop'kaniini1+1-1
2018-10-07 01:09Merge branch 'update-pleroma-frontend' into 'develop'kaniini13+55-55
2018-10-05 21:17Merge branch 'revert-d31bbb1c' into 'develop'kaniini10+93-9
2018-10-05 20:41Merge branch 'feature/nodeinfo_federation_info' into 'develop'kaniini1+29-1
2018-09-30 05:32Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'kaniini1+1-1
2018-09-28 19:20Merge branch 'bugfix/magnet-links' into 'develop'Haelwenn2+11-10
2018-09-28 09:25Merge branch 'feature/twitter_api/fields' into 'develop'Haelwenn2+43-5
2018-09-28 00:51Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'kaniini1+3-0
2018-09-28 00:14Merge branch 'security/ap-unsigned-create' into 'develop'kaniini1+17-7
2018-09-27 20:25Merge branch 'bugfix/kroeg' into 'develop'kaniini8+185-47
2018-09-24 14:17Merge branch 'fix/s3/filenames-with-spaces' into 'develop'kaniini1+5-1
2018-09-22 05:08Merge branch 'update/pleroma-fe-20180922' into 'develop'kaniini13+55-55
2018-09-22 03:50Merge branch 'feature/html-scrub-policy-tests' into 'develop'kaniini2+82-0
2018-09-22 03:30Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'kaniini2+10-5
2018-09-22 03:08Merge branch 'feature/rich-text-optout-backend' into 'develop'kaniini10+68-26
2018-09-21 00:00Merge branch 'feature/dynamic-user-refresh' into 'develop'kaniini4+47-30
2018-09-20 23:54Merge branch 'task-204-on-options-request' into 'develop'kaniini1+8-0
2018-09-20 16:24Merge branch 'bump-mastofe-2018-09-20' into 'develop'Haelwenn3069+6204-3199
2018-09-20 14:54Merge branch 'feature/mastodon_api_2.5.0' into 'develop'Haelwenn6+15-8
2018-09-19 04:58twitter api: fix mimetype fallback when attachments use a URI instead of a URL objectWilliam Pitcock1+1-1
2018-09-19 04:57mastodon api: default attachment type to image if one is not presentWilliam Pitcock1+1-1
2018-09-19 03:53Merge branch 'fix/fake-filters' into 'develop'Haelwenn2+0-6
2018-09-16 02:25Merge branch 'feature/mediaproxy-inline-images' into 'develop'kaniini2+48-3
2018-09-16 01:31Merge branch 'feature/mrf-scrub' into 'develop'kaniini3+32-1
2018-09-16 01:09Merge branch 'update-pleroma-frontend' into 'develop'kaniini13+55-55
2018-09-16 01:05Merge branch 'feature/html-scrub-policy' into 'develop'kaniini9+162-22
2018-09-12 18:01Merge branch 'patch-3' into 'develop'Haelwenn2+3-2
2018-09-10 02:03Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'kaniini1+3-2
2018-09-10 01:22Merge branch 'refactor/mrf-pattern-matching' into 'develop'kaniini2+88-92
2018-09-09 23:09Merge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop'kaniini1+7-4
2018-09-09 13:06Merge branch 'bugfix/test-circular-reference' into 'develop'kaniini1+7-3
2018-09-09 12:15Merge branch 'update/pleroma-fe-20180909' into 'develop'kaniini20+61-65
2018-09-09 11:38Merge branch 'suggestion-api-restriction' into 'develop'kaniini3+4-1
2018-09-08 09:20Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'lambda21+595-240
2018-09-07 23:55Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'kaniini2+7-2
2018-09-07 23:55Merge branch 'improve-server-config-examples' into 'develop'kaniini4+65-23
2018-09-07 23:49Merge branch 'feature/custom_media_url' into 'develop'kaniini2+8-2
2018-09-07 23:47Merge branch 'fix/tusk' into 'develop'kaniini4+12-2
2018-09-06 06:50Merge branch 'fix/test-failure-due-to/306' into 'develop'lambda1+1-1
2018-09-05 18:20Merge branch 'fix/sign-in-with-toot' into 'develop'Haelwenn4+18-3
2018-09-03 15:00Merge branch 'feature/staff-discovery-api' into 'develop'kaniini4+39-0
2018-09-03 12:33Merge branch 'feature/mastodon_api_2.4.x' into 'develop'kaniini11+435-5
2018-09-03 12:32Merge branch 'report-chat-and-gopher-support' into 'develop'kaniini1+5-1
2018-09-03 05:54Merge branch 'nil-bio-emojis' into 'develop'kaniini2+13-1
2018-09-03 02:03Merge branch 'patch-2' into 'develop'Haelwenn1+2-0
2018-09-02 12:37Merge branch 'hotfix_broken_likes' into 'develop'kaniini2+29-1
2018-09-02 00:08Merge branch 'security/emoji-xss' into 'develop'kaniini4+19-3
2018-09-01 23:48Merge branch 'security/activitypub-spoofing' into 'develop'kaniini5+58-0
2018-09-01 21:47Merge branch 'feature/disable-config-management' into 'develop'Haelwenn2+35-25
2018-09-01 09:12Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'kaniini1+9-29
2018-09-01 08:48Merge branch 'verify-credentials-default-scope' into 'develop'kaniini3+28-3
2018-08-31 09:53Merge branch 'revert-a26d5e6b' into 'develop'lambda7+7-78
2018-08-31 04:50Merge branch 'bugfix/s3-configuration' into 'develop'kaniini1+3-1
2018-08-31 04:36Merge branch 'update/pleroma-fe-20180831' into 'develop'kaniini16+62-60
2018-08-31 04:06Merge branch 'update/pleroma-fe-config-20180831' into 'develop'kaniini2+4-0
2018-08-31 03:41Merge branch 'feature/rich-text' into 'develop'kaniini7+78-7
2018-08-30 23:06Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'kaniini1+7-0
2018-08-30 23:05Merge branch 'backendhack' into 'develop'kaniini10+227-109
2018-08-29 18:38migrations: add index creation migration and recipients_to/cc removal migrationWilliam Pitcock2+18-0
2018-08-29 18:38activity: drop recipients_to/recipients_cc fieldsWilliam Pitcock2+2-6
2018-08-29 18:33migrations: drop filler migrationWilliam Pitcock1+0-25
2018-08-29 18:32activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.William Pitcock1+4-4
2018-08-29 14:43Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop'Haelwenn1+8-2
2018-08-29 09:23streamer: contain list updates in the same way as we do with the database queryWilliam Pitcock1+19-2
2018-08-29 08:51mastodon api: use bounded AP object graph query to enforce containment of private statusesWilliam Pitcock1+7-2
2018-08-29 08:51activitypub: allow querying the activity/object graph bounded to a specific to/cc setWilliam Pitcock1+21-0
2018-08-29 08:50test: add testcase proving lists system does not leak non-public postsWilliam Pitcock1+24-0
2018-08-29 08:43migrations: add migration to fill in recipients_to/recipients_cc fieldsWilliam Pitcock1+25-0
2018-08-29 08:37activity: add recipients_to and recipients_cc fieldsWilliam Pitcock3+31-5
2018-08-28 18:54installation/pleroma.nginx: Add Content-Security-PolicyHaelwenn (lanodan) Monnier1+1-0
2018-08-28 00:29Merge branch 'feature/s3' into 'develop'kaniini5+70-2
2018-08-27 10:49Revert "enable scope options and such"William Pitcock1+2-2
2018-08-20 18:29enable scope options and suchWilliam Pitcock1+2-2
2018-08-14 17:07formattingWilliam Pitcock1+1-1
2018-08-06 11:20user: fix up notification last calculation [NOT related to upstream]William Pitcock1+6-1
2018-08-27 08:29Merge branch 'feature/relay' into 'develop'lambda13+202-7
2018-08-27 08:25Merge branch 'bugfix/announce-timeline-flooding' into 'develop'lambda3+44-7
2018-08-26 23:24Merge branch 'feature/emoji-in-local-users' into 'develop'kaniini5+61-2
2018-08-26 22:56Merge branch 'bugfix/formatting' into 'develop'kaniini1+5-2
2018-08-26 22:44Merge branch 'tests/notification-smoketests' into 'develop'kaniini1+121-0
2018-08-26 22:39Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'kaniini1+7-2
2018-08-26 21:35Merge branch 'login-with-email' into 'develop'kaniini1+10-2
2018-08-26 20:18Merge branch 'update-pleroma-frontend' into 'develop'kaniini36+60-1069
2018-08-26 20:16Merge branch 'improve-example-caddyfile' into 'develop'kaniini1+33-5
2018-08-26 20:16Merge branch 'remove-unused-settings' into 'develop'kaniini2+0-7
2018-08-25 00:20Merge branch 'feature/twitterapi-object-description' into 'develop'kaniini2+8-4
2018-08-24 22:00Merge branch 'update/pleroma-fe-20180824' into 'develop'kaniini17+59-58
2018-08-24 20:15Merge branch 'feature/tls-sni-support' into 'develop'kaniini1+24-1
2018-08-24 18:42Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'kaniini2+30-1
2018-08-24 18:27Merge branch 'config/fe-collapse-subject' into 'develop'kaniini2+5-2
2018-08-24 18:01Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"kaniini1+1-2
2018-08-24 17:40Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'kaniini1+2-1
2018-08-23 20:56Merge branch 'fix/suggestions-api-error-handling' into 'develop'kaniini1+8-1
2018-08-23 17:09Merge branch 'develop' into 'develop'Haelwenn1+22-0
2018-08-23 01:39Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'kaniini2+18-0
2018-08-22 10:09Run mix formatHaelwenn (lanodan) Monnier1+2-1
2018-08-21 23:47[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nilHaelwenn (lanodan) Monnier1+1-1
2018-08-21 23:46[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videosHaelwenn (lanodan) Monnier1+1-1
2018-08-21 16:58Merge branch 'feature/peertube_2' into 'develop'kaniini10+106-32
2018-08-21 16:56Merge branch 'sanitize-bio' into 'develop'kaniini2+3-2
2018-08-21 16:55Merge branch 'twitter-api-bios' into 'develop'kaniini4+25-16
2018-08-20 18:44Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'kaniini1+1-1
2018-08-20 18:17Merge branch 'update/pleroma-fe-20180821' into 'develop'kaniini13+23-23
2018-08-20 12:13Merge branch 'fix/redirect-on-user-fetch' into 'develop'eal1+1-1
2018-08-20 04:50Merge branch 'update/pleroma-fe-20180820' into 'develop'kaniini30+128-113
2018-08-18 18:24Merge branch 'update/pleroma-fe-20180818' into 'develop'kaniini17+58-58
2018-08-17 16:03Merge branch 'develop' into 'develop'kaniini1+1-1
2018-08-16 23:59Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'kaniini1+5-2
2018-08-16 23:35Merge branch 'bugfix/mix-lock' into 'develop'kaniini1+9-9
2018-08-16 15:45Merge branch 'patch-2' into 'develop'kaniini1+17-17
2018-08-16 15:41Merge branch 'dev-lanodan-url-regex' into 'develop'kaniini3+42-6
2018-08-16 15:38Merge branch 'mastofe/system-font' into 'develop'kaniini1+1-1
2018-08-16 15:20Merge branch 'bugfix/federation-kroeg' into 'develop'kaniini5+95-1
2018-08-16 15:19Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'kaniini3+48-7
2018-08-16 15:17Merge branch 'fix/normalize-file-extension' into 'develop'kaniini3+40-13
2018-08-15 07:47Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'lambda4+53-1
2018-08-12 17:42formattinglain1+4-3
2018-08-12 16:41Fix for elixir 1.7.lain1+2-2
2018-08-12 16:16update frontendlain30+102-79
2018-08-12 13:29Update Mastofe.lain192+363-1606
2018-08-12 12:04Merge branch 'feature/invites' into 'develop'lambda6+177-14
2018-08-12 10:55Merge branch 'fix/remote-follow-errormessage' into 'develop'lambda1+9-0
2018-08-12 10:55Merge branch 'bugfix/gopher-empty-lines' into 'develop'lambda1+2-2
2018-08-12 10:41Merge branch 'emoji-in-account-view' into 'develop'lambda4+78-4
2018-08-10 13:45Merge branch 'bugfix/fix-gopher-server-i' into 'develop'lambda1+1-1
2018-08-06 18:07Merge branch 'bugfix/duplicate-follow-requests' into 'develop'lambda1+1-0
2018-08-06 18:07Merge branch 'feature/camelcase-hashtags' into 'develop'lambda1+2-2
2018-08-01 10:37Merge branch 'bugfix/digest-legacy-compat' into 'develop'lambda1+5-1
2018-08-01 08:11Merge branch 'security/digest-signature-validation' into 'develop'lambda4+29-2
2018-07-25 07:16Merge branch 'feature/filter_exif' into 'develop'lambda5+35-2
2018-07-19 07:35Merge branch 'tests/plume' into 'develop'lambda5+47-13
2018-07-19 07:31Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'lambda2+38-6
2018-07-19 07:31Merge branch 'feature/fe-configuration' into 'develop'lambda4+36-3
2018-07-18 08:52Merge branch 'feature/media-description' into 'develop'lambda6+41-8
2018-07-12 16:48Merge branch 'feature/object-normalization' into 'develop'lambda12+28-34
2018-07-12 16:47Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'lambda1+6-5
2018-07-12 16:46Merge branch 'bugfix/activitypub-object-actor' into 'develop'lambda1+18-2
2018-07-12 16:45Merge branch 'feature/message-summary' into 'develop'lambda4+8-4
2018-07-12 05:59Merge branch 'feature/default-scope' into 'develop'lambda4+24-6
2018-07-12 05:58Merge branch 'feature/article-support' into 'develop'lambda6+58-22
2018-07-12 05:56Merge branch 'feature/auto-shortcodes' into 'develop'lambda2+24-1
2018-07-12 05:55Merge branch 'bugfix/status-url-field' into 'develop'lambda1+1-2
2018-07-12 05:54Merge branch 'bugfix/x509-public-key' into 'develop'lambda2+2-2
2018-06-27 12:48Merge branch 'features/initial-state_rights' into 'develop'lambda1+3-0
2018-06-25 08:45Merge branch 'fix/mutes.json-emptyarray' into 'develop'lambda3+25-0
2018-06-25 06:12Merge branch 'feature/configurable-blocks' into 'develop'lambda4+45-7
2018-06-24 13:28Merge branch 'feature/application-xml-mime' into 'develop'lambda1+1-0
2018-06-24 13:17Merge branch 'features/glitch-soc-frontend' into 'develop'lambda5+67-2
2018-06-21 07:09Merge branch 'feature/mrf-simple-accept-lists' into 'develop'lambda3+16-3
2018-06-19 09:50Merge branch 'features/column_media_streaming' into 'develop'lambda2+18-2
2018-06-19 09:42Merge branch 'bugfix/block-follow-relationships' into 'develop'lambda4+109-5
2018-06-19 05:15Merge branch 'feature/exclude-replies-filter' into 'develop'lambda2+18-0
2018-06-19 05:13Merge branch 'bugfix/as2-contentmap' into 'develop'lambda3+89-0
2018-06-17 10:33Merge branch 'patch-2' into 'develop'lambda1+2-0
2018-06-16 10:39Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'lambda3+99-3
2018-06-15 20:43Merge branch 'bugfix/mastofe_thread_render' into 'develop'eal2+4-4
2018-06-15 20:01Fix typolain1+1-1
2018-06-14 19:11Merge branch 'fix/missing-file-extension' into 'develop'lambda2+37-5
2018-06-14 13:55Merge branch 'fix/mp3-recognition' into 'develop'lambda1+3-0
2018-06-14 07:23Merge branch 'patch-2' into 'develop'lambda1+0-1
2018-06-14 07:20Merge branch 'bugfix/mrf-orphaning' into 'develop'lambda1+13-8
2018-06-14 07:19Merge branch 'feature/twitterapi-unrepeat' into 'develop'lambda9+63-16
2018-06-14 07:14Merge branch 'bugfix/oauth2-param-name' into 'develop'lambda1+13-1
2018-06-14 07:13Merge branch 'bugfix/oauth-password-with-email' into 'develop'lambda1+1-1
2018-06-14 07:12Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'lambda1+30-15
2018-06-13 07:18Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'lambda1+1-1
2018-06-13 07:02Merge branch 'bugfix/webfinger-refactoring' into 'develop'lambda1+6-24
2018-06-12 17:37update frontendlain18+60-58
2018-06-12 12:42set_moderator: ensureall applications are started.eal1+1-1
2018-06-12 12:11Merge branch 'patch-2' into 'develop'lambda1+0-0
2018-06-12 08:26Merge branch 'develop' into 'develop'lambda4+112-44
2018-06-12 07:19Merge branch 'feature/list-streaming' into 'develop'lambda6+56-3
2018-06-12 07:18Merge branch 'feature/locked-accounts-part-1' into 'develop'lambda12+474-11
2018-06-12 07:12Merge branch 'patch-2' into 'develop'lambda1+13-3
2018-06-11 19:59Merge branch 'fix/mix-task-caching' into 'develop'eal1+1-1
2018-06-11 11:19Merge branch 'feature/domain-blocks' into 'develop'lambda7+115-3
2018-06-08 11:10Merge branch 'users' into 'develop'lambda2+17-10
2018-06-08 11:08Merge branch 'feature/rejectnonpublic' into 'develop'lambda1+29-0
2018-06-08 06:02Merge branch 'mastopost' into 'develop'lambda1+10-1
2018-06-08 05:10Merge branch 'bugfix/locked-account-regression' into 'develop'lambda3+27-3
2018-06-07 14:44Merge branch 'feature/quarantine' into 'develop'lambda2+16-1
2018-06-07 14:42Merge branch 'import' into 'develop'lambda3+52-37
2018-06-06 16:44Merge branch 'bugfix/webfinger-xml-crash' into 'develop'lambda3+8-4
2018-06-06 08:27Merge branch 'fix/oauth-http-basic' into 'develop'lambda3+156-14
2018-06-05 21:18Merge branch 'fix/emoji-picker' into 'develop'eal1+1-0
2018-06-03 19:52Merge branch 'develop' into 'develop'lambda1+18-0
2018-06-03 19:04Better error handling for OstatusController.lain2+108-37
2018-06-03 17:58Better error handling for ActivityPubControllerlain3+11-8
2018-06-03 17:28Better error handling for MastodonApiController.lain2+24-4
2018-06-03 17:11Better error handling in TwitterApiController.lain5+54-14
2018-06-02 17:45Revert "Update Mastofe."lain182+1580-360
2018-06-02 14:11Update Mastofe.lain182+360-1580
2018-06-02 13:39Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+11-5
2018-05-30 18:00Fix url guessing attacks.lain4+74-4
2018-05-30 12:31Merge branch 'fix/dm-timeline-activities' into 'develop'eal1+3-1
2018-05-29 10:58Merge branch 'patch-3' into 'develop'lambda1+1-0
2018-05-29 10:58Merge branch 'fix/link-headers' into 'develop'lambda1+32-10
2018-05-28 10:39Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+6-4
2018-05-28 10:38Only return certain activities in TwitterAPI mentions.lain1+5-0
2018-05-26 19:06Fix user topic streaming.lain1+1-1
2018-05-26 14:26Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into developlain8+158-8
2018-05-26 13:20There are no symbols in JSON.lain1+1-1
2018-05-26 13:15Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into developlain13+327-30
2018-05-26 09:50Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'lambda2+9-2
2018-05-25 07:15Merge branch 'feature/blocks-deny-refollow' into 'develop'lambda2+29-15
2018-05-25 07:13Merge branch 'bugfix/follow-query-overhead' into 'develop'lambda2+15-5
2018-05-24 20:22Merge branch 'feature/lists' into 'develop'lambda8+439-2
2018-05-24 19:52Merge branch 'feature/incoming-remote-unfollow' into 'develop'lambda18+475-62
2018-05-24 17:25update frontendlain9+17-17
2018-05-24 17:16Merge branch 'feature/change-password' into 'develop'lambda5+106-6
2018-05-24 10:44More efficient queries.lain2+5-3
2018-05-23 15:25Don't save double tags in AP objects we createlain2+14-1
2018-05-23 09:03Merge branch 'feature/deps-migration' into 'develop'lambda10+42-49
2018-05-22 14:26Repair some access-control headers required for third-party webclientsNiklas Poslovski1+2-2
2018-05-22 14:02Merge branch 'nipos-develop' into developlain1+1-0
2018-05-21 21:20Merge branch 'feature/clarify-http-sig-error' into 'develop'lambda1+1-1
2018-05-21 13:58Merge branch 'bugfix/webfinger-statusnet' into 'develop'lambda4+18-1
2018-05-21 10:32Actually fix missing alias.lain1+1-1
2018-05-21 10:09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+1-1
2018-05-21 10:09Add missing alias.lain1+1-0
2018-05-20 17:26More fixes.lain1+2-1
2018-05-20 17:22Fix specs.lain1+2-1
2018-05-20 16:29update frontendlain38+284-36
2018-05-20 16:01Return visilility in twitter api, too.lain2+5-3
2018-05-20 14:15Return private / direct posts on user timelines, too.lain4+60-25
2018-05-20 11:24update frontendlain9+17-17
2018-05-20 10:57Merge branch 'feature/account-deletion' into 'develop'lambda5+66-0
2018-05-20 10:55Merge branch 'feature/undo-like-federation' into 'develop'lambda9+125-10
2018-05-19 09:31Merge branch 'feature/webfinger-mime-ld-json' into 'develop'lambda4+29-0
2018-05-19 09:30Merge branch 'feature/remote-user-deactivation' into 'develop'lambda2+27-0
2018-05-19 09:27Fix linking problem.lain2+8-0
2018-05-19 09:17Merge branch 'bugfix/hubzilla-compat' into 'develop'lambda11+126-14
2018-05-16 15:55Fix User search.lain5+54-13
2018-05-16 11:02update frontendlain20+62-57
2018-05-13 11:02Fix format.lain1+4-1
2018-05-13 10:54Modify sort index for activities.lain1+9-0
2018-05-13 10:38Revert "Remove 'unlisted' handling for now."lain2+1-3
2018-05-13 10:07Remove 'unlisted' handling for now.lain2+3-1
2018-05-13 09:59Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain14+280-26
2018-05-13 09:58Unlisted fetching: Reverse logiclain1+1-1
2018-05-13 09:19Merge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into developlain2+23-1
2018-05-13 08:39Merge branch 'patch-2' into 'develop'lambda1+10-0
2018-05-13 08:34Merge branch 'feld-varnish' into 'develop'lambda1+2-3
2018-05-13 08:24Merge branch 'feature/chain-policies' into 'develop'lambda5+33-3
2018-05-13 08:16Merge branch 'no-self-notification' into 'develop'lambda3+12-2
2018-05-11 07:18Merge branch 'patch-1' into 'develop'lambda1+0-1
2018-05-07 16:11More warning fixes.lain6+15-7
2018-05-06 18:43Merge branch 'feld-varnish' into 'develop'lambda1+2-8
2018-05-06 18:42Merge branch 'feld-warnings' into 'develop'lambda30+97-107
2018-05-06 18:41Merge branch 'fix/unsafe-variables' into 'develop'lambda5+50-35
2018-05-05 11:41Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+9-0
2018-05-05 11:40Streamer: Don't send out stream events for blocked users.lain2+83-14
2018-05-05 11:40Unify wss uri generation.lain1+1-1
2018-05-05 09:15Idempotency: Use special cache, keep for 6 hours.lain3+30-7
2018-05-04 21:16Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+69-0
2018-05-04 21:15update frontendlain1+2-2
2018-05-04 19:15Don't expire idempotency cache for five minutes.lain2+6-0
2018-05-04 18:30MastodonAPI: Support idempotency key.lain2+32-3
2018-04-29 14:56update frontendlain10+20-19
2018-04-29 09:28Fix format.lain2+10-12
2018-04-29 09:26Merge branch 'patch-bio' into 'develop'lambda2+18-1
2018-04-28 14:10Insert object after being rewritten.lain1+5-3
2018-04-28 13:49Merge branch 'fix/blocked-user-boosts' into 'develop'lambda2+23-1
2018-04-27 05:49Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'lambda1+2-1
2018-04-26 05:07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+1-1
2018-04-26 05:06Resurrect instance specific panel.lain1+1-1
2018-04-25 14:10Optionally deactivate public timelines.lain2+22-13
2018-04-25 13:41Align local bio limits to remote limit.lain1+1-1
2018-04-24 19:26Merge branch 'gitignore' into 'develop'lambda1+5-0
2018-04-24 19:25Fix formatting.lain1+12-4
2018-04-24 17:21Merge branch 'feature/message-rewrite-facility' into 'develop'lambda5+93-2
2018-04-24 12:28Update .gitlab-ci.ymllambda1+1-0
2018-04-24 12:25Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into developlain3+31-1
2018-04-24 05:54Merge branch 'favicon_tag' into 'develop'lambda1+1-1
2018-04-23 17:23update frontendlain9+17-17
2018-04-23 17:09update frontendlain10+18-18
2018-04-22 08:01Small cleanup.lain3+9-3
2018-04-22 07:56Merge branch 'develop' into fix/note-count-not-updatinglain2+19-9
2018-04-21 09:58Update note count in ActivityPub.create.eal3+15-16
2018-04-21 08:05Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'lambda2+3-2
2018-04-21 08:05Merge branch 'readme-update' into 'develop'lambda1+10-4
2018-04-21 07:59Merge branch 'nginx-certbot-doc' into 'develop'lambda1+10-1
2018-04-21 07:43Formatting fixes.lain6+24-11
2018-04-21 07:34add formatterlain1+3-0
2018-04-21 07:30.lain1+1-3
2018-04-21 07:28.lain1+1-0
2018-04-21 07:27..lain1+1-0
2018-04-21 07:24Update CI.lain1+1-1
2018-04-21 07:22Make search use id index too.lain1+1-1
2018-04-20 11:10Formatting.lain4+48-22
2018-04-20 11:09Add format checking to CI.lain1+6-0
2018-04-19 19:44Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain6+194-3
2018-04-19 19:44fix againlain1+1-1
2018-04-19 11:04fix againlain1+1-1
2018-04-19 10:50Fix generate configlain1+0-8
2018-04-19 10:29Revert "Ask for proxy URL if proxy enabled."eal2+1-9
2018-04-19 07:41Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'lambda1+1-0
2018-04-18 14:52rm_user: also ensure that cache is running.eal1+1-1
2018-04-18 14:41Merge branch 'fix/rm-user-task' into 'develop'lambda1+2-2
2018-04-18 11:26Merge branch 'fix/login-with-username-or-email' into 'develop'lambda5+11-4
2018-04-17 09:09update frontendlain29+192-76
2018-04-13 09:46Update README.mdlambda1+4-0
2018-04-13 07:43Merge branch 'mix_task_rm_user' into 'develop'lambda1+14-0
2018-04-11 20:58Merge branch 'develop' into 'develop'lambda2+19-3
2018-04-11 20:03update frontendlain17+57-57
2018-04-11 19:55update frontendlain31+131-110
2018-04-11 14:27Merge branch 'feld-hackneyupdate' into 'develop'lambda2+9-8
2018-04-10 19:05Fix register_user task.lain1+1-1
2018-04-10 16:38Order masto searches by date.lain1+34-30
2018-04-10 14:46Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'lambda71+404-111
2018-04-10 14:45Merge branch 'feld-varnish' into 'develop'lambda1+0-4
2018-04-10 08:14Merge branch 'patch-1' into 'develop'lambda1+24-25
2018-04-09 08:42Merge branch 'bugfix/user-search-with-at-sign' into 'develop'lambda1+3-0
2018-04-09 08:41Merge branch 'develop' into 'develop'lambda1+24-11
2018-04-09 06:58Merge branch 'develop' into 'develop'lambda1+27-0
2018-04-08 06:02Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'lambda2+3-1
2018-04-08 06:01Merge branch 'fix/persisted-mastofe-settings' into 'develop'lambda2+19-1
2018-04-07 14:41Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+15-9
2018-04-07 14:40Only search in public data for now.lain3+9-0
2018-04-07 14:35Update Readme.lain1+9-0
2018-04-06 14:35Accept port number in urls.lain2+8-1
2018-04-05 11:59MastodonAPI search: return only create activities.lain1+4-0
2018-04-05 11:15Delete Caddyfilelambda1+0-5
2018-04-05 10:54Merge branch 'develop' into 'develop'lambda2+2-2
2018-04-04 13:23TwitterAPI: Don't put follows into the public tls.lain1+2-2
2018-04-04 09:29Handle + in links.lain2+8-1
2018-04-03 16:34Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain89+142-133
2018-04-03 16:32Use user url in mention if we have it.lain2+11-3
2018-04-02 14:27Load all users at once in timelines.lain5+94-30
2018-04-02 13:29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+5-1
2018-04-02 13:28Use context_ids directly if we have them.lain3+6-12
2018-04-02 13:17Generates contexts and ids on insertion time.lain3+42-4
2018-04-02 12:46Pre-fetch conversation ids.lain2+63-2
2018-04-02 11:15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain298+1709-139309
2018-04-02 11:13Fail faster.lain2+62-11
2018-04-02 11:13Fix some test stuff.lain2+14-10
2018-04-02 11:12Add mock.lain2+4-1
2018-04-01 12:58Respond to proper ActivityPub type.lain1+2-1
2018-03-31 19:14Use correct linefeed.lain1+1-1
2018-03-31 19:11Small fix.lain1+1-1
2018-03-31 19:10Fix typo.lain1+1-1
2018-03-31 19:09Modify newlines.lain1+1-1
2018-03-31 19:02Remove inspect.lain1+0-1
2018-03-31 19:00Proper info.lain1+7-2
2018-03-31 18:48No tabs.lain1+1-0
2018-03-31 18:02Don't fetch anything except ap_id for follower / following collections.lain3+119-19
2018-03-31 16:22Gopher: Add like / repeat count.lain1+6-1
2018-03-31 15:51Add gopher server.lain3+148-0
2018-03-31 10:52update frontendlain12+17-17
2018-03-30 14:50Remove unused ActivityRepresenter module.lain4+25-290
2018-03-30 13:49TwitterApiController: Use ActivityView.lain3+56-21
2018-03-30 13:32TwApi ActivityView: Add delete activities.lain2+46-1
2018-03-30 13:17TwApi ActivityView: Add follows.lain2+52-1
2018-03-30 13:01Format the code.lain111+5013-2871
2018-03-30 12:48Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+9-2
2018-03-30 12:46TwApi ActivityView: Add announces.lain2+59-0
2018-03-30 11:49TwApi ActivityView: Add Like rendering.lain2+66-2
2018-03-30 10:57Add ActivityViewTest.lain1+49-0
2018-03-30 10:19Fix TwApi reply visibility.lain1+2-2
2018-03-28 14:03Clean up prod.exs a bit.lain1+1-5
2018-03-28 07:56Don't go through all available emoji.lain3+8-10
2018-03-27 20:24Add basic activity view.lain3+79-7
2018-03-27 18:09Return version in instance endpoint, set version to 0.9.0.lain2+3-3
2018-03-27 17:59Fix migration.lain1+8-0
2018-03-27 17:48Drop index for 'local', it confuses the query planner.lain1+7-0
2018-03-27 16:18Reduce OP fetching queries.lain3+46-11
2018-03-27 15:43Don't try to fetch OP if none is there.lain2+13-1
2018-03-27 14:45More Jason changes.lain8+36-36
2018-03-27 14:10Add missing types.lain1+1-0
2018-03-27 14:09Switch to Jason for json handling.lain4+11-1
2018-03-27 13:22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+3-3
2018-03-27 13:22Update dependencies.lain1+39-37
2018-03-26 08:31Speed up follower query.lain2+2-1
2018-03-26 07:53Add index for user follower address.lain1+8-0
2018-03-26 07:51Fix atom feed pagination.lain1+4-1
2018-03-25 17:34Fix follower collection id.lain1+1-1
2018-03-25 15:08Return "audio" info in mastodon api.lain1+1-0
2018-03-25 13:40Merge branch 'feature/oauth-token-password' into 'develop'lambda1+21-0
2018-03-24 21:49Merge branch 'bugfix/activitypub-hashtags' into 'develop'lambda3+89-0
2018-03-24 14:09Fix tests.lain2+9-2
2018-03-24 14:02Unify user fetching.lain1+2-1
2018-03-24 13:45Fetch the same data from json webfinger as from xml webfinger.lain4+32-3
2018-03-24 10:03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+5-22
2018-03-24 10:03Fix hashtags.lain4+115-58
2018-03-23 18:52Strip html from emoji stuff.lain2+7-1
2018-03-23 15:07For outgoing objects, fake mastodon style ap id for ostatus.lain2+24-0
2018-03-22 11:48Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpointslain10+133-52
2018-03-22 05:23activitypub: add outbox endpointWilliam Pitcock3+63-0
2018-03-22 04:47activitypub: add restrict_limitWilliam Pitcock1+7-0
2018-03-21 17:23activitypub: implement following/followers endpointsWilliam Pitcock4+118-15
2018-03-21 06:12Fetch relayed messages from source while we don't have linked data sigs.lain1+2-1
2018-03-20 06:00Merge branch 'feld-varnish' into 'develop'lambda1+132-0
2018-03-20 05:58Merge branch 'patch-README' into 'develop'lambda1+1-0
2018-03-20 05:58Merge branch 'feld-mastoweb5000' into 'develop'lambda3+3-5
2018-03-20 05:57Merge branch 'feld-Logger' into 'develop'lambda12+22-22
2018-03-19 16:42Use connection pools.lain5+9-5
2018-03-19 09:28Only fetch if it's http.lain2+6-3
2018-03-16 05:30mastodon api tests: invalidate user cache prior to importing a test replyWilliam Pitcock1+3-0
2018-03-16 05:30mastodon api: fix rendering the mentions JSONWilliam Pitcock1+2-2
2018-03-13 17:46activitypub transmogrifier: rewrite non-http URLs using the object's external URLWilliam Pitcock2+33-0
2018-03-13 17:33Do more jobs by default.lain1+1-1
2018-03-13 17:32Only push to still valid websub subscriptions.lain1+2-1
2018-03-13 13:59Merge branch 'andarna/pleroma-develop' into developlain2+4-0
2018-03-13 07:05Fix Mastodon emojis.lain1+37-0
2018-03-12 10:30Ignore incoming empty chat messages.lain1+8-5
2018-03-11 13:47Don't validate on missing public key.lain3+9-0
2018-03-11 13:43Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+22-6
2018-03-11 13:37More signature debugging.lain4+73-27
2018-03-08 18:50update frontendlain9+16-16
2018-03-08 18:07Restrict activity fixing more.lain1+2-1
2018-03-08 18:00Update pleroma.nginxlambda1+2-0
2018-03-08 12:29Merge branch 'feature/activitypub' into 'develop'lambda79+3493-169
2018-03-05 08:27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+6-5
2018-03-05 08:26Add way to disable federation.lain3+27-14
2018-02-21 17:33Moderator READMElain1+6-0
2018-02-21 17:33Add moderator task.lain1+27-0
2018-02-21 17:24Add password reset task.lain2+25-0
2018-02-20 17:54Allow moderators to delete posts.lain1+1-1
2018-02-20 17:44Add moderator function.lain2+22-5
2018-02-12 09:23Add missing support file.lain1+6-0
2018-02-12 09:13Make test output easier to read.lain19+82-86
2018-02-12 08:33Fix some test warnings.lain2+7-7
2018-02-12 07:15Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into developlain3+19-2
2018-02-11 19:58update frontendlain1+4-0
2018-02-11 19:55update frontendlain14+53-52
2018-02-09 16:14update frontendRoger Braun14+21-23
2018-02-09 12:43UtilController: Fix statusnet config api compatibility.Roger Braun1+1-1
2018-02-09 08:57Merge branch 'develop' into 'develop'lambda3+20-0
2018-02-08 18:18Merge branch 'fix/config-disable-chat' into 'develop'lambda4+14-3
2018-02-08 15:03Fix compile errors on 1.4.5Roger Braun2+0-2
2018-02-07 12:44update frontendRoger Braun18+57-57
2018-02-05 22:06Update required Elixir version in READMEeal1+1-1
2018-02-05 21:57Merge branch 'fix/no-image-upload-filetype' into 'develop'eal1+1-1
2018-02-03 13:05Merge branch 'move-backend-images' into 'develop'lambda6+15-15
2018-02-02 16:14Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun11+63-15
2018-02-02 16:14Update frontend.Roger Braun14+23-21
2018-01-30 11:21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun5+36-2
2018-01-30 11:20Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into developRoger Braun3+6-2
2018-01-29 16:45Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun31+31-0
2018-01-29 16:44Fix incoming Pleroma CWs. Closes #96.Roger Braun1+1-2
2018-01-26 14:12Update frontend.Roger Braun17+56-56
2018-01-26 13:31Fix config.Roger Braun1+1-1
2018-01-26 13:28Update frontend.Roger Braun14+23-21
2018-01-20 17:38Stats: Make less crashy and improve query.Roger Braun1+7-8
2018-01-20 15:02Merge branch 'feature/remote-follow' into 'develop'lambda7+98-1
2018-01-18 01:42Revert "Add remote follow pages."eal5+0-92
2018-01-18 01:42Revert "Add remote follow path to webfinger."eal2+1-6
2018-01-17 22:22Add remote follow pages.eal5+92-0
2018-01-16 00:17Add remote follow path to webfinger.eal2+6-1
2018-01-16 14:18Merge branch 'fix/background-profile-fetch' into 'develop'lambda2+7-5
2018-01-15 20:26Merge branch 'default-pictures' into 'develop'eal8+24-20
2018-01-15 17:44Merge branch 'prod.exs' into 'develop'eal1+6-3
2018-01-15 17:26Merge branch 'fix/pleroma.nginx' into 'develop'eal1+0-2
2018-01-15 08:04Merge branch 'stats-daemon' into 'develop'lambda5+54-7
2018-01-12 20:57Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'eal2+15-1
2017-12-23 14:40Unlink follow import process from the one processing request.eal1+1-1
2017-12-22 12:07Merge branch 'media-proxy-fix-encoding' into 'develop'lambda1+0-1
2017-12-20 14:22Merge branch 'media-proxy' into 'develop'lambda10+152-11
2017-12-19 15:15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developLain Iwakura3+39-7
2017-12-19 15:15Fix timelines in subway tooter.Lain Iwakura3+7-2
2017-12-18 15:56MastoAPI: Fix always-sensitive bugs.Lain Iwakura3+5-5
2017-12-18 15:16Send out salmons before websub.Lain Iwakura1+3-3
2017-12-18 10:59Merge branch 'feature/follow-import' into 'develop'lambda2+27-1
2017-12-11 19:01Fix some more tests.eal2+5-3
2017-12-11 16:41Fix tests.eal2+4-4
2017-12-11 16:21Merge branch 'fix/tootdon-mentions' into 'develop'lambda1+1-1
2017-12-09 09:10Merge branch 'feature/user_deletion' into developRoger Braun9+175-26
2017-12-08 12:34Merge branch 'fix/linkify' into 'develop'lambda3+22-3
2017-12-08 12:32Merge branch 'fix/mastoapi-attachment-linking' into 'develop'lambda3+8-3
2017-12-08 12:31Merge branch 'postgresetup' into 'develop'lambda4+18-7
2017-12-07 18:07Add websocket upgrade to example nginx config.eal1+3-0
2017-12-05 11:27Merge branch 'feature/chat' into 'develop'lambda23+124-60
2017-12-05 09:10Merge branch 'fix/odd-passwords' into 'develop'lambda1+1-1
2017-12-03 12:34OStatus: Add user bio as summary fieldRoger Braun2+2-0
2017-11-30 14:00Add count index for local users.Lain Iwakura1+7-0
2017-11-30 13:59MastodonAPI: Add proper user count.Lain Iwakura3+22-1
2017-11-28 16:46Merge branch 'salmon-native-keys' into 'develop'lambda1+22-9
2017-11-27 16:24Return xml notice at /notice path.Lain Iwakura3+24-0
2017-11-25 23:10Merge branch 'patch-1' into 'develop'eal1+1-1
2017-11-24 07:37Update frontend.Roger Braun13+21-21
2017-11-23 15:41More readme updates.Lain Iwakura1+7-1
2017-11-23 15:35Add mix deps.get back to readme.Lain Iwakura1+2-0
2017-11-23 15:22Add configuration generation tool, update readme.Lain Iwakura4+40-51
2017-11-23 11:06MastodonUI login: Show error message on error.Roger Braun2+8-1
2017-11-22 15:10untoot.Roger Braun1+2-3
2017-11-22 14:19Merge branch 'develop' into 'develop'lambda2+150-0
2017-11-22 13:42Update README.mdlambda1+1-1
2017-11-22 11:19Update frontend.Roger Braun17+55-55
2017-11-21 23:09Merge branch 'fix/self-follow' into 'develop'eal2+2-0
2017-11-20 20:55Merge branch 'fix/mastoapi-attachment-count' into 'develop'eal1+1-1
2017-11-20 17:16Make /api/friends/ids test deterministic.eal1+2-2
2017-11-20 16:53Treat internal emoji like external.Roger Braun4+12-9
2017-11-20 07:54MastoAPI: Add max_toot_chars.Roger Braun1+2-1
2017-11-20 07:27Merge branch 'fix/self-follow' into 'develop'lambda6+26-14
2017-11-19 14:10Federator Queue: Add seperate in/out queues.Roger Braun1+24-9
2017-11-19 12:47MastodonAPI: Streaming fixes.Roger Braun1+13-7
2017-11-19 12:31Update frontend.Roger Braun21+67-67
2017-11-19 12:23MastodonAPI: Add sign out.Roger Braun2+11-4
2017-11-19 12:07Fix flakey test.Roger Braun1+1-1
2017-11-19 11:59MastoAPI: Only return create activties in contexts.Roger Braun1+1-0
2017-11-19 11:50Merge branch 'feature/fix-warnings' into 'develop'lambda26+89-94
2017-11-18 15:58Merge branch 'formatting-fixes' into 'develop'lambda4+9-7
2017-11-18 14:38Merge branch 'fix/mastofe-login-redirect' into 'develop'eal1+1-1
2017-11-18 14:34Merge branch 'sensitive-content-bit' into 'develop'eal3+14-2
2017-11-18 11:22Don't start streamer during tests.Roger Braun1+1-1
2017-11-16 15:49MastoAPI: Implement all streaming functions.Roger Braun7+73-6
2017-11-16 12:48MastodonAPI: Stream fixes.Roger Braun3+13-3
2017-11-16 12:01Merge branch 'feature/masto-styled-login-page' into 'develop'lambda2+69-7
2017-11-16 08:40Add custom emoji to Mastodon UI initial state.Roger Braun1+8-3
2017-11-16 08:35Add mastodon emoji folder.Roger Braun2662+2661-0
2017-11-15 17:58MastoAPI: Make attachment ids strings.Roger Braun2+3-3
2017-11-14 16:47Merge branch 'twitterapi-bitlbee' into 'develop'lambda3+39-0
2017-11-14 16:44Merge branch 'twitterapi-show-user' into 'develop'lambda3+54-0
2017-11-14 14:19Merge branch 'api-links' into 'develop'lambda1+1-1
2017-11-14 14:09Merge branch 'mastoapi-media-timeline' into 'develop'lambda2+30-0
2017-11-14 08:34Update frontend.Roger Braun16+40-20
2017-11-13 08:48MastoAPI: Fix repeat api bug.Roger Braun2+3-4
2017-11-12 13:23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun7+347-24
2017-11-12 13:23Add Mastodon frontend.Roger Braun170+206703-5
2017-11-11 19:00MastoAPI: Websocket streaming for federated timeline.Roger Braun2+44-6
2017-11-11 13:59MastoAPI: Basic streaming.Roger Braun6+155-1
2017-11-11 10:18MastoAPI: Fix reblog emojis.Roger Braun2+2-1
2017-11-10 17:24Handle existing redirect params.Roger Braun1+2-1
2017-11-10 16:37Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun7+74-7
2017-11-10 16:18MastoAPI: Use string ids everywhere.Roger Braun4+18-17
2017-11-09 09:41Add actor column to activities.Roger Braun5+32-5
2017-11-09 07:32Re-fetch user data on salmon decode error.Roger Braun3+62-5
2017-11-08 17:57Merge branch 'following-you-in-user-view' into 'develop'lambda2+41-8
2017-11-08 16:25Look through whole db for user timelines.Roger Braun3+3-1
2017-11-08 15:16Update frontend.Roger Braun13+20-19
2017-11-08 13:39Merge branch 'blocks-in-user-view' into 'develop'lambda2+39-0
2017-11-08 10:35Merge branch 'twitter-api-blocks' into 'develop'lambda5+115-0
2017-11-07 20:01Merge branch 'mastodon-emoji-endpoint' into 'develop'lambda4+15-2
2017-11-07 18:58Merge branch 'authenticated-profile-fetching' into 'develop'lambda2+6-3
2017-11-07 17:33Update frontend.Roger Braun9+14-15
2017-11-07 17:27Update fronted.Roger Braun17+54-49
2017-11-07 15:45Allow self-rt.Roger Braun1+0-1
2017-11-07 11:06Linkify fixes.Roger Braun2+16-2
2017-11-07 08:41Revert "Longer timeouts for user fetching."Roger Braun2+3-7
2017-11-07 08:11Longer timeouts for user fetching.Roger Braun2+7-3
2017-11-06 20:27Merge branch 'fix-tootdon-oauth' into 'develop'lambda2+11-1
2017-11-05 11:12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun12+190-21
2017-11-05 11:05Fix bug when no posts are in the db.Roger Braun2+3-1
2017-11-03 07:13MastoAPI: Fix mentions always being for an anonymous user.Roger Braun1+3-3
2017-11-02 16:52update gitlab ciRoger Braun1+3-4
2017-11-02 16:45Read variable for testing db.Roger Braun1+1-1
2017-11-02 16:33Update .gitlab-ci.ymllambda1+2-2
2017-11-02 16:31Update .gitlab-ci.ymllambda1+1-1
2017-11-02 16:28Update .gitlab-ci.ymllambda1+2-4
2017-11-02 16:26Add gitlab-ci.ymllambda1+27-0
2017-11-01 08:33Handle empty terms / tags.Roger Braun2+4-1
2017-10-31 18:51Federate out content warnings.Roger Braun2+9-1
2017-10-31 18:44Allow using cws in mastodon api.Roger Braun2+4-3
2017-10-31 17:56Update README.Roger Braun1+1-1
2017-10-31 17:51Update README.Roger Braun1+1-1
2017-10-31 16:57Fix specs.Roger Braun2+9-9
2017-10-31 16:49MastoAPI: Include CW.Roger Braun3+3-2
2017-10-31 16:43TwitterAPI: Display cws.Roger Braun2+9-2
2017-10-31 16:30Save cws in the activitypub data.Roger Braun4+15-9
2017-10-31 15:37Avoid potentially slow count queries for user note count.Roger Braun4+26-2
2017-10-31 14:26Only search through last 100_000 activities for fetches.Roger Braun1+9-0
2017-10-31 13:53Merge branch 'feature/mastodon-api-fixes' into developRoger Braun4+11-10
2017-10-30 18:25Merge branch 'feld/pleroma-feld-mastodon-usersearch' into developRoger Braun21+130-57
2017-10-24 06:39Return nil for nil object requests.Roger Braun1+1-0
2017-10-23 16:36Use index in basic activity query.Roger Braun1+2-2
2017-10-23 16:30Speed up deletion and related queries.Roger Braun3+17-3
2017-10-23 14:28Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+14-3
2017-10-23 14:27MastoAPI: Add emoji output.Roger Braun3+17-3
2017-10-19 15:56Revert "Simplify query."Roger Braun1+5-2
2017-10-19 15:37Add password reset.Roger Braun10+127-0
2017-10-18 09:56Simplify query.Roger Braun1+2-5
2017-10-05 10:53Don't reject already accepted subscriptions.Roger Braun2+5-4
2017-09-17 21:03Remove tag links for now, they break some regular links.Roger Braun1+1-1
2017-09-17 13:21Add tag links.Roger Braun2+16-5
2017-09-17 12:38Update frontend.Roger Braun19+57-49
2017-09-17 12:37TwitterAPI: Return proper error.Roger Braun2+9-7
2017-09-17 12:25MastoAPI: Fix reblog view.Roger Braun1+2-2
2017-09-17 12:20MastoAPI: Return reblogs, too.Roger Braun2+10-4
2017-09-17 12:05Add tag index.Roger Braun1+9-0
2017-09-17 11:54MastoAPI: Add repeats to statusview.Roger Braun2+54-0
2017-09-17 11:24Prefer post-specific emoji.Roger Braun1+1-1
2017-09-17 11:09MastodonAPI: Add user favorites endpoint.Roger Braun4+38-0
2017-09-17 11:03TwitterAPI: Use correct endpoint for tag timeline.Roger Braun2+2-2
2017-09-17 10:08Fix typo.Roger Braun1+1-1
2017-09-17 09:45TwitterAPI: Add tag timeline.Roger Braun2+17-0
2017-09-17 09:32Use inserted_at as sort in search.Roger Braun1+1-1
2017-09-17 09:16Use desc id to sort instead of desc inserted_atRoger Braun3+3-3
2017-09-16 22:33Add missing fixtures.Roger Braun2+4-0
2017-09-16 22:06Readme update.Roger Braun1+1-1
2017-09-16 22:01Fixup old migrations.Roger Braun5+23-19
2017-09-16 14:49Make emoji configurable in files.Roger Braun5+28-2
2017-09-16 14:40Apply incoming custom emoji.Roger Braun3+18-6
2017-09-16 14:27Handle incoming emoji.Roger Braun3+15-0
2017-09-16 14:14Federate emoji out.Roger Braun6+26-5
2017-09-16 13:47Small emoji refactor.Roger Braun2+75-69
2017-09-16 13:47Don't check limit twice in TwitterAPIController.Roger Braun1+4-6
2017-09-16 12:51Sort by updated_atRoger Braun1+2-1
2017-09-16 12:40Don't specify order in results for now.Roger Braun1+1-2
2017-09-16 12:33TwitterAPI: Add search.Roger Braun4+50-0
2017-09-16 11:44Federate banners out.Roger Braun2+14-1
2017-09-16 11:24Banners are objects.Roger Braun1+4-4
2017-09-16 11:16Update banner from remote accounts.Roger Braun1+4-2
2017-09-16 10:07Add info about clients to readme.Roger Braun1+9-0
2017-09-16 09:52Add undocumented default user default settings.Roger Braun2+12-2
2017-09-16 09:37Fix callback state.Roger Braun1+1-1
2017-09-16 09:26Add remote user fetching to search.Roger Braun2+14-1
2017-09-16 09:06Add fts search index.Roger Braun1+8-0
2017-09-16 08:50Set search config to 'english'.Roger Braun1+2-2
2017-09-16 08:42Add basic search.Roger Braun3+45-0
2017-09-15 15:50MastoAPI: Fix date in account view.Roger Braun4+23-7
2017-09-15 12:44Document options in READMERoger Braun1+11-2
2017-09-15 12:39Add configuration option for registrations.Roger Braun3+11-3
2017-09-15 12:17Refactor posting and make character limit configurable.Roger Braun14+187-178
2017-09-15 08:26Add instance config options.Roger Braun3+30-2
2017-09-15 06:49MastoAPI: Set user id on replies.Roger Braun1+7-3
2017-09-15 06:18Don't die on fetching problems.Roger Braun1+12-6
2017-09-14 16:30MastoAPI: Follower-related changesRoger Braun3+128-0
2017-09-14 11:22Add tag timelines.Roger Braun4+34-1
2017-09-14 07:50MastoAPI: Add favourited_by/reblogged_by.Roger Braun3+28-0
2017-09-14 07:29Preserve state in oauthRoger Braun2+8-1
2017-09-14 07:14MastoAPI: fake out 'application' property.Roger Braun2+8-2
2017-09-14 06:38MastoAPI: Also return text_url in attachments.Roger Braun2+3-1
2017-09-14 06:11Cleanup.Roger Braun1+1-2
2017-09-14 06:08Add media upload endpoint.Roger Braun4+29-0
2017-09-13 15:45Ensure non-null bio.Roger Braun1+1-1
2017-09-13 15:36MastoAPI: Add accounts getting.Roger Braun3+40-13
2017-09-13 15:18Oh no! More datetime fixes!Roger Braun2+2-2
2017-09-13 14:38Reparse time to ensure correct format.Roger Braun2+4-2
2017-09-13 14:26Allign datetime format with mastodon.Roger Braun3+3-2
2017-09-13 14:09Return iso8601 date.Roger Braun1+1-0
2017-09-13 14:05Fix logic.Roger Braun2+4-4
2017-09-13 13:55Add relationships to masto api.Roger Braun5+65-0
2017-09-13 09:59Try host-meta call over https.Roger Braun1+7-7
2017-09-12 11:48Optimize conversation fetching.Roger Braun2+9-1
2017-09-12 11:31Remove milliseconds from mastodon api response.Roger Braun2+8-2
2017-09-12 09:43Use signed integer as attachment id.Roger Braun1+1-1
2017-09-12 09:28Use hash of attachment url as id.Roger Braun2+4-2
2017-09-12 07:34MastoAPI: Remove domain ending from account name.Roger Braun2+4-4
2017-09-12 07:11Add pagination to notifications.Roger Braun1+16-0
2017-09-12 07:06MastoAPI: More link headers.Roger Braun1+10-6
2017-09-12 06:53Add parentheses.Roger Braun1+1-1
2017-09-12 06:51MastoAPI: Add link headers to home timelineRoger Braun1+19-1
2017-09-11 19:50log ostatus handling errors.Roger Braun1+1-0
2017-09-11 19:16Merge branch 'oauth2' into 'develop'lambadalambda37+1140-99
2017-09-08 07:08Try to fetch from html again if fetching from atom gives no results.Roger Braun1+1-1
2017-09-05 12:01Workaround for masto reply breakage.Roger Braun1+16-13
2017-09-05 09:40Fix remote profile update code.Roger Braun1+2-2
2017-09-05 07:35Fix specs.Roger Braun1+3-2
2017-09-04 18:49Merge branch 'deletions' into 'develop'lambadalambda11+134-7
2017-09-04 09:04Output mastodon-style conversation ids.Roger Braun2+7-7
2017-09-04 09:03Handle mastodon conversation ids.Roger Braun3+41-1
2017-09-01 10:50Update README.Roger Braun1+13-48
2017-09-01 10:42Merge branch 'hj.doc-install' into 'develop'lambadalambda3+138-5
2017-08-29 15:30Update frontend.Roger Braun17+48-48
2017-08-29 15:22fix specs.Roger Braun1+6-2
2017-08-29 15:18Add banner and background updating.Roger Braun3+36-3
2017-08-29 13:14Add profile update.Roger Braun4+46-2
2017-08-28 17:17More sensible attachment names.Roger Braun2+14-3
2017-08-25 13:09Ignore padding for salmon public keys.Roger Braun3+14-1
2017-08-24 14:27Set twitter-style possibly_sensitive boolena.Roger Braun2+8-3
2017-08-24 14:18Add activity_type to twitter api output.Roger Braun2+15-6
2017-08-24 12:19Remove email from mastoinfo.Roger Braun1+0-1
2017-08-24 12:15Basic masto-style info.Roger Braun2+23-0
2017-08-24 12:07More meta info fixes.Roger Braun2+44-8
2017-08-24 11:36Small meta info fixes.Roger Braun2+2-1
2017-08-24 10:55Merge branch 'feauture/webfinger' into 'develop'lambadalambda25+925-17
2017-08-22 12:22add correct content type for catch-allRoger Braun1+7-1
2017-08-21 15:07Update frontend.Roger Braun17+48-48
2017-08-18 09:33Merge branch 'patch-1' into 'develop'lambadalambda1+1-1
2017-08-16 14:29Fix deletion not deleting relevant actions.Roger Braun3+12-0
2017-08-14 15:56Use unicode regex in mentions and links.Roger Braun1+2-2
2017-08-09 14:55escape attachment urls on creation.Roger Braun2+2-2
2017-08-09 14:45Cowboy and Elixir don't seem to agree on uri encoding...Roger Braun2+5-5
2017-08-09 13:21URI encode filenames...Roger Braun2+5-4
2017-08-08 10:24Order by id instead of inserted_at to better use indexes.Roger Braun1+1-1
2017-08-04 14:57Also fetch atom links.Roger Braun6+95-43
2017-08-03 15:49Revert "Better error handling for user feeds."Roger Braun1+5-7
2017-08-03 15:46Better error handling for user feeds.Roger Braun1+7-5
2017-08-03 12:14Slightly nicer webfinger error handling.Roger Braun1+7-5
2017-08-02 10:42Try refresh all invalid subscriptions.Roger Braun1+1-1
2017-08-02 10:34Handle subscriptions in queue.Roger Braun2+11-2
2017-08-02 10:03Add some debug info to websub.Roger Braun1+2-0
2017-08-01 15:35Add href to in-reply-to.Roger Braun2+14-3
2017-08-01 15:05Add basic incoming deletions.Roger Braun5+85-3
2017-08-01 12:05Display html links correctly for remote activies.Roger Braun2+38-3
2017-08-01 10:41Don't crash on activity handling problems.Roger Braun1+26-17
2017-07-31 11:31Strip all newlines in atom html content to work around mastodon bug.Roger Braun1+1-1
2017-07-31 11:27Revert "Close br tags."Roger Braun3+4-4
2017-07-31 11:27Revert "Wrap in <p>."Roger Braun2+1-4
2017-07-31 11:27Revert "Remove newlines completely so mastodon doesn't bug out."Roger Braun3+4-4
2017-07-31 11:06Remove newlines completely so mastodon doesn't bug out.Roger Braun3+4-4
2017-07-31 10:16Wrap in <p>.Roger Braun2+4-1
2017-07-31 08:46Close br tags.Roger Braun3+4-4
2017-07-29 20:07Add html alternate link to atom.Roger Braun2+4-1
2017-07-29 17:11Update frontend.Roger Braun9+14-14
2017-07-29 16:56Update frontend.Roger Braun13+43-43
2017-07-28 09:27Update frontend.Roger Braun17+48-48
2017-07-22 15:42Save follower count and note count in user.Roger Braun8+92-19
2017-07-20 18:35Add friends endpoint.Roger Braun3+27-0
2017-07-20 18:29Add followers endpoint.Roger Braun4+36-0
2017-07-20 17:37Add follower / friend fetching to user.Roger Braun2+47-0
2017-07-19 17:06Use follower address in user entry.Roger Braun4+6-5
2017-07-19 16:49Add follower_address to users, add on generation.Roger Braun4+55-6
2017-07-08 09:17Fix undo activity.Roger Braun2+31-0
2017-07-02 13:01Add way to update most recent notification id.Roger Braun4+41-1
2017-07-02 11:09Update frontend. Persistent logins.Roger Braun21+47-33
2017-07-01 14:43Make user timelines faster for users with few statuses.Roger Braun3+9-2
2017-07-01 14:39Fix test.Roger Braun1+1-1
2017-07-01 00:00Larger bio length limit for remote accounts.Roger Braun1+1-1
2017-06-30 14:59For non-create activities, grab the create activity to fav/rtRoger Braun1+6-1
2017-06-30 14:53Also fetch posts by id in fav/rts.Roger Braun1+7-3
2017-06-30 14:41Only return posts in TwAPI conversations.Roger Braun4+11-10
2017-06-30 14:30Order conversation fetches like GS does.Roger Braun3+5-4
2017-06-30 14:08Add tests for public recipients.Roger Braun1+7-0
2017-06-30 13:54Don't add public recipient to notes that don't contain it.Roger Braun2+45-2
2017-06-26 15:00Bio can actually be nil.Roger Braun1+1-1
2017-06-25 10:07Add external links to twapi.Roger Braun2+10-8
2017-06-25 09:57Save external link for notes.Roger Braun2+7-0
2017-06-24 18:09update frontend.Roger Braun15+30-22
2017-06-24 12:35More resilient xml parsing.Roger Braun3+15-5
2017-06-24 11:09Update user data on fetch if it changed.Roger Braun2+13-3
2017-06-23 14:37Handle webpubs in queue.Roger Braun2+22-13
2017-06-23 14:22Some salmon debug fixes.Roger Braun3+12-7
2017-06-23 10:27use correct arity .post.Roger Braun1+1-1
2017-06-23 10:25Longer timeouts for outgoing federation.Roger Braun3+5-5
2017-06-20 15:49Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+21-21
2017-06-20 15:28Better debugging.Roger Braun1+1-1
2017-06-20 14:25Add correct index.Roger Braun1+8-0
2017-06-20 14:18Use more efficient queries.Roger Braun2+10-2
2017-06-20 14:02Use more efficient query.Roger Braun1+1-1
2017-06-20 12:10Add some debugging to federations.Roger Braun1+6-2
2017-06-20 10:00Drop the general index on activities.Roger Braun1+7-0
2017-06-20 09:49Merge branch 'develop' into refactor/user-viewRoger Braun2+9-5
2017-06-19 21:12Replace UserRepresenter with UserViewdtluna12+186-192
2017-06-19 16:06Move finmojis to representation.Roger Braun2+2-2
2017-06-19 15:51Add finmoji.Roger Braun131+83-1
2017-06-18 17:22Update frontend.Roger Braun13+43-43
2017-06-18 17:04Downcase tags coming in through the TwAPI.Roger Braun2+3-3
2017-06-18 17:01Save incoming tags as lowercase.Roger Braun2+2-2
2017-06-18 16:59Revert "Add invisible tags to TwAPI output."Roger Braun3+6-19
2017-06-18 15:20Fetch user feed on externalprofile request.Roger Braun2+13-2
2017-06-18 12:43Output tags list in TwAPI.Roger Braun2+4-2
2017-06-18 11:40Strip unsafe html on output in TwAPI.Roger Braun2+3-3
2017-06-18 11:29Slightly better html link regex.Roger Braun2+3-3
2017-06-18 11:17Remove html from user bios on display.Roger Braun2+4-4
2017-06-16 12:39Update frontend.Roger Braun17+48-48
2017-06-14 12:46Do some basic escaping.Roger Braun3+16-2
2017-06-14 11:58Move mention parsing to Formatter module.Roger Braun4+32-29
2017-06-12 15:41Update frontend.Roger Braun13+43-43
2017-06-12 15:12Enable user timelines.Roger Braun16+54-44
2017-06-12 10:52Redirect html user profile request.Roger Braun1+5-1
2017-06-08 14:44Save correct date for incoming notes.Roger Braun2+2-0
2017-06-07 18:47Update frontend.Roger Braun17+48-48
2017-06-05 13:47Fix NaN statuses per day.Roger Braun4+20-9
2017-06-05 11:06Update frontend.Roger Braun13+19-19
2017-06-04 08:25Update frontend.Roger Braun25+77-47
2017-06-02 20:47Represent object publishing date in notes.Roger Braun2+6-6
2017-06-01 16:09Update frontend.Roger Braun18+58-48
2017-06-01 09:24Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun14+87-87
2017-05-22 17:08Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun2+26-0
2017-05-20 11:35Extract note handler.Roger Braun3+87-84
2017-05-20 08:44Output ref instead of href for conversation.Roger Braun2+7-7
2017-05-19 14:08Try fetching shares.Roger Braun1+13-2
2017-05-19 13:53Also show activities in OStatus.Roger Braun3+34-3
2017-05-18 17:10Fix specs.Roger Braun1+1-0
2017-05-18 16:18Add categories to ostatus output.Roger Braun3+7-2
2017-05-18 15:18Update html_sanitize_ex.Roger Braun2+3-3
2017-05-18 15:03save correct inReplyToStatusId.Roger Braun1+3-3
2017-05-18 14:58Wire up inReplyToStatusIds for ostatus.Roger Braun1+9-1
2017-05-18 14:41Keep newlines around.Roger Braun3+5-5
2017-05-18 14:24Add invisible tags to TwAPI output.Roger Braun3+21-6
2017-05-18 13:58Handle incoming tags.Roger Braun3+74-1
2017-05-18 13:16Save tags in object.Roger Braun3+11-6
2017-05-17 16:00Twitter API refactoring.Roger Braun3+91-87
2017-05-17 16:00Add Formatter.Roger Braun2+41-0
2017-05-16 13:31AP refactoring.Roger Braun12+325-238
2017-05-15 16:25Fix mention replacing.Roger Braun2+22-5
2017-05-12 17:06Update frontend.Roger Braun17+48-49
2017-05-12 16:58On user making, check if we have a user with that uri.Roger Braun1+6-2
2017-05-12 16:50Fetch user on externalprofile if we don't know himRoger Braun1+3-2
2017-05-11 15:59Fix cws.Roger Braun7+455-7
2017-05-11 07:34More debugging code.Roger Braun1+3-0
2017-05-11 07:32Don't fetch if we don't even have a inReplyTo.Roger Braun1+1-1
2017-05-11 07:13Add debugging help.Roger Braun2+6-0
2017-05-10 17:29Repair retweets.Roger Braun2+3-2
2017-05-10 17:24Add problematic mastodon message.Roger Braun1+72-0
2017-05-10 17:12Actually guess 3 days...Roger Braun1+1-1
2017-05-10 17:08Only try refreshing every 6 hours.Roger Braun1+2-2
2017-05-10 17:04Handle cases where we don't get lease_seconds returned.Roger Braun1+9-2
2017-05-10 16:54Correct active state websub name.Roger Braun2+3-3
2017-05-10 16:46Handle incoming follows.Roger Braun8+427-4
2017-05-10 16:45Set valid_until date.Roger Braun2+6-5
2017-05-10 16:45Add option to keep id for follows.Roger Braun1+3-1
2017-05-10 16:44Add externalprofile to TwAPI.Roger Braun5+38-0
2017-05-10 16:44Refresh subscriptions.Roger Braun3+45-3
2017-05-10 16:43Only kick off websubs for local users.Roger Braun1+1-1
2017-05-10 08:16Use changeset for remote user creation.Roger Braun3+11-9
2017-05-09 16:11Add some basic changesets.Roger Braun4+75-2
2017-05-09 16:11Get fresh objects on changes.Roger Braun1+2-2
2017-05-08 22:20Quick fix for database filling.Roger Braun1+2-1
2017-05-08 18:12Add class=attachment to attachment links.Roger Braun2+2-2
2017-05-08 17:35Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+131-4
2017-05-07 18:30typo.Roger Braun1+0-1
2017-05-07 18:20Add some twapi fixes.Roger Braun2+8-2
2017-05-07 18:16Add some debugging info.Roger Braun1+2-0
2017-05-07 18:13Prevent double insertions.Roger Braun2+19-8
2017-05-07 18:05Preserve ids on favorites / retweets.Roger Braun3+20-6
2017-05-07 17:28Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activityRoger Braun91+7810-327
2017-04-28 13:06Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activitydtluna36+923-32
2017-04-21 16:54Add Undo of Follow Activity insertiondtluna6+51-6
2017-04-21 15:36Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-namedtluna8+100-14
2017-04-20 07:57Refactor unfollow/2dtluna1+4-12
2017-04-20 07:46Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-namedtluna3+28-12
2017-04-20 07:39Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-namedtluna3+18-12
2017-04-19 09:50Merge branch 'feature/user-timeline' into 'develop' Feature/user timeline See merge request !8lambadalambda6+155-2
2017-04-17 09:46Merge branch 'bugfix/repeated-follow-unfollow' into 'develop' Add error messages for repeated follows and unfollows See merge request !7lambadalambda4+56-28
2017-04-17 09:43Fix syntax error.Roger Braun1+1-0
2017-04-17 09:37Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+12-0
2017-04-17 09:36Switch cache implementation for size limiting.Roger Braun5+16-15
2017-04-16 14:07Update frontend.Roger Braun9+14-14
2017-04-16 14:06Add basic Avatar updating code.Roger Braun4+37-2
2017-04-16 13:40Display the users avatar if he has one set.Roger Braun2+11-8
2017-04-16 13:28Add avatar objects to user, fix specs.Roger Braun9+60-37
2017-04-16 12:23Support data uris in uploads.Roger Braun3+36-1
2017-04-16 09:52Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun1+661-0
2017-04-16 09:51Preserve newlines in messages.Roger Braun2+3-2
2017-04-16 09:16Update frontend again.Roger Braun9+14-14
2017-04-16 09:04Update frontend.Roger Braun21+118-50
2017-04-16 09:01Add registration to the TwAPI controller.Roger Braun3+50-0
2017-04-16 08:25Add user registration to TwAPI.Roger Braun2+55-2
2017-04-15 14:42Use changeset in user registration mix task.Roger Braun1+5-3
2017-04-15 14:40Add user registration changeset.Roger Braun3+62-0
2017-04-15 12:16Address liking / announcing to the original author.Roger Braun2+4-4
2017-04-15 12:09Add retweeting to TwAPI controller.Roger Braun3+29-0
2017-04-15 11:54Add announcements / retweets to TwAPI.Roger Braun5+91-4
2017-04-15 10:11Add announcements to activitypub.Roger Braun2+39-0
2017-04-14 16:59Update object correctly after setting context.Roger Braun2+7-0
2017-04-14 16:27Add unliking to TwAPI controller.Roger Braun4+34-3
2017-04-14 16:15Add unfavoriting to TwAPI.Roger Braun2+30-0
2017-04-14 16:08Add unliking to activitypub.Roger Braun4+67-9
2017-04-14 15:29Make new users follow themselves.Roger Braun1+1-1
2017-04-14 15:13Add basic user caching.Roger Braun7+41-4
2017-04-14 14:13Fix uploads and favorites in twidere / twittnuker.Roger Braun3+31-13
2017-04-14 13:07Favorite changes.Roger Braun5+57-33
2017-04-13 15:22Add favoriting to TwAPI controller.Roger Braun4+39-0
2017-04-13 15:05Display like activities.Roger Braun3+42-0
2017-04-13 15:05Update factory.Roger Braun1+18-0
2017-04-13 14:19Add favoriting to twitter api.Roger Braun4+34-4
2017-04-13 13:50Add liking to ActivityPub.Roger Braun2+56-2
2017-04-13 13:49Add utility functions for objects and activities.Roger Braun3+41-0
2017-04-13 13:49Add factories for testing.Roger Braun4+50-0
2017-04-13 12:56Add actor to objects.Roger Braun2+3-1
2017-04-12 17:34Fix twitter api date.Roger Braun4+29-7
2017-04-12 15:47Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun1+2-0
2017-04-12 15:47Add basic config endpoint.Roger Braun2+15-0
2017-04-12 15:22Don't return html in the text field.Roger Braun2+5-4
2017-04-12 15:11Add max_id fetching to activity fetching.Roger Braun2+20-0
2017-04-12 14:53Test friends timeline more thoroughly.Roger Braun1+1-0
2017-04-12 14:45Return directly addressed activities in friends timeline.Roger Braun2+4-2
2017-04-12 14:38Fix user representation after following.Roger Braun2+3-3
2017-04-10 12:44Merge branch 'develop' into 'develop' Add Follow activity insertion See merge request !1lambadalambda5+33-7
2017-04-05 10:27Add user registration mix task.Roger Braun1+21-0
2017-04-05 09:59Fix replies.Roger Braun1+1-1
2017-04-05 09:59Remove vestigial file.Roger Braun1+0-17
2017-04-04 15:21Add Pleroma-FE snapshot.Roger Braun92+2988-0
2017-04-03 16:28Parse mentions, save them, output them in TwAPI.Roger Braun4+93-17
2017-04-03 16:28Add HTML sanitization library.Roger Braun2+3-0
2017-04-03 16:27Use standard base url in User.Roger Braun1+1-6
2017-04-03 16:27Add TODO file.Roger Braun1+1-0
2017-03-30 16:07Connect attachments with objects, not activities.Roger Braun4+9-9
2017-03-30 16:07Put objects in inserted activties into the db.Roger Braun3+10-1
2017-03-30 16:06Add index to objects.Roger Braun1+7-0
2017-03-30 15:07Add attachments to the TwAPI.Roger Braun7+73-13
2017-03-30 14:08Basic ObjectRepresenter.Roger Braun2+45-0
2017-03-30 14:08Return mimetype with attachment.Roger Braun2+12-4
2017-03-30 13:29Short circuit user verification if cookie is present.Roger Braun2+60-9
2017-03-30 12:34Ignore uploads.Roger Braun1+2-0
2017-03-30 12:32Add port if specified.Roger Braun3+21-15
2017-03-29 00:05Basic file uploading via TwAPI.Roger Braun10+57-6
2017-03-28 23:39Add Uploads.Roger Braun5+48-0
2017-03-28 15:22Add conversation fetching to TwAPI controller.Roger Braun5+64-6
2017-03-28 12:49Return statusnet_conversation_id in TwAPI.Roger Braun4+15-12
2017-03-28 12:40Add conversation id to activities.Roger Braun3+25-4
2017-03-28 12:04Fix spec.Roger Braun1+1-1
2017-03-24 00:16Add single status fetching to TwAPI.Roger Braun8+58-12
2017-03-23 23:09Add fetching of activities in context.Roger Braun2+18-0
2017-03-23 23:00Add inReplyToStatus to TwAPI.Roger Braun2+6-3
2017-03-23 22:34Add context and inReplyTo.Roger Braun3+57-10
2017-03-23 20:22Add id to objects, too.Roger Braun2+26-0
2017-03-23 16:56Generate ids for activities.Roger Braun2+24-4
2017-03-23 14:51Return user specific json for logged in users.Roger Braun10+72-29
2017-03-23 12:13Add unfollowing to TwAPI.Roger Braun7+75-1
2017-03-22 17:36Add following TwAPI endpoint.Roger Braun7+78-1
2017-03-22 16:25Add friends timeline.Roger Braun4+39-3
2017-03-22 15:51Add friends status fetching.Roger Braun6+46-13
2017-03-22 13:45Add fetching for recipients.Roger Braun3+28-2
2017-03-21 20:09Add public timeline TwAPI.Roger Braun6+37-6
2017-03-21 19:31Add since_id for activitypub fetching.Roger Braun2+17-1
2017-03-21 19:22Add limiting to activity pub fetching.Roger Braun3+39-16
2017-03-21 17:17Add status posting via TwAPI.Roger Braun6+42-19
2017-03-21 16:53Basic status creation and retrieval.Roger Braun14+272-9
2017-03-21 08:21Basic AP objects.Roger Braun6+69-0
2017-03-20 20:30Add Twitter API verify_credentials endpoint.Roger Braun3+71-1
2017-03-20 20:30Add Twitter API user representer.Roger Braun3+95-0
2017-03-20 20:28Don't use fetch access in plug.Roger Braun1+1-1
2017-03-20 20:28Add user schema.Roger Braun2+29-0
2017-03-20 16:45Add basic auth.Roger Braun5+174-3
2017-03-17 16:09Phoenix skeletonRoger Braun25+873-0
2019-02-07 15:41Pleroma.Formatter: Replace with/height on emojis to class='emoji'Haelwenn (lanodan) Monnier1+1-3
2019-02-03 14:13download-mastofe-build.sh: New scriptHaelwenn (lanodan) Monnier1+28-0
2019-02-03 11:31[MastoAPI] Add switching of frontend flavoursHaelwenn (lanodan) Monnier5+70-5
2019-02-02 18:06Plugs.HTTPSecurityPlug: Add webpacker to connect-srcHaelwenn (lanodan) Monnier1+17-4
2019-02-01 12:10Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev modeHaelwenn (lanodan) Monnier1+3-1
2018-09-16 21:09[PleromaFE] Update frontendHaelwenn (lanodan) Monnier24+1208-81
2018-05-20 15:35lib/pleroma/web/mastodon_api/views/status_view.ex: More than 4 attachementsHaelwenn (lanodan) Monnier1+1-1
2018-04-30 00:31lib/pleroma/web/router.ex: Remove complete globbing allowing to 404 on unknown APIsHaelwenn (lanodan) Monnier1+10-1
2018-10-30 01:04.mailmap: Link lanodan’s Gitlab to regular commitsHaelwenn (lanodan) Monnier1+1-0
2018-10-16 01:57rebase.sh: script (legacy)Haelwenn (lanodan) Monnier1+6-0
2018-03-22 05:43priv/static/instance/panel.html: Personnal configHaelwenn (lanodan) Monnier1+7-4
2018-02-03 23:23upgrade.sh: CreateHaelwenn (lanodan) Monnier3+42-1
2018-11-22 06:12config/dev.exs: Don’t put secure cookies on devHaelwenn (lanodan) Monnier1+2-1
2019-02-12 02:44Merge branch 'fix-csp-upgrade-insecure-requests-check' into 'develop'Haelwenn1+2-2
2019-02-12 02:35Merge branch 'doc/mark-streaming-feature-for-apps' into 'develop'Haelwenn1+11-0
2019-02-11 18:45Merge branch 'bugfix/keyword-policy-check-summary' into 'develop'kaniini2+138-22
2019-02-11 15:02Merge branch 'feature/thread-muting' into 'develop'rinpatch9+170-2
2019-02-11 12:33Merge branch 'feature/rich-media-limits' into 'develop'lambda1+8-1
2019-02-11 08:22Merge branch 'revert-e0de0fcf' into 'develop'lambda4+19-53
2019-02-10 21:28Merge branch 'update-mastofe/glitch-soc-2019-02-10' into 'develop'kaniini371+557-564
2019-02-10 21:16Merge branch 'feather_mention' into 'develop'kaniini1+4-0
2019-02-10 20:54Merge branch 'fix/credo-issues' into 'develop'kaniini73+396-227
2019-02-10 19:25Merge branch 'update-service-files-of-openrc-and-systemd-to-new-recommended-paths' into 'develop'kaniini2+6-5
2019-02-10 14:21Merge branch 'adapt-nginx-acme-path-to-guide-recommendation' into 'develop'lambda1+5-4
2019-02-10 13:47Merge branch 'docs/pleroma-clients' into 'develop'lambda2+84-14
2019-02-10 07:39Merge branch 'object-creation' into 'develop'rinpatch4+53-19
2019-02-09 21:03Merge branch 'follow-enhancements' into 'develop'kaniini2+12-11
2019-02-09 11:39Merge branch 'add-media-path-to-caddy-cache' into 'develop'lambda1+5-0
2019-02-09 11:38Merge branch 'feature/keyword-policy' into 'develop'lambda5+222-0
2019-02-08 12:18Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'lambda1+3-3
2019-02-08 12:10Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'lambda1+5-4
2019-02-08 12:09Merge branch 'oauth2_strengthening' into 'develop'lambda2+9-9
2019-02-07 02:19Merge branch 'remove-pawoo-apps-from-readme' into 'develop'kaniini1+0-1
2019-02-07 02:18Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'kaniini1+3-3
2019-02-06 22:40Merge branch 'rename-followings' into 'develop'kaniini9+27-27
2019-02-06 18:39Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn2+59-2
2019-02-06 18:19Merge branch 'add-admin-and-moderator-fields' into 'develop'kaniini5+78-9
2019-02-06 18:02Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'Haelwenn2+21-1
2019-02-06 17:47Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch1+2-0
2019-02-06 09:47Merge branch '2019-02-06-update-frontend' into 'develop'lambda21+84-77
2019-02-05 21:01Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'rinpatch1+4-14
2019-02-05 20:27Merge branch 'fix-dm-index' into 'develop'kaniini2+31-1
2019-02-05 20:26Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini2+9-0
2019-02-05 20:13Merge branch 'testfix/twitter-api' into 'develop'kaniini1+1-1
2019-02-05 18:56Merge branch 'feature/split-hide-network-v2' into 'develop'kaniini10+90-45
2019-02-05 18:53Merge branch 'bugfix/rich-media-image-nil' into 'develop'kaniini2+7-2
2019-02-05 11:30Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'lambda1+2-0
2019-02-05 11:29Merge branch 'patch-2' into 'develop'lambda1+1-0
2019-02-05 11:28Merge branch 'bugfix/rich-media-nil' into 'develop'lambda1+2-0
2019-02-04 19:20Merge branch 'feature/mrf-tag' into 'develop'Haelwenn2+173-0
2019-02-04 17:32Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'rinpatch1+4-1
2019-02-04 16:52Merge branch 'mime-riff' into 'develop'kaniini1+9-1
2019-02-04 16:01Merge branch 'fix/rich-media-relative-path' into 'develop'rinpatch1+14-3
2019-02-04 12:36Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch4+47-11
2019-02-03 21:06Merge branch 'mogrify-orient' into 'develop'kaniini2+3-3
2019-02-03 18:19Merge branch '589-fix-cache' into 'develop'lambda8+51-19
2019-02-03 15:47Merge branch '582_federation_retirement_optimization' into 'develop'kaniini8+178-43
2019-02-02 10:48Merge branch 'fix/oauth-page-responsiveness' into 'develop'rinpatch1+2-1
2019-02-01 20:23Merge branch 'revert-0a82a7e6' into 'develop'kaniini10+45-88
2019-02-01 19:45Merge branch 'hotfix/object-normalize-cache' into 'develop'href1+2-2
2019-02-01 19:39Merge branch 'streaming-api-url-fix' into 'develop'href2+5-1
2019-02-01 19:18Merge branch 'develop' into 'develop'href3+85-8
2019-02-01 17:27Merge branch 'bugfix/get_list_return_404' into 'develop'Haelwenn1+4-1
2019-02-01 17:05Merge branch 'feature/split-hide-network' into 'develop'kaniini10+88-45
2019-02-01 14:24Merge branch 'serve-sw-pleroma.js' into 'develop'lambda2+2-2
2019-02-01 09:33Merge branch 'fix-rich-media-toggle' into 'develop'lambda1+1-1
2019-02-01 09:14Merge branch '534_federation_targets_reachability' into 'develop'href24+775-115
2019-01-31 22:28Merge branch 'docs/pleroma-api-invite-token' into 'develop'Haelwenn1+1-0
2019-01-31 18:50Merge branch 'user-follow-all-unique' into 'develop'kaniini2+23-1
2019-01-31 16:54Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda4+4948-13
2019-01-31 16:28Merge branch 'develop' into 'develop'kaniini1+1-1
2019-01-31 16:22Merge branch 'fix/rich-media-disable-in-config' into 'develop'kaniini3+7-1
2019-01-31 12:16Merge branch 'revert-4d3655c4' into 'develop'lambda5+0-1240
2019-01-31 11:29Merge branch 'spc-fix-3' into 'develop'kaniini5+1240-0
2019-01-31 10:16Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn9+162-11
2019-01-31 10:12Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'Haelwenn551+1417-659
2019-01-30 21:38Merge branch 'add-wiki-reference-to-readme' into 'develop'kaniini1+28-27
2019-01-30 20:18Merge branch 'multiple-hackney-pools' into 'develop'lambda3+3-3
2019-01-30 20:17Merge branch '2019-1-30-update-frontend' into 'develop'lambda36+140-93
2019-01-30 19:01Merge branch 'multiple-hackney-pools' into 'develop'kaniini8+86-12
2019-01-30 18:50Merge branch 'better-following' into 'develop'kaniini3+38-29
2019-01-30 10:56Merge branch 'docs/fix-frontend_config' into 'develop'Haelwenn1+1-1
2019-01-30 10:38Merge branch 'docs/fix-frontend_config' into 'develop'kaniini1+2-2
2019-01-29 19:24Merge branch 'docs/fix-pleroma-api-title' into 'develop'lambda1+1-5
2019-01-29 14:47Merge branch 'bugfix/fix-rejects' into 'develop'kaniini2+21-2
2019-01-29 13:54Merge branch 'hj-happiness-improvement' into 'develop'kaniini8+159-19
2019-01-29 05:11Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'Haelwenn17+159-131
2019-01-28 14:31Merge branch 'app-list-changes' into 'develop'kaniini1+8-5
2019-01-28 11:48Merge branch 'safe-render-activities' into 'develop'Haelwenn1+0-1
2019-01-28 10:49Merge branch 'oauth-login-failure-bug' into 'develop'href2+27-1
2019-01-28 08:23Merge branch 'patch-2' into 'develop'Haelwenn1+1-1
2019-01-27 22:01Merge branch 'notice-404-to-fe' into 'develop'rinpatch2+7-4
2019-01-27 20:10Merge branch 'safe-render-activities' into 'develop'lambda3+29-2
2019-01-27 19:10Merge branch 'discard-invalid-likes' into 'develop'kaniini1+5-5
2019-01-27 15:22Merge branch 'hotfix/favorites-index' into 'develop'kaniini1+8-0
2019-01-27 15:16Merge branch 'flake-random-worker-id' into 'develop'kaniini1+3-18
2019-01-27 14:28Merge branch 'docs/emoji-endpoint-similarities' into 'develop'rinpatch1+1-0
2019-01-27 12:45Merge branch 'features/mastoapi-multi-hashtag' into 'develop'kaniini4+108-4
2019-01-27 09:45Merge branch 'features/masto-account-view-rights' into 'develop'Haelwenn2+9-3
2019-01-26 17:30Merge branch 'hardening/mastodon-rich-media' into 'develop'Haelwenn1+10-2
2019-01-26 17:27Merge branch 'webpush-endpoint-size' into 'develop'kaniini1+9-0
2019-01-26 16:17Merge branch 'flake-from-int' into 'develop'kaniini2+5-0
2019-01-26 15:57Merge branch 'join-in-preloads' into 'develop'kaniini2+10-3
2019-01-26 15:47Merge branch 'features/mastoapi-cards' into 'develop'kaniini6+70-12
2019-01-26 14:10Merge branch 'documentation/mastalab' into 'develop'kaniini1+1-0
2019-01-26 13:41Merge branch 'bugfix/content_nil_lenght_check' into 'develop'kaniini2+12-1
2019-01-25 15:16Merge branch 'oembed_provider' into 'develop'kaniini13+476-22
2019-01-25 10:23Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'lambda10+25-25
2019-01-25 05:19Merge branch 'fix/tusky-dm' into 'develop'kaniini9+79-52
2019-01-25 04:59Merge branch 'classic-flakeids' into 'develop'kaniini21+542-37
2019-01-25 04:57Merge branch 'update/pleroma-fe-20190125' into 'develop'kaniini16+67-66
2019-01-24 13:22Merge branch 'fix-activity_visibility-autovacuum' into 'develop'kaniini1+37-0
2019-01-24 10:20Merge branch 'feature/mrf-anti-followbot' into 'develop'href2+114-0
2019-01-23 23:47Merge branch 'fix/hide-network-setting' into 'develop'kaniini2+5-0
2019-01-23 13:25Merge branch 's3-namespace' into 'develop'kaniini1+9-1
2019-01-23 13:20Merge branch 'fix-info-id' into 'develop'href1+9-0
2019-01-23 12:14Merge branch 'rename/pleroma_activity_consistency' into 'develop'lambda20+57-64
2019-01-22 16:10Merge branch 'mr/20190122-activity-visibility-update' into 'develop'href1+36-0
2019-01-22 14:28Merge branch 'fix/activity_get_by_id' into 'develop'Haelwenn1+4-0
2019-01-22 14:18Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'lambda2+12-1
2019-01-22 09:03Merge branch 'uploader-controller' into 'develop'kaniini3+63-4
2019-01-21 20:02Merge branch 'fix-buggy-test' into 'develop'rinpatch1+2-2
2019-01-21 16:19Merge branch 'proxy-no-default-plug-cache' into 'develop'lambda1+18-5
2019-01-21 13:03Merge branch '530_federator_user_info_overwrite_fix' into 'develop'lambda2+6-7
2019-01-21 12:35Merge branch 'feature/dm-sanity' into 'develop'lambda8+186-4
2019-01-21 05:22Merge branch 'bugfix/gen_signing_salt' into 'develop'rinpatch2+4-1
2019-01-20 23:06Merge branch '116-send-delete-event' into 'develop'kaniini3+44-10
2019-01-20 10:58Merge branch 'add-custom-emoji-test' into 'develop'lambda1+7-0
2019-01-20 10:42Merge branch '2019-1-20-update-frontend' into 'develop'lambda20+70-70
2019-01-20 10:24Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'lambda7+230-41
2019-01-19 23:44Merge branch 'bugfix/improve-boost-targeting' into 'develop'kaniini5+32-13
2019-01-19 07:36Merge branch '491_full_mentions_in_user_bio' into 'develop'kaniini5+45-15
2019-01-17 19:27Merge branch '502_instance_stats_active_users_count_fix' into 'develop'kaniini3+15-5
2019-01-17 19:22Merge branch 'bad-copy-paste' into 'develop'kaniini1+1-1
2019-01-17 19:21Merge branch 'attachment-links' into 'develop'kaniini4+11-3
2019-01-17 19:21Merge branch 'change-mix-location' into 'develop'kaniini1+13-5
2019-01-17 03:19Merge branch 'resilient-user-view-2' into 'develop'kaniini4+57-14
2019-01-16 09:06Merge branch 'feature/improve-microformats' into 'develop'lambda7+37-27
2019-01-16 08:59Merge branch '518_instance_stats_fix' into 'develop'lambda2+24-7
2019-01-15 20:02Merge branch 'bugfix/websub-hardening' into 'develop'lambda2+13-0
2019-01-15 20:00Merge branch 'bugfix/tesla-query-params' into 'develop'lambda2+9-1
2019-01-15 08:51Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'lambda1+3-2
2019-01-15 07:01Merge branch 'bugfix/upload_with_question_mark' into 'develop'rinpatch2+22-1
2019-01-14 18:52Merge branch 'media-url-escape' into 'develop'rinpatch2+16-1
2019-01-14 18:49Merge branch 'load-all-dms' into 'develop'lambda1+0-10
2019-01-14 07:28Merge branch 'feature/add-oembed-parser' into 'develop'kaniini5+77-1
2019-01-14 07:27Merge branch 'activitypub-likes' into 'develop'kaniini8+200-3
2019-01-14 07:25Merge branch 'fix-nginx-caching' into 'develop'kaniini1+3-1
2019-01-14 07:23Merge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'kaniini1+29-0
2019-01-13 16:01Merge branch 'bugfix/favourites-link-header' into 'develop'lambda2+34-4
2019-01-11 23:09Merge branch 'bugfix/pinned-statuses' into 'develop'kaniini2+24-0
2019-01-11 10:02Merge branch 'fix-spellign' into 'develop'scarlett1+1-1
2019-01-10 18:49Merge branch 'fix-varnish-chunked' into 'develop'kaniini1+51-25
2019-01-10 18:42Merge branch 'activitypub-dereference-activity-id' into 'develop'kaniini3+57-14
2019-01-10 18:09Merge branch 'feature/add-twitter-card-parser' into 'develop'kaniini6+72-27
2019-01-10 18:03Merge branch 'twapi-follower-pagination' into 'develop'kaniini3+83-8
2019-01-10 03:54Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'Haelwenn2+50-2
2019-01-10 02:39Merge branch 'feature/pinned-posts' into 'develop'kaniini19+370-14
2019-01-10 02:33Merge branch 'mass-follow' into 'develop'kaniini2+31-4
2019-01-10 02:31Merge branch 'dm-optimizations' into 'develop'kaniini3+95-14
2019-01-10 01:08Merge branch 'fix-alphasort' into 'develop'kaniini1+21-21
2019-01-09 18:42Merge branch 'hotfix/ogp-cachex-fix' into 'develop'rinpatch1+1-1
2019-01-09 16:26Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'lambda4+20-7
2019-01-09 07:09Merge branch 'hotfix/media-proxy-uri' into 'develop'kaniini3+97-12
2019-01-08 22:58Merge branch 'autofollow' into 'develop'rinpatch4+38-2
2019-01-07 22:25Merge branch 'features/syslog_logger' into 'develop'kaniini4+19-2
2019-01-07 20:39Merge branch 'spc-fix-2' into 'develop'kaniini2+10-5
2019-01-07 17:09Merge branch 'resilient-user-view' into 'develop'kaniini3+52-1
2019-01-07 12:20Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop'lambda2+26-5
2019-01-05 22:54Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop'kaniini2+43-1
2019-01-05 22:34Merge branch 'fix/user-search-null-name' into 'develop'kaniini2+11-1
2019-01-05 22:33Merge branch 'fix_486' into 'develop'kaniini1+8-2
2019-01-05 22:29Merge branch 'activitypub-tombstone-fix' into 'develop'kaniini3+29-0
2019-01-05 21:52Merge branch 'emoji-in-summary' into 'develop'scarlett4+34-5
2019-01-04 23:56Merge branch 'feature/rich-media-cachex' into 'develop'rinpatch2+19-1
2019-01-04 23:35Merge branch 'fix/html-cache-content-collision' into 'develop'kaniini3+21-28
2019-01-04 20:50Merge branch 'feature/rich-media' into 'develop'kaniini9+179-1
2019-01-04 20:32Merge branch 'activitypub-c2s-delete-activity' into 'develop'kaniini2+101-17
2019-01-03 22:30Merge branch 'mr/retry-queue-remove-fold' into 'develop'kaniini1+1-2
2019-01-03 22:29Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'kaniini1+1-7
2019-01-03 18:53Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'kaniini1+1-0
2019-01-03 17:04Merge branch 'captcha' into 'develop'rinpatch10+125-97
2019-01-03 08:59Merge branch 'fix-chat' into 'develop'rinpatch1+13-0
2019-01-02 16:23Merge branch 'fix/reserve-media-username' into 'develop'rinpatch1+2-1
2019-01-01 20:12Merge branch 'pool-usage' into 'develop'kaniini4+9-12
2019-01-01 18:55Merge branch 'configurable-federator' into 'develop'rinpatch4+27-14
2019-01-01 16:55Merge branch '2019-1-1-update-frontend' into 'develop'lambda19+69-69
2019-01-01 13:48Merge branch 'cleanup/admin-api-useless-if' into 'develop'lambda1+2-7
2018-12-31 15:49Merge branch 'features/admin-api-user-views' into 'develop'kaniini3+19-6
2018-12-31 15:49Merge branch 'docs/admin-api' into 'develop'kaniini3+105-3
2018-12-31 15:43Merge branch 'maintenance/copyright-2019' into 'develop'kaniini137+137-137
2018-12-31 09:56Merge branch 'fix/scrubber-cache' into 'develop'lambda6+70-9
2018-12-30 21:47Merge branch 'mr/retry-queue' into 'develop'kaniini2+202-24
2018-12-30 19:50Merge branch 'activitypub-c2s' into 'develop'kaniini5+186-7
2018-12-29 17:30Merge branch 'fix_485' into 'develop'Haelwenn1+1-1
2018-12-29 13:47Merge branch '2018-12-29-update-frontend' into 'develop'lambda20+78-74
2018-12-29 11:46Merge branch 'carrot-bullying' into 'develop'kaniini4+29-1
2018-12-29 11:34Merge branch '483_blocks_import_export' into 'develop'kaniini8+173-19
2018-12-29 11:32Merge branch 'support/issue_480' into 'develop'kaniini3+18-4
2018-12-29 03:03Merge branch '471_invalid_accounts_rendering' into 'develop'kaniini3+86-61
2018-12-28 20:14Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'kaniini1+2-0
2018-12-28 18:33Merge branch 'fix/no-attachment-links' into 'develop'kaniini1+1-1
2018-12-28 18:30Merge branch 'fix/public-timeline-auth' into 'develop'kaniini2+61-1
2018-12-27 22:10Merge branch '396_elixir_1.7' into 'develop'Haelwenn2+3-3
2018-12-27 19:37Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'kaniini9+53-13
2018-12-27 19:35Merge branch 'reserve-user-names' into 'develop'kaniini5+61-3
2018-12-27 19:22Merge branch 'feature/exclude_reblogs' into 'develop'kaniini5+74-0
2018-12-26 20:11Merge branch 'fix/ci-set-mix-env-globally' into 'develop'Haelwenn1+5-4
2018-12-25 17:53Merge branch 'legal-boilerplate' into 'develop'lambda224+896-0
2018-12-23 14:46Merge branch 'bugfix/trans_fix_url_videos' into 'develop'lambda7+97-14
2018-12-23 13:17Merge branch 'hotfix/activity-without-content' into 'develop'lambda1+5-3
2018-12-23 11:28Merge branch 'feature/hellthread-mitigation' into 'develop'kaniini3+23-0
2018-12-20 16:31Merge branch 'ci-test-fix' into 'develop'lambda1+2-2
2018-12-20 13:28Merge branch '114_email_confirmation' into 'develop'kaniini21+398-24
2018-12-20 09:35Merge branch 'support/issue_413' into 'develop'kaniini2+16-9
2018-12-20 09:06Merge branch 'fix/readme-md-config-typo' into 'develop'kaniini1+1-1
2018-12-20 04:12Merge branch 'readme' into 'develop'kaniini1+4-4
2018-12-20 04:01Merge branch 'documentation/copy-pleroma-api' into 'develop'kaniini4+100-3
2018-12-19 00:12Merge branch 'userless-admin' into 'develop'kaniini4+78-2
2018-12-18 21:11Merge branch 'fix/ci-cache-improved' into 'develop'lambda1+2-0
2018-12-18 20:23Merge branch 'fix/formatter-ignore-html-chars' into 'develop'lambda2+15-3
2018-12-18 15:42Merge branch 'feature/new-user-routes' into 'develop'lambda1+2-2
2018-12-18 15:41Merge branch 'new-routes-integration' into 'develop'lambda19+68-68
2018-12-18 15:18Merge branch 'ci-test-fix' into 'develop'lambda1+2-0
2018-12-18 10:42Merge branch 'runtime-static-plug' into 'develop'lambda7+107-3
2018-12-17 20:36Merge branch '2018-12-17-update-frontend' into 'develop'lambda30+118-103
2018-12-17 20:24Merge branch 'fix-test' into 'develop'lambda1+6-1
2018-12-17 20:16Merge branch '459_fix_user_profile_crash' into 'develop'lambda1+4-1
2018-12-17 20:11Merge branch 'support/issue_449' into 'develop'lambda2+22-1
2018-12-17 19:45Merge branch 'captcha' into 'develop'lambda12+288-25
2018-12-17 19:38Merge branch 'fix-tags' into 'develop'lambda3+20-3
2018-12-17 19:37Merge branch 'test-mix-tasks' into 'develop'lambda5+370-13
2018-12-17 19:30Merge branch 'phoenix14' into 'develop'lambda16+500-211
2018-12-17 09:19Merge branch 'testfix/webfinger-jrd' into 'develop'lambda2+14-1
2018-12-16 13:19Merge branch 'netbsd-script' into 'develop'scarlett1+57-0
2018-12-16 12:13Merge branch 'develop' into 'develop'Haelwenn3+114-0
2018-12-16 11:21Merge branch 'fix/masto-put-settings' into 'develop'eal3+23-4
2018-12-16 11:08Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'eal1+1-0
2018-12-15 15:31Merge branch 'bugfix/webfinger-jrd' into 'develop'lambda2+38-0
2018-12-15 15:23Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'lambda1+6-0
2018-12-15 15:22Merge branch 'tests-warning-as-errors' into 'develop'lambda1+1-6
2018-12-15 15:21Merge branch 'feature/mix-task-instance-port-specification' into 'develop'lambda2+11-7
2018-12-14 20:30Merge branch 'fix/issue_433' into 'develop'href7+49-11
2018-12-14 20:22Merge branch '114_email_invites' into 'develop'href7+145-2
2018-12-14 20:20Merge branch 'fix/issue_272' into 'develop'href2+49-2
2018-12-14 18:50Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'href8+154-110
2018-12-14 13:00Merge branch 'feature/file-size-checking' into 'develop'href1+8-0
2018-12-14 09:16Merge branch '114_user_registration_emails' into 'develop'href13+169-2
2018-12-14 08:26Merge branch 'fix/double-rt-or-fav' into 'develop'lambda2+44-2
2018-12-14 08:25Merge branch 'fix/qvitter-fav-object' into 'develop'lambda2+9-0
2018-12-14 08:23Merge branch '2018-12-13-update-frontend' into 'develop'lambda37+1307-107
2018-12-13 15:13Merge branch 'username-underscores' into 'develop'lambda4+23-9
2018-12-13 15:10Merge branch 'fix/mix-tasks-set-user-info' into 'develop'lambda1+26-17
2018-12-12 20:38Merge branch 'fix/nginx-safari' into 'develop'lambda1+5-0
2018-12-12 07:28Merge branch 'support/issue_442' into 'develop'kaniini32+204-184
2018-12-10 23:32Merge branch 'new-fe-options' into 'develop'scarlett3+14-2
2018-12-10 19:55Merge branch '2018-12-10-update-frontend' into 'develop'lambda19+66-65
2018-12-10 19:08Merge branch 'fix_empty_bio_crash' into 'develop'lambda2+23-2
2018-12-10 19:06Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'lambda1+9-2
2018-12-10 19:06Merge branch 'fix/config-md-typos' into 'develop'lambda1+3-3
2018-12-10 19:05Merge branch 'support/bugfix_272' into 'develop'lambda2+66-49
2018-12-10 19:04Merge branch 'fix/theora-detection-read-bytes' into 'develop'lambda1+1-1
2018-12-10 19:03Merge branch 'anonymize-filter-text' into 'develop'lambda2+27-3
2018-12-10 18:28Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'lambda58+240-288
2018-12-09 13:53Merge branch 'angristan-docker' into 'develop'Haelwenn1+1-1
2018-12-08 09:12Merge branch 'fix/add-upload.ex' into 'develop'lambda1+98-0
2018-12-08 09:12Merge branch 'fix/nodeinfo-nil-features' into 'develop'lambda1+22-17
2018-12-08 09:11Merge branch 'fix/media-proxy-url-encoded' into 'develop'lambda3+51-2
2018-12-08 09:08Merge branch 'fix/typo-relay-ex' into 'develop'lambda1+1-1
2018-12-07 18:49Merge branch 'fix/gopher-respect-ip' into 'develop'lambda1+1-1
2018-12-07 18:48Merge branch 'media-proxy-follow-redirect' into 'develop'lambda1+1-1
2018-12-07 18:25Merge branch '394_user_tags' into 'develop'lambda10+168-7
2018-12-07 18:13Merge branch 'emoji-alphabetical-ordering' into 'develop'lambda1+1-1
2018-12-07 09:23Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'lambda1+5-1
2018-12-07 09:19Merge branch 'fix/typo-in-relay-doc' into 'develop'lambda1+1-1
2018-12-07 06:48Merge branch 'fix/add-common.ex' into 'develop'eal1+24-0
2018-12-06 22:09Merge branch 'refactor/mix-tasks' into 'develop'kaniini21+568-573
2018-12-06 16:01Merge branch 'fix/mastodon-api-settings' into 'develop'kaniini3+10-7
2018-12-06 15:57Merge branch 'correct-and-improve-http-options' into 'develop'kaniini8+20-27
2018-12-06 15:36Merge branch 're-mrf' into 'develop'kaniini2+41-0
2018-12-06 15:35Merge branch 'feature/compat/push-subscriptions' into 'develop'kaniini15+291-10
2018-12-06 07:36Merge branch '210_twitter_api_uploads_alt_text' into 'develop'kaniini11+180-46
2018-12-05 21:41Merge branch 'follower-hiding' into 'develop'kaniini7+241-13
2018-12-05 20:47Merge branch 'dev_vald_fe/data_tag' into 'develop'kaniini7+31-23
2018-12-05 17:55Merge branch 'support/oauth_fetch_token' into 'develop'lambda2+112-18
2018-12-05 17:53Merge branch 'fix/mix-tasks-userinfo' into 'develop'lambda3+27-23
2018-12-05 08:28Merge branch 'bugfix/408' into 'develop'lambda2+13-0
2018-12-04 19:00Merge branch 'optional-retry-queue' into 'develop'kaniini1+9-1
2018-12-04 18:41Merge branch 'feature/integration_tesla' into 'develop'kaniini37+1067-923
2018-12-04 18:36Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'lambda1+1-1
2018-12-03 16:31Merge branch 'fix/parse-user-bio' into 'develop'lambda7+64-20
2018-12-03 16:14Merge branch 'fix-media-proxy-defaults' into 'develop'lambda1+2-2
2018-12-03 06:03Merge branch 'update-pleroma-frontend' into 'develop'kaniini14+60-58
2018-12-02 23:07Merge branch 'user_info_fixes_again' into 'develop'Haelwenn4+11-3
2018-12-01 22:11Merge branch 'validate-user-info' into 'develop'kaniini46+634-405
2018-12-01 15:17Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'lambda1+5-6
2018-12-01 03:09Merge branch 'feature/anonymize-filenames' into 'develop'kaniini2+24-0
2018-11-30 18:15Merge branch 'feature/reverse-proxy' into 'develop'kaniini31+1217-423
2018-11-30 17:57Merge branch 'config-delete' into 'develop'lambda2+29-0
2018-11-30 17:56Merge branch 'supervisor-order' into 'develop'lambda2+42-35
2018-11-30 04:36Merge branch 'bugfix/server-true-in-prod' into 'develop'kaniini1+0-1
2018-11-29 09:34Merge branch 'enable-ci-cache' into 'develop'lambda1+5-0
2018-11-28 21:10Merge branch 'fix-list-stream-privacy' into 'develop'lambda2+110-2
2018-11-27 23:20Merge branch 'revert-02e43d44' into 'develop'kaniini1+0-2
2018-11-27 22:59Merge branch 'chore/mix-lock-update' into 'develop'kaniini1+2-0
2018-11-27 17:10Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'kaniini1+1-1
2018-11-27 16:55Merge branch 'ogg-theora-detection' into 'develop'kaniini1+7-1
2018-11-27 00:12Merge branch 'feature/mrf-user-allowlist' into 'develop'Haelwenn3+42-0
2018-11-26 23:59Merge branch 'fix/pleromafe-title' into 'develop'kaniini1+3-1
2018-11-26 22:24Merge branch 'bugfix/csp-no-https' into 'develop'kaniini1+5-1
2018-11-26 19:56Merge branch 'add-manifest-src-to-csp' into 'develop'Haelwenn1+1-0
2018-11-25 02:54Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'kaniini3+84-13
2018-11-22 00:28Merge branch 'feature/admin-api' into 'develop'kaniini9+412-14
2018-11-21 16:53Merge branch 'feature/improve-version' into 'develop'kaniini6+58-13
2018-11-20 22:25Merge branch 'runtime-fixes' into 'develop'kaniini9+26-22
2018-11-20 19:04Merge branch 'feature/retry-queue' into 'develop'Haelwenn5+150-25
2018-11-20 18:09Merge branch 'fix/mediaproxy-empty-url' into 'develop'kaniini2+117-2
2018-11-18 17:29Merge branch 'update/pleroma-fe-20181118' into 'develop'kaniini13+58-58
2018-11-17 22:43Merge branch 'security/as2-object-render-hardening' into 'develop'lambda2+52-1
2018-11-17 22:20Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop'lambda2+41-3
2018-11-17 21:52Merge branch 'security/spoofing-hardening' into 'develop'lambda7+195-17
2018-11-17 18:33Merge branch 'security/actor-containment' into 'develop'lambda7+107-7
2018-11-17 16:41Merge branch 'feature/uploader-mdii' into 'develop'kaniini2+30-0
2018-11-16 23:34Merge branch 'bugfix/dm-timeline-scope' into 'develop'kaniini2+10-3
2018-11-16 18:13Merge branch 'feature/pleromafe-usersearch' into 'develop'lambda5+42-2
2018-11-16 17:47Merge branch 'bugfix/csp-remove-form-action' into 'develop'kaniini1+0-1
2018-11-16 15:52Merge branch 'fix/test' into 'develop'lambda1+2-0
2018-11-14 18:17Merge branch 'fix-media-proxy-filename' into 'develop'lambda2+2-2
2018-11-14 16:10Merge branch 'update/pleroma-fe-20181114' into 'develop'kaniini16+73-59
2018-11-14 08:52Merge branch 'twitter-api-direct-messages' into 'develop'kaniini5+75-2
2018-11-13 15:15Merge branch 'media-proxy-safety' into 'develop'lambda3+46-5
2018-11-13 13:23Merge branch 'security/cookie-hardening' into 'develop'lambda1+6-1
2018-11-13 12:24Merge branch 'add-MIX_ENV-to-systemd-example' into 'develop'lambda1+1-0
2018-11-13 12:22Merge branch 'whalebird' into 'develop'lambda1+2-1
2018-11-12 17:08Merge branch 'twitter-api-null-display-name' into 'develop'scarlett2+13-2
2018-11-12 15:30Merge branch 'feature/csp-plug' into 'develop'kaniini10+155-52
2018-11-11 16:44Merge branch 'update-readme' into 'develop'Haelwenn1+3-1
2018-11-11 13:41Merge branch 'fix-list-streaming' into 'develop'kaniini1+7-3
2018-11-11 05:49Merge branch 'bugfix/corsplug-config' into 'develop'kaniini2+14-10
2018-11-11 05:34Merge branch 'bugfix/oauth-padding' into 'develop'kaniini1+3-0
2018-11-10 12:37Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'lambda3+71-1
2018-11-10 12:25Merge branch 'feature/documentation' into 'develop'kaniini17+198-137
2018-11-10 11:50Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'kaniini3+46-4
2018-11-10 11:37Merge branch 'bugfix/local-jsonld-context' into 'develop'kaniini3+28-3
2018-11-10 11:17Merge branch 'tests/prismo-url-map' into 'develop'kaniini4+83-0
2018-11-09 16:00Merge branch 'bugfix/no-cc-mentions' into 'develop'lambda7+204-38
2018-11-08 17:42Merge branch 'feature/jsonld-context-cleanup' into 'develop'kaniini2+2-13
2018-11-08 16:23Merge branch 'small-jsonld-refactor' into 'develop'lambda4+9-22
2018-11-07 22:33Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'kaniini5+116-0
2018-11-07 22:32Merge branch 'runtime-config' into 'develop'kaniini18+191-163
2018-11-07 16:04Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'lambda1+6-0
2018-11-06 21:24Merge branch 'patch-2' into 'develop'kaniini1+0-1
2018-11-06 16:18Merge branch 'unify-mastodon-oauth' into 'develop'kaniini4+52-49
2018-11-06 15:35Merge branch 'runtime-router' into 'develop'kaniini11+183-35
2018-11-06 15:09Merge branch 'remove-config-agent' into 'develop'lambda7+61-26
2018-11-06 07:37Merge branch 'use-the-same-example-domain-and-use-it-as-variable' into 'develop'kaniini3+36-24
2018-11-06 07:33Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'kaniini1+1-1
2018-11-05 18:40Merge branch 'runtime-emojis' into 'develop'lambda5+205-126
2018-11-04 03:09Merge branch 'tests-for-emtpy-content' into 'develop'kaniini1+18-0
2018-11-03 15:36Merge branch 'feature/cors-again' into 'develop'kaniini3+4-1
2018-11-03 13:54Merge branch 'bugfix/harden_status_output' into 'develop'Haelwenn1+4-4
2018-11-03 12:40Merge branch 'hashtag-search-case-sensitivity-test' into 'develop'lambda1+11-2
2018-11-02 20:05Merge branch 'fix_hashtag_search' into 'develop'lambda1+1-0
2018-11-02 18:55Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'lambda2+17-0
2018-11-01 14:14Merge branch 'hotfix/prismo-twitterapi' into 'develop'Haelwenn1+1-1
2018-11-01 10:48Merge branch 'feature/as2-page-support' into 'develop'kaniini4+4-4
2018-11-01 09:31Merge branch 'bugfix/filter-id' into 'develop'kaniini3+110-11
2018-11-01 09:10Merge branch 'feature/relay-tests' into 'develop'kaniini9+125-8
2018-11-01 09:05Merge branch 'bugfix/prismo.news_article_url' into 'develop'Haelwenn2+23-1
2018-11-01 08:51Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini7+59-15
2018-11-01 07:43Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini4+41-5
2018-11-01 05:58Merge branch 'bugfix/caching-activity-delete' into 'develop'Haelwenn1+2-1
2018-10-31 22:36Merge branch 'bugfix/allow-self-like' into 'develop'kaniini1+0-2
2018-10-30 23:22Merge branch 'allow-abbr' into 'develop'kaniini1+2-0
2018-10-30 20:30Merge branch 'reactivate' into 'develop'kaniini5+20-5
2018-10-29 20:14Merge branch 'feature/upload-limits' into 'develop'kaniini6+103-56
2018-10-29 18:07Merge branch 'feature/s3-force-media-proxy' into 'develop'kaniini3+17-4
2018-10-29 17:33Merge branch 'bugfix/mediaproxy-leaks-2-electric-boogaloo' into 'develop'kaniini1+2-0
2018-10-29 15:28Merge branch 'bugfix/mediaproxy-leaks' into 'develop'kaniini2+5-4
2018-10-28 19:54Merge branch 'feature/unsubscribe-user-task' into 'develop'kaniini1+32-0
2018-10-28 05:52Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'kaniini1+3-2
2018-10-28 05:49Merge branch 'psql-setup-cleanup' into 'develop'kaniini1+2-5
2018-10-26 19:03Merge branch 'update-pleroma-frontend' into 'develop'kaniini15+76-56
2018-10-26 06:45Merge branch 'feature/broken-thread-filtering' into 'develop'kaniini4+85-1
2018-10-26 06:39Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'kaniini1+1-1
2018-10-26 03:14Merge branch 'bugfix/fd-exhaustion' into 'develop'kaniini1+2-1
2018-10-26 01:36Merge branch 'bugfix/unshared-inbox-check' into 'develop'kaniini1+5-0
2018-10-25 23:49Merge branch 'feature/nodeinfo-frontend-config' into 'develop'kaniini1+20-4
2018-10-25 18:24Merge branch 'finmoji-optional' into 'develop'kaniini2+10-3
2018-10-25 05:30Merge branch 'bugfix/user-inbox-bcc' into 'develop'kaniini4+74-3
2018-10-25 04:38Merge branch 'bugfix/ap-uri-user-search' into 'develop'kaniini1+2-0
2018-10-25 04:35Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'Haelwenn2+30-6
2018-10-25 04:16Merge branch 'feature/add-in-reply-to-profileurl' into 'develop'kaniini5+20-14
2018-10-25 03:11Merge branch 'feature/in-reply-to-screen-name' into 'develop'kaniini5+28-0
2018-10-25 00:16Merge branch 'update-pleroma-frontend' into 'develop'kaniini14+59-56
2018-10-25 00:15Merge branch 'security/add-security-directives-to-systemd-example' into 'develop'kaniini1+10-0
2018-10-23 00:56Merge branch 'bugfix/html-scrub-comments' into 'develop'kaniini1+2-4
2018-10-23 00:50Merge branch 'new-frontend-options' into 'develop'kaniini2+6-2
2018-10-20 10:14Merge branch 'pleroma-list-belongs' into 'develop'eal4+46-0
2018-10-18 14:36Merge branch 'bugfix/html-scrub-schemes' into 'develop'kaniini3+34-31
2018-10-17 19:33Merge branch 'bugfix/osada-mention' into 'develop'kaniini5+153-1
2018-10-17 04:24Merge branch 'import-maybe-direct-follow' into 'develop'Haelwenn1+1-1
2018-10-14 20:42Merge branch 'feature/markdown-enable-tags' into 'develop'kaniini1+1-0
2018-10-14 19:29Merge branch 'security/clear-oauth-with-password' into 'develop'kaniini5+77-2
2018-10-11 10:56Merge branch 'security/fix-local-locked-accounts' into 'develop'kaniini2+19-1
2018-10-10 08:00Merge branch 'bugfix/length-enforce-subjects' into 'develop'kaniini1+2-1
2018-10-07 01:34Merge branch 'feature/mrf-transparency-opt-out' into 'develop'Haelwenn2+19-14
2018-10-07 01:16Merge branch 'security/follow-always-async' into 'develop'kaniini7+53-32
2018-10-07 01:10Merge branch 'patch-2' into 'develop'kaniini1+1-1
2018-10-07 01:09Merge branch 'update-pleroma-frontend' into 'develop'kaniini13+55-55
2018-10-05 21:17Merge branch 'revert-d31bbb1c' into 'develop'kaniini10+93-9
2018-10-05 20:41Merge branch 'feature/nodeinfo_federation_info' into 'develop'kaniini1+29-1
2018-09-30 05:32Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'kaniini1+1-1
2018-09-28 19:20Merge branch 'bugfix/magnet-links' into 'develop'Haelwenn2+11-10
2018-09-28 09:25Merge branch 'feature/twitter_api/fields' into 'develop'Haelwenn2+43-5
2018-09-28 00:51Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'kaniini1+3-0
2018-09-28 00:14Merge branch 'security/ap-unsigned-create' into 'develop'kaniini1+17-7
2018-09-27 20:25Merge branch 'bugfix/kroeg' into 'develop'kaniini8+185-47
2018-09-24 14:17Merge branch 'fix/s3/filenames-with-spaces' into 'develop'kaniini1+5-1
2018-09-22 05:08Merge branch 'update/pleroma-fe-20180922' into 'develop'kaniini13+55-55
2018-09-22 03:50Merge branch 'feature/html-scrub-policy-tests' into 'develop'kaniini2+82-0
2018-09-22 03:30Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'kaniini2+10-5
2018-09-22 03:08Merge branch 'feature/rich-text-optout-backend' into 'develop'kaniini10+68-26
2018-09-21 00:00Merge branch 'feature/dynamic-user-refresh' into 'develop'kaniini4+47-30
2018-09-20 23:54Merge branch 'task-204-on-options-request' into 'develop'kaniini1+8-0
2018-09-20 16:24Merge branch 'bump-mastofe-2018-09-20' into 'develop'Haelwenn3069+6204-3199
2018-09-20 14:54Merge branch 'feature/mastodon_api_2.5.0' into 'develop'Haelwenn6+15-8
2018-09-19 04:58twitter api: fix mimetype fallback when attachments use a URI instead of a URL objectWilliam Pitcock1+1-1
2018-09-19 04:57mastodon api: default attachment type to image if one is not presentWilliam Pitcock1+1-1
2018-09-19 03:53Merge branch 'fix/fake-filters' into 'develop'Haelwenn2+0-6
2018-09-16 02:25Merge branch 'feature/mediaproxy-inline-images' into 'develop'kaniini2+48-3
2018-09-16 01:31Merge branch 'feature/mrf-scrub' into 'develop'kaniini3+32-1
2018-09-16 01:09Merge branch 'update-pleroma-frontend' into 'develop'kaniini13+55-55
2018-09-16 01:05Merge branch 'feature/html-scrub-policy' into 'develop'kaniini9+162-22
2018-09-12 18:01Merge branch 'patch-3' into 'develop'Haelwenn2+3-2
2018-09-10 02:03Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'kaniini1+3-2
2018-09-10 01:22Merge branch 'refactor/mrf-pattern-matching' into 'develop'kaniini2+88-92
2018-09-09 23:09Merge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop'kaniini1+7-4
2018-09-09 13:06Merge branch 'bugfix/test-circular-reference' into 'develop'kaniini1+7-3
2018-09-09 12:15Merge branch 'update/pleroma-fe-20180909' into 'develop'kaniini20+61-65
2018-09-09 11:38Merge branch 'suggestion-api-restriction' into 'develop'kaniini3+4-1
2018-09-08 09:20Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'lambda21+595-240
2018-09-07 23:55Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'kaniini2+7-2
2018-09-07 23:55Merge branch 'improve-server-config-examples' into 'develop'kaniini4+65-23
2018-09-07 23:49Merge branch 'feature/custom_media_url' into 'develop'kaniini2+8-2
2018-09-07 23:47Merge branch 'fix/tusk' into 'develop'kaniini4+12-2
2018-09-06 06:50Merge branch 'fix/test-failure-due-to/306' into 'develop'lambda1+1-1
2018-09-05 18:20Merge branch 'fix/sign-in-with-toot' into 'develop'Haelwenn4+18-3
2018-09-03 15:00Merge branch 'feature/staff-discovery-api' into 'develop'kaniini4+39-0
2018-09-03 12:33Merge branch 'feature/mastodon_api_2.4.x' into 'develop'kaniini11+435-5
2018-09-03 12:32Merge branch 'report-chat-and-gopher-support' into 'develop'kaniini1+5-1
2018-09-03 05:54Merge branch 'nil-bio-emojis' into 'develop'kaniini2+13-1
2018-09-03 02:03Merge branch 'patch-2' into 'develop'Haelwenn1+2-0
2018-09-02 12:37Merge branch 'hotfix_broken_likes' into 'develop'kaniini2+29-1
2018-09-02 00:08Merge branch 'security/emoji-xss' into 'develop'kaniini4+19-3
2018-09-01 23:48Merge branch 'security/activitypub-spoofing' into 'develop'kaniini5+58-0
2018-09-01 21:47Merge branch 'feature/disable-config-management' into 'develop'Haelwenn2+35-25
2018-09-01 09:12Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'kaniini1+9-29
2018-09-01 08:48Merge branch 'verify-credentials-default-scope' into 'develop'kaniini3+28-3
2018-08-31 09:53Merge branch 'revert-a26d5e6b' into 'develop'lambda7+7-78
2018-08-31 04:50Merge branch 'bugfix/s3-configuration' into 'develop'kaniini1+3-1
2018-08-31 04:36Merge branch 'update/pleroma-fe-20180831' into 'develop'kaniini16+62-60
2018-08-31 04:06Merge branch 'update/pleroma-fe-config-20180831' into 'develop'kaniini2+4-0
2018-08-31 03:41Merge branch 'feature/rich-text' into 'develop'kaniini7+78-7
2018-08-30 23:06Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'kaniini1+7-0
2018-08-30 23:05Merge branch 'backendhack' into 'develop'kaniini10+227-109
2018-08-29 18:38migrations: add index creation migration and recipients_to/cc removal migrationWilliam Pitcock2+18-0
2018-08-29 18:38activity: drop recipients_to/recipients_cc fieldsWilliam Pitcock2+2-6
2018-08-29 18:33migrations: drop filler migrationWilliam Pitcock1+0-25
2018-08-29 18:32activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.William Pitcock1+4-4
2018-08-29 14:43Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop'Haelwenn1+8-2
2018-08-29 09:23streamer: contain list updates in the same way as we do with the database queryWilliam Pitcock1+19-2
2018-08-29 08:51mastodon api: use bounded AP object graph query to enforce containment of private statusesWilliam Pitcock1+7-2
2018-08-29 08:51activitypub: allow querying the activity/object graph bounded to a specific to/cc setWilliam Pitcock1+21-0
2018-08-29 08:50test: add testcase proving lists system does not leak non-public postsWilliam Pitcock1+24-0
2018-08-29 08:43migrations: add migration to fill in recipients_to/recipients_cc fieldsWilliam Pitcock1+25-0
2018-08-29 08:37activity: add recipients_to and recipients_cc fieldsWilliam Pitcock3+31-5
2018-08-28 18:54installation/pleroma.nginx: Add Content-Security-PolicyHaelwenn (lanodan) Monnier1+1-0
2018-08-28 00:29Merge branch 'feature/s3' into 'develop'kaniini5+70-2
2018-08-27 10:49Revert "enable scope options and such"William Pitcock1+2-2
2018-08-20 18:29enable scope options and suchWilliam Pitcock1+2-2
2018-08-14 17:07formattingWilliam Pitcock1+1-1
2018-08-06 11:20user: fix up notification last calculation [NOT related to upstream]William Pitcock1+6-1
2018-08-27 08:29Merge branch 'feature/relay' into 'develop'lambda13+202-7
2018-08-27 08:25Merge branch 'bugfix/announce-timeline-flooding' into 'develop'lambda3+44-7
2018-08-26 23:24Merge branch 'feature/emoji-in-local-users' into 'develop'kaniini5+61-2
2018-08-26 22:56Merge branch 'bugfix/formatting' into 'develop'kaniini1+5-2
2018-08-26 22:44Merge branch 'tests/notification-smoketests' into 'develop'kaniini1+121-0
2018-08-26 22:39Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'kaniini1+7-2
2018-08-26 21:35Merge branch 'login-with-email' into 'develop'kaniini1+10-2
2018-08-26 20:18Merge branch 'update-pleroma-frontend' into 'develop'kaniini36+60-1069
2018-08-26 20:16Merge branch 'improve-example-caddyfile' into 'develop'kaniini1+33-5
2018-08-26 20:16Merge branch 'remove-unused-settings' into 'develop'kaniini2+0-7
2018-08-25 00:20Merge branch 'feature/twitterapi-object-description' into 'develop'kaniini2+8-4
2018-08-24 22:00Merge branch 'update/pleroma-fe-20180824' into 'develop'kaniini17+59-58
2018-08-24 20:15Merge branch 'feature/tls-sni-support' into 'develop'kaniini1+24-1
2018-08-24 18:42Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'kaniini2+30-1
2018-08-24 18:27Merge branch 'config/fe-collapse-subject' into 'develop'kaniini2+5-2
2018-08-24 18:01Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"kaniini1+1-2
2018-08-24 17:40Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'kaniini1+2-1
2018-08-23 20:56Merge branch 'fix/suggestions-api-error-handling' into 'develop'kaniini1+8-1
2018-08-23 17:09Merge branch 'develop' into 'develop'Haelwenn1+22-0
2018-08-23 01:39Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'kaniini2+18-0
2018-08-22 10:09Run mix formatHaelwenn (lanodan) Monnier1+2-1
2018-08-21 23:47[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nilHaelwenn (lanodan) Monnier1+1-1
2018-08-21 23:46[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videosHaelwenn (lanodan) Monnier1+1-1
2018-08-21 16:58Merge branch 'feature/peertube_2' into 'develop'kaniini10+106-32
2018-08-21 16:56Merge branch 'sanitize-bio' into 'develop'kaniini2+3-2
2018-08-21 16:55Merge branch 'twitter-api-bios' into 'develop'kaniini4+25-16
2018-08-20 18:44Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'kaniini1+1-1
2018-08-20 18:17Merge branch 'update/pleroma-fe-20180821' into 'develop'kaniini13+23-23
2018-08-20 12:13Merge branch 'fix/redirect-on-user-fetch' into 'develop'eal1+1-1
2018-08-20 04:50Merge branch 'update/pleroma-fe-20180820' into 'develop'kaniini30+128-113
2018-08-18 18:24Merge branch 'update/pleroma-fe-20180818' into 'develop'kaniini17+58-58
2018-08-17 16:03Merge branch 'develop' into 'develop'kaniini1+1-1
2018-08-16 23:59Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'kaniini1+5-2
2018-08-16 23:35Merge branch 'bugfix/mix-lock' into 'develop'kaniini1+9-9
2018-08-16 15:45Merge branch 'patch-2' into 'develop'kaniini1+17-17
2018-08-16 15:41Merge branch 'dev-lanodan-url-regex' into 'develop'kaniini3+42-6
2018-08-16 15:38Merge branch 'mastofe/system-font' into 'develop'kaniini1+1-1
2018-08-16 15:20Merge branch 'bugfix/federation-kroeg' into 'develop'kaniini5+95-1
2018-08-16 15:19Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'kaniini3+48-7
2018-08-16 15:17Merge branch 'fix/normalize-file-extension' into 'develop'kaniini3+40-13
2018-08-15 07:47Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'lambda4+53-1
2018-08-12 17:42formattinglain1+4-3
2018-08-12 16:41Fix for elixir 1.7.lain1+2-2
2018-08-12 16:16update frontendlain30+102-79
2018-08-12 13:29Update Mastofe.lain192+363-1606
2018-08-12 12:04Merge branch 'feature/invites' into 'develop'lambda6+177-14
2018-08-12 10:55Merge branch 'fix/remote-follow-errormessage' into 'develop'lambda1+9-0
2018-08-12 10:55Merge branch 'bugfix/gopher-empty-lines' into 'develop'lambda1+2-2
2018-08-12 10:41Merge branch 'emoji-in-account-view' into 'develop'lambda4+78-4
2018-08-10 13:45Merge branch 'bugfix/fix-gopher-server-i' into 'develop'lambda1+1-1
2018-08-06 18:07Merge branch 'bugfix/duplicate-follow-requests' into 'develop'lambda1+1-0
2018-08-06 18:07Merge branch 'feature/camelcase-hashtags' into 'develop'lambda1+2-2
2018-08-01 10:37Merge branch 'bugfix/digest-legacy-compat' into 'develop'lambda1+5-1
2018-08-01 08:11Merge branch 'security/digest-signature-validation' into 'develop'lambda4+29-2
2018-07-25 07:16Merge branch 'feature/filter_exif' into 'develop'lambda5+35-2
2018-07-19 07:35Merge branch 'tests/plume' into 'develop'lambda5+47-13
2018-07-19 07:31Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'lambda2+38-6
2018-07-19 07:31Merge branch 'feature/fe-configuration' into 'develop'lambda4+36-3
2018-07-18 08:52Merge branch 'feature/media-description' into 'develop'lambda6+41-8
2018-07-12 16:48Merge branch 'feature/object-normalization' into 'develop'lambda12+28-34
2018-07-12 16:47Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'lambda1+6-5
2018-07-12 16:46Merge branch 'bugfix/activitypub-object-actor' into 'develop'lambda1+18-2
2018-07-12 16:45Merge branch 'feature/message-summary' into 'develop'lambda4+8-4
2018-07-12 05:59Merge branch 'feature/default-scope' into 'develop'lambda4+24-6
2018-07-12 05:58Merge branch 'feature/article-support' into 'develop'lambda6+58-22
2018-07-12 05:56Merge branch 'feature/auto-shortcodes' into 'develop'lambda2+24-1
2018-07-12 05:55Merge branch 'bugfix/status-url-field' into 'develop'lambda1+1-2
2018-07-12 05:54Merge branch 'bugfix/x509-public-key' into 'develop'lambda2+2-2
2018-06-27 12:48Merge branch 'features/initial-state_rights' into 'develop'lambda1+3-0
2018-06-25 08:45Merge branch 'fix/mutes.json-emptyarray' into 'develop'lambda3+25-0
2018-06-25 06:12Merge branch 'feature/configurable-blocks' into 'develop'lambda4+45-7
2018-06-24 13:28Merge branch 'feature/application-xml-mime' into 'develop'lambda1+1-0
2018-06-24 13:17Merge branch 'features/glitch-soc-frontend' into 'develop'lambda5+67-2
2018-06-21 07:09Merge branch 'feature/mrf-simple-accept-lists' into 'develop'lambda3+16-3
2018-06-19 09:50Merge branch 'features/column_media_streaming' into 'develop'lambda2+18-2
2018-06-19 09:42Merge branch 'bugfix/block-follow-relationships' into 'develop'lambda4+109-5
2018-06-19 05:15Merge branch 'feature/exclude-replies-filter' into 'develop'lambda2+18-0
2018-06-19 05:13Merge branch 'bugfix/as2-contentmap' into 'develop'lambda3+89-0
2018-06-17 10:33Merge branch 'patch-2' into 'develop'lambda1+2-0
2018-06-16 10:39Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'lambda3+99-3
2018-06-15 20:43Merge branch 'bugfix/mastofe_thread_render' into 'develop'eal2+4-4
2018-06-15 20:01Fix typolain1+1-1
2018-06-14 19:11Merge branch 'fix/missing-file-extension' into 'develop'lambda2+37-5
2018-06-14 13:55Merge branch 'fix/mp3-recognition' into 'develop'lambda1+3-0
2018-06-14 07:23Merge branch 'patch-2' into 'develop'lambda1+0-1
2018-06-14 07:20Merge branch 'bugfix/mrf-orphaning' into 'develop'lambda1+13-8
2018-06-14 07:19Merge branch 'feature/twitterapi-unrepeat' into 'develop'lambda9+63-16
2018-06-14 07:14Merge branch 'bugfix/oauth2-param-name' into 'develop'lambda1+13-1
2018-06-14 07:13Merge branch 'bugfix/oauth-password-with-email' into 'develop'lambda1+1-1
2018-06-14 07:12Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'lambda1+30-15
2018-06-13 07:18Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'lambda1+1-1
2018-06-13 07:02Merge branch 'bugfix/webfinger-refactoring' into 'develop'lambda1+6-24
2018-06-12 17:37update frontendlain18+60-58
2018-06-12 12:42set_moderator: ensureall applications are started.eal1+1-1
2018-06-12 12:11Merge branch 'patch-2' into 'develop'lambda1+0-0
2018-06-12 08:26Merge branch 'develop' into 'develop'lambda4+112-44
2018-06-12 07:19Merge branch 'feature/list-streaming' into 'develop'lambda6+56-3
2018-06-12 07:18Merge branch 'feature/locked-accounts-part-1' into 'develop'lambda12+474-11
2018-06-12 07:12Merge branch 'patch-2' into 'develop'lambda1+13-3
2018-06-11 19:59Merge branch 'fix/mix-task-caching' into 'develop'eal1+1-1
2018-06-11 11:19Merge branch 'feature/domain-blocks' into 'develop'lambda7+115-3
2018-06-08 11:10Merge branch 'users' into 'develop'lambda2+17-10
2018-06-08 11:08Merge branch 'feature/rejectnonpublic' into 'develop'lambda1+29-0
2018-06-08 06:02Merge branch 'mastopost' into 'develop'lambda1+10-1
2018-06-08 05:10Merge branch 'bugfix/locked-account-regression' into 'develop'lambda3+27-3
2018-06-07 14:44Merge branch 'feature/quarantine' into 'develop'lambda2+16-1
2018-06-07 14:42Merge branch 'import' into 'develop'lambda3+52-37
2018-06-06 16:44Merge branch 'bugfix/webfinger-xml-crash' into 'develop'lambda3+8-4
2018-06-06 08:27Merge branch 'fix/oauth-http-basic' into 'develop'lambda3+156-14
2018-06-05 21:18Merge branch 'fix/emoji-picker' into 'develop'eal1+1-0
2018-06-03 19:52Merge branch 'develop' into 'develop'lambda1+18-0
2018-06-03 19:04Better error handling for OstatusController.lain2+108-37
2018-06-03 17:58Better error handling for ActivityPubControllerlain3+11-8
2018-06-03 17:28Better error handling for MastodonApiController.lain2+24-4
2018-06-03 17:11Better error handling in TwitterApiController.lain5+54-14
2018-06-02 17:45Revert "Update Mastofe."lain182+1580-360
2018-06-02 14:11Update Mastofe.lain182+360-1580
2018-06-02 13:39Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+11-5
2018-05-30 18:00Fix url guessing attacks.lain4+74-4
2018-05-30 12:31Merge branch 'fix/dm-timeline-activities' into 'develop'eal1+3-1
2018-05-29 10:58Merge branch 'patch-3' into 'develop'lambda1+1-0
2018-05-29 10:58Merge branch 'fix/link-headers' into 'develop'lambda1+32-10
2018-05-28 10:39Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+6-4
2018-05-28 10:38Only return certain activities in TwitterAPI mentions.lain1+5-0
2018-05-26 19:06Fix user topic streaming.lain1+1-1
2018-05-26 14:26Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into developlain8+158-8
2018-05-26 13:20There are no symbols in JSON.lain1+1-1
2018-05-26 13:15Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into developlain13+327-30
2018-05-26 09:50Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'lambda2+9-2
2018-05-25 07:15Merge branch 'feature/blocks-deny-refollow' into 'develop'lambda2+29-15
2018-05-25 07:13Merge branch 'bugfix/follow-query-overhead' into 'develop'lambda2+15-5
2018-05-24 20:22Merge branch 'feature/lists' into 'develop'lambda8+439-2
2018-05-24 19:52Merge branch 'feature/incoming-remote-unfollow' into 'develop'lambda18+475-62
2018-05-24 17:25update frontendlain9+17-17
2018-05-24 17:16Merge branch 'feature/change-password' into 'develop'lambda5+106-6
2018-05-24 10:44More efficient queries.lain2+5-3
2018-05-23 15:25Don't save double tags in AP objects we createlain2+14-1
2018-05-23 09:03Merge branch 'feature/deps-migration' into 'develop'lambda10+42-49
2018-05-22 14:26Repair some access-control headers required for third-party webclientsNiklas Poslovski1+2-2
2018-05-22 14:02Merge branch 'nipos-develop' into developlain1+1-0
2018-05-21 21:20Merge branch 'feature/clarify-http-sig-error' into 'develop'lambda1+1-1
2018-05-21 13:58Merge branch 'bugfix/webfinger-statusnet' into 'develop'lambda4+18-1
2018-05-21 10:32Actually fix missing alias.lain1+1-1
2018-05-21 10:09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+1-1
2018-05-21 10:09Add missing alias.lain1+1-0
2018-05-20 17:26More fixes.lain1+2-1
2018-05-20 17:22Fix specs.lain1+2-1
2018-05-20 16:29update frontendlain38+284-36
2018-05-20 16:01Return visilility in twitter api, too.lain2+5-3
2018-05-20 14:15Return private / direct posts on user timelines, too.lain4+60-25
2018-05-20 11:24update frontendlain9+17-17
2018-05-20 10:57Merge branch 'feature/account-deletion' into 'develop'lambda5+66-0
2018-05-20 10:55Merge branch 'feature/undo-like-federation' into 'develop'lambda9+125-10
2018-05-19 09:31Merge branch 'feature/webfinger-mime-ld-json' into 'develop'lambda4+29-0
2018-05-19 09:30Merge branch 'feature/remote-user-deactivation' into 'develop'lambda2+27-0
2018-05-19 09:27Fix linking problem.lain2+8-0
2018-05-19 09:17Merge branch 'bugfix/hubzilla-compat' into 'develop'lambda11+126-14
2018-05-16 15:55Fix User search.lain5+54-13
2018-05-16 11:02update frontendlain20+62-57
2018-05-13 11:02Fix format.lain1+4-1
2018-05-13 10:54Modify sort index for activities.lain1+9-0
2018-05-13 10:38Revert "Remove 'unlisted' handling for now."lain2+1-3
2018-05-13 10:07Remove 'unlisted' handling for now.lain2+3-1
2018-05-13 09:59Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain14+280-26
2018-05-13 09:58Unlisted fetching: Reverse logiclain1+1-1
2018-05-13 09:19Merge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into developlain2+23-1
2018-05-13 08:39Merge branch 'patch-2' into 'develop'lambda1+10-0
2018-05-13 08:34Merge branch 'feld-varnish' into 'develop'lambda1+2-3
2018-05-13 08:24Merge branch 'feature/chain-policies' into 'develop'lambda5+33-3
2018-05-13 08:16Merge branch 'no-self-notification' into 'develop'lambda3+12-2
2018-05-11 07:18Merge branch 'patch-1' into 'develop'lambda1+0-1
2018-05-07 16:11More warning fixes.lain6+15-7
2018-05-06 18:43Merge branch 'feld-varnish' into 'develop'lambda1+2-8
2018-05-06 18:42Merge branch 'feld-warnings' into 'develop'lambda30+97-107
2018-05-06 18:41Merge branch 'fix/unsafe-variables' into 'develop'lambda5+50-35
2018-05-05 11:41Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+9-0
2018-05-05 11:40Streamer: Don't send out stream events for blocked users.lain2+83-14
2018-05-05 11:40Unify wss uri generation.lain1+1-1
2018-05-05 09:15Idempotency: Use special cache, keep for 6 hours.lain3+30-7
2018-05-04 21:16Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+69-0
2018-05-04 21:15update frontendlain1+2-2
2018-05-04 19:15Don't expire idempotency cache for five minutes.lain2+6-0
2018-05-04 18:30MastodonAPI: Support idempotency key.lain2+32-3
2018-04-29 14:56update frontendlain10+20-19
2018-04-29 09:28Fix format.lain2+10-12
2018-04-29 09:26Merge branch 'patch-bio' into 'develop'lambda2+18-1
2018-04-28 14:10Insert object after being rewritten.lain1+5-3
2018-04-28 13:49Merge branch 'fix/blocked-user-boosts' into 'develop'lambda2+23-1
2018-04-27 05:49Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'lambda1+2-1
2018-04-26 05:07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+1-1
2018-04-26 05:06Resurrect instance specific panel.lain1+1-1
2018-04-25 14:10Optionally deactivate public timelines.lain2+22-13
2018-04-25 13:41Align local bio limits to remote limit.lain1+1-1
2018-04-24 19:26Merge branch 'gitignore' into 'develop'lambda1+5-0
2018-04-24 19:25Fix formatting.lain1+12-4
2018-04-24 17:21Merge branch 'feature/message-rewrite-facility' into 'develop'lambda5+93-2
2018-04-24 12:28Update .gitlab-ci.ymllambda1+1-0
2018-04-24 12:25Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into developlain3+31-1
2018-04-24 05:54Merge branch 'favicon_tag' into 'develop'lambda1+1-1
2018-04-23 17:23update frontendlain9+17-17
2018-04-23 17:09update frontendlain10+18-18
2018-04-22 08:01Small cleanup.lain3+9-3
2018-04-22 07:56Merge branch 'develop' into fix/note-count-not-updatinglain2+19-9
2018-04-21 09:58Update note count in ActivityPub.create.eal3+15-16
2018-04-21 08:05Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'lambda2+3-2
2018-04-21 08:05Merge branch 'readme-update' into 'develop'lambda1+10-4
2018-04-21 07:59Merge branch 'nginx-certbot-doc' into 'develop'lambda1+10-1
2018-04-21 07:43Formatting fixes.lain6+24-11
2018-04-21 07:34add formatterlain1+3-0
2018-04-21 07:30.lain1+1-3
2018-04-21 07:28.lain1+1-0
2018-04-21 07:27..lain1+1-0
2018-04-21 07:24Update CI.lain1+1-1
2018-04-21 07:22Make search use id index too.lain1+1-1
2018-04-20 11:10Formatting.lain4+48-22
2018-04-20 11:09Add format checking to CI.lain1+6-0
2018-04-19 19:44Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain6+194-3
2018-04-19 19:44fix againlain1+1-1
2018-04-19 11:04fix againlain1+1-1
2018-04-19 10:50Fix generate configlain1+0-8
2018-04-19 10:29Revert "Ask for proxy URL if proxy enabled."eal2+1-9
2018-04-19 07:41Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'lambda1+1-0
2018-04-18 14:52rm_user: also ensure that cache is running.eal1+1-1
2018-04-18 14:41Merge branch 'fix/rm-user-task' into 'develop'lambda1+2-2
2018-04-18 11:26Merge branch 'fix/login-with-username-or-email' into 'develop'lambda5+11-4
2018-04-17 09:09update frontendlain29+192-76
2018-04-13 09:46Update README.mdlambda1+4-0
2018-04-13 07:43Merge branch 'mix_task_rm_user' into 'develop'lambda1+14-0
2018-04-11 20:58Merge branch 'develop' into 'develop'lambda2+19-3
2018-04-11 20:03update frontendlain17+57-57
2018-04-11 19:55update frontendlain31+131-110
2018-04-11 14:27Merge branch 'feld-hackneyupdate' into 'develop'lambda2+9-8
2018-04-10 19:05Fix register_user task.lain1+1-1
2018-04-10 16:38Order masto searches by date.lain1+34-30
2018-04-10 14:46Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'lambda71+404-111
2018-04-10 14:45Merge branch 'feld-varnish' into 'develop'lambda1+0-4
2018-04-10 08:14Merge branch 'patch-1' into 'develop'lambda1+24-25
2018-04-09 08:42Merge branch 'bugfix/user-search-with-at-sign' into 'develop'lambda1+3-0
2018-04-09 08:41Merge branch 'develop' into 'develop'lambda1+24-11
2018-04-09 06:58Merge branch 'develop' into 'develop'lambda1+27-0
2018-04-08 06:02Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'lambda2+3-1
2018-04-08 06:01Merge branch 'fix/persisted-mastofe-settings' into 'develop'lambda2+19-1
2018-04-07 14:41Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+15-9
2018-04-07 14:40Only search in public data for now.lain3+9-0
2018-04-07 14:35Update Readme.lain1+9-0
2018-04-06 14:35Accept port number in urls.lain2+8-1
2018-04-05 11:59MastodonAPI search: return only create activities.lain1+4-0
2018-04-05 11:15Delete Caddyfilelambda1+0-5
2018-04-05 10:54Merge branch 'develop' into 'develop'lambda2+2-2
2018-04-04 13:23TwitterAPI: Don't put follows into the public tls.lain1+2-2
2018-04-04 09:29Handle + in links.lain2+8-1
2018-04-03 16:34Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain89+142-133
2018-04-03 16:32Use user url in mention if we have it.lain2+11-3
2018-04-02 14:27Load all users at once in timelines.lain5+94-30
2018-04-02 13:29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+5-1
2018-04-02 13:28Use context_ids directly if we have them.lain3+6-12
2018-04-02 13:17Generates contexts and ids on insertion time.lain3+42-4
2018-04-02 12:46Pre-fetch conversation ids.lain2+63-2
2018-04-02 11:15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain298+1709-139309
2018-04-02 11:13Fail faster.lain2+62-11
2018-04-02 11:13Fix some test stuff.lain2+14-10
2018-04-02 11:12Add mock.lain2+4-1
2018-04-01 12:58Respond to proper ActivityPub type.lain1+2-1
2018-03-31 19:14Use correct linefeed.lain1+1-1
2018-03-31 19:11Small fix.lain1+1-1
2018-03-31 19:10Fix typo.lain1+1-1
2018-03-31 19:09Modify newlines.lain1+1-1
2018-03-31 19:02Remove inspect.lain1+0-1
2018-03-31 19:00Proper info.lain1+7-2
2018-03-31 18:48No tabs.lain1+1-0
2018-03-31 18:02Don't fetch anything except ap_id for follower / following collections.lain3+119-19
2018-03-31 16:22Gopher: Add like / repeat count.lain1+6-1
2018-03-31 15:51Add gopher server.lain3+148-0
2018-03-31 10:52update frontendlain12+17-17
2018-03-30 14:50Remove unused ActivityRepresenter module.lain4+25-290
2018-03-30 13:49TwitterApiController: Use ActivityView.lain3+56-21
2018-03-30 13:32TwApi ActivityView: Add delete activities.lain2+46-1
2018-03-30 13:17TwApi ActivityView: Add follows.lain2+52-1
2018-03-30 13:01Format the code.lain111+5013-2871
2018-03-30 12:48Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+9-2
2018-03-30 12:46TwApi ActivityView: Add announces.lain2+59-0
2018-03-30 11:49TwApi ActivityView: Add Like rendering.lain2+66-2
2018-03-30 10:57Add ActivityViewTest.lain1+49-0
2018-03-30 10:19Fix TwApi reply visibility.lain1+2-2
2018-03-28 14:03Clean up prod.exs a bit.lain1+1-5
2018-03-28 07:56Don't go through all available emoji.lain3+8-10
2018-03-27 20:24Add basic activity view.lain3+79-7
2018-03-27 18:09Return version in instance endpoint, set version to 0.9.0.lain2+3-3
2018-03-27 17:59Fix migration.lain1+8-0
2018-03-27 17:48Drop index for 'local', it confuses the query planner.lain1+7-0
2018-03-27 16:18Reduce OP fetching queries.lain3+46-11
2018-03-27 15:43Don't try to fetch OP if none is there.lain2+13-1
2018-03-27 14:45More Jason changes.lain8+36-36
2018-03-27 14:10Add missing types.lain1+1-0
2018-03-27 14:09Switch to Jason for json handling.lain4+11-1
2018-03-27 13:22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+3-3
2018-03-27 13:22Update dependencies.lain1+39-37
2018-03-26 08:31Speed up follower query.lain2+2-1
2018-03-26 07:53Add index for user follower address.lain1+8-0
2018-03-26 07:51Fix atom feed pagination.lain1+4-1
2018-03-25 17:34Fix follower collection id.lain1+1-1
2018-03-25 15:08Return "audio" info in mastodon api.lain1+1-0
2018-03-25 13:40Merge branch 'feature/oauth-token-password' into 'develop'lambda1+21-0
2018-03-24 21:49Merge branch 'bugfix/activitypub-hashtags' into 'develop'lambda3+89-0
2018-03-24 14:09Fix tests.lain2+9-2
2018-03-24 14:02Unify user fetching.lain1+2-1
2018-03-24 13:45Fetch the same data from json webfinger as from xml webfinger.lain4+32-3
2018-03-24 10:03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+5-22
2018-03-24 10:03Fix hashtags.lain4+115-58
2018-03-23 18:52Strip html from emoji stuff.lain2+7-1
2018-03-23 15:07For outgoing objects, fake mastodon style ap id for ostatus.lain2+24-0
2018-03-22 11:48Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpointslain10+133-52
2018-03-22 05:23activitypub: add outbox endpointWilliam Pitcock3+63-0
2018-03-22 04:47activitypub: add restrict_limitWilliam Pitcock1+7-0
2018-03-21 17:23activitypub: implement following/followers endpointsWilliam Pitcock4+118-15
2018-03-21 06:12Fetch relayed messages from source while we don't have linked data sigs.lain1+2-1
2018-03-20 06:00Merge branch 'feld-varnish' into 'develop'lambda1+132-0
2018-03-20 05:58Merge branch 'patch-README' into 'develop'lambda1+1-0
2018-03-20 05:58Merge branch 'feld-mastoweb5000' into 'develop'lambda3+3-5
2018-03-20 05:57Merge branch 'feld-Logger' into 'develop'lambda12+22-22
2018-03-19 16:42Use connection pools.lain5+9-5
2018-03-19 09:28Only fetch if it's http.lain2+6-3
2018-03-16 05:30mastodon api: fix rendering the mentions JSONWilliam Pitcock1+2-2
2018-03-16 05:30mastodon api tests: invalidate user cache prior to importing a test replyWilliam Pitcock1+3-0
2018-03-13 17:46activitypub transmogrifier: rewrite non-http URLs using the object's external URLWilliam Pitcock2+33-0
2018-03-13 17:33Do more jobs by default.lain1+1-1
2018-03-13 17:32Only push to still valid websub subscriptions.lain1+2-1
2018-03-13 13:59Merge branch 'andarna/pleroma-develop' into developlain2+4-0
2018-03-13 07:05Fix Mastodon emojis.lain1+37-0
2018-03-12 10:30Ignore incoming empty chat messages.lain1+8-5
2018-03-11 13:47Don't validate on missing public key.lain3+9-0
2018-03-11 13:43Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+22-6
2018-03-11 13:37More signature debugging.lain4+73-27
2018-03-08 18:50update frontendlain9+16-16
2018-03-08 18:07Restrict activity fixing more.lain1+2-1
2018-03-08 18:00Update pleroma.nginxlambda1+2-0
2018-03-08 12:29Merge branch 'feature/activitypub' into 'develop'lambda79+3493-169
2018-03-05 08:27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+6-5
2018-03-05 08:26Add way to disable federation.lain3+27-14
2018-02-21 17:33Moderator READMElain1+6-0
2018-02-21 17:33Add moderator task.lain1+27-0
2018-02-21 17:24Add password reset task.lain2+25-0
2018-02-20 17:54Allow moderators to delete posts.lain1+1-1
2018-02-20 17:44Add moderator function.lain2+22-5
2018-02-12 09:23Add missing support file.lain1+6-0
2018-02-12 09:13Make test output easier to read.lain19+82-86
2018-02-12 08:33Fix some test warnings.lain2+7-7
2018-02-12 07:15Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into developlain3+19-2
2018-02-11 19:58update frontendlain1+4-0
2018-02-11 19:55update frontendlain14+53-52
2018-02-09 16:14update frontendRoger Braun14+21-23
2018-02-09 12:43UtilController: Fix statusnet config api compatibility.Roger Braun1+1-1
2018-02-09 08:57Merge branch 'develop' into 'develop'lambda3+20-0
2018-02-08 18:18Merge branch 'fix/config-disable-chat' into 'develop'lambda4+14-3
2018-02-08 15:03Fix compile errors on 1.4.5Roger Braun2+0-2
2018-02-07 12:44update frontendRoger Braun18+57-57
2018-02-05 22:06Update required Elixir version in READMEeal1+1-1
2018-02-05 21:57Merge branch 'fix/no-image-upload-filetype' into 'develop'eal1+1-1
2018-02-03 13:05Merge branch 'move-backend-images' into 'develop'lambda6+15-15
2018-02-02 16:14Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun11+63-15
2018-02-02 16:14Update frontend.Roger Braun14+23-21
2018-01-30 11:21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun5+36-2
2018-01-30 11:20Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into developRoger Braun3+6-2
2018-01-29 16:45Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun31+31-0
2018-01-29 16:44Fix incoming Pleroma CWs. Closes #96.Roger Braun1+1-2
2018-01-26 14:12Update frontend.Roger Braun17+56-56
2018-01-26 13:31Fix config.Roger Braun1+1-1
2018-01-26 13:28Update frontend.Roger Braun14+23-21
2018-01-20 17:38Stats: Make less crashy and improve query.Roger Braun1+7-8
2018-01-20 15:02Merge branch 'feature/remote-follow' into 'develop'lambda7+98-1
2018-01-18 01:42Revert "Add remote follow pages."eal5+0-92
2018-01-18 01:42Revert "Add remote follow path to webfinger."eal2+1-6
2018-01-17 22:22Add remote follow pages.eal5+92-0
2018-01-16 00:17Add remote follow path to webfinger.eal2+6-1
2018-01-16 14:18Merge branch 'fix/background-profile-fetch' into 'develop'lambda2+7-5
2018-01-15 20:26Merge branch 'default-pictures' into 'develop'eal8+24-20
2018-01-15 17:44Merge branch 'prod.exs' into 'develop'eal1+6-3
2018-01-15 17:26Merge branch 'fix/pleroma.nginx' into 'develop'eal1+0-2
2018-01-15 08:04Merge branch 'stats-daemon' into 'develop'lambda5+54-7
2018-01-12 20:57Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'eal2+15-1
2017-12-23 14:40Unlink follow import process from the one processing request.eal1+1-1
2017-12-22 12:07Merge branch 'media-proxy-fix-encoding' into 'develop'lambda1+0-1
2017-12-20 14:22Merge branch 'media-proxy' into 'develop'lambda10+152-11
2017-12-19 15:15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developLain Iwakura3+39-7
2017-12-19 15:15Fix timelines in subway tooter.Lain Iwakura3+7-2
2017-12-18 15:56MastoAPI: Fix always-sensitive bugs.Lain Iwakura3+5-5
2017-12-18 15:16Send out salmons before websub.Lain Iwakura1+3-3
2017-12-18 10:59Merge branch 'feature/follow-import' into 'develop'lambda2+27-1
2017-12-11 19:01Fix some more tests.eal2+5-3
2017-12-11 16:41Fix tests.eal2+4-4
2017-12-11 16:21Merge branch 'fix/tootdon-mentions' into 'develop'lambda1+1-1
2017-12-09 09:10Merge branch 'feature/user_deletion' into developRoger Braun9+175-26
2017-12-08 12:34Merge branch 'fix/linkify' into 'develop'lambda3+22-3
2017-12-08 12:32Merge branch 'fix/mastoapi-attachment-linking' into 'develop'lambda3+8-3
2017-12-08 12:31Merge branch 'postgresetup' into 'develop'lambda4+18-7
2017-12-07 18:07Add websocket upgrade to example nginx config.eal1+3-0
2017-12-05 11:27Merge branch 'feature/chat' into 'develop'lambda23+124-60
2017-12-05 09:10Merge branch 'fix/odd-passwords' into 'develop'lambda1+1-1
2017-12-03 12:34OStatus: Add user bio as summary fieldRoger Braun2+2-0
2017-11-30 14:00Add count index for local users.Lain Iwakura1+7-0
2017-11-30 13:59MastodonAPI: Add proper user count.Lain Iwakura3+22-1
2017-11-28 16:46Merge branch 'salmon-native-keys' into 'develop'lambda1+22-9
2017-11-27 16:24Return xml notice at /notice path.Lain Iwakura3+24-0
2017-11-25 23:10Merge branch 'patch-1' into 'develop'eal1+1-1
2017-11-24 07:37Update frontend.Roger Braun13+21-21
2017-11-23 15:41More readme updates.Lain Iwakura1+7-1
2017-11-23 15:35Add mix deps.get back to readme.Lain Iwakura1+2-0
2017-11-23 15:22Add configuration generation tool, update readme.Lain Iwakura4+40-51
2017-11-23 11:06MastodonUI login: Show error message on error.Roger Braun2+8-1
2017-11-22 15:10untoot.Roger Braun1+2-3
2017-11-22 14:19Merge branch 'develop' into 'develop'lambda2+150-0
2017-11-22 13:42Update README.mdlambda1+1-1
2017-11-22 11:19Update frontend.Roger Braun17+55-55
2017-11-21 23:09Merge branch 'fix/self-follow' into 'develop'eal2+2-0
2017-11-20 20:55Merge branch 'fix/mastoapi-attachment-count' into 'develop'eal1+1-1
2017-11-20 17:16Make /api/friends/ids test deterministic.eal1+2-2
2017-11-20 16:53Treat internal emoji like external.Roger Braun4+12-9
2017-11-20 07:54MastoAPI: Add max_toot_chars.Roger Braun1+2-1
2017-11-20 07:27Merge branch 'fix/self-follow' into 'develop'lambda6+26-14
2017-11-19 14:10Federator Queue: Add seperate in/out queues.Roger Braun1+24-9
2017-11-19 12:47MastodonAPI: Streaming fixes.Roger Braun1+13-7
2017-11-19 12:31Update frontend.Roger Braun21+67-67
2017-11-19 12:23MastodonAPI: Add sign out.Roger Braun2+11-4
2017-11-19 12:07Fix flakey test.Roger Braun1+1-1
2017-11-19 11:59MastoAPI: Only return create activties in contexts.Roger Braun1+1-0
2017-11-19 11:50Merge branch 'feature/fix-warnings' into 'develop'lambda26+89-94
2017-11-18 15:58Merge branch 'formatting-fixes' into 'develop'lambda4+9-7
2017-11-18 14:38Merge branch 'fix/mastofe-login-redirect' into 'develop'eal1+1-1
2017-11-18 14:34Merge branch 'sensitive-content-bit' into 'develop'eal3+14-2
2017-11-18 11:22Don't start streamer during tests.Roger Braun1+1-1
2017-11-16 15:49MastoAPI: Implement all streaming functions.Roger Braun7+73-6
2017-11-16 12:48MastodonAPI: Stream fixes.Roger Braun3+13-3
2017-11-16 12:01Merge branch 'feature/masto-styled-login-page' into 'develop'lambda2+69-7
2017-11-16 08:40Add custom emoji to Mastodon UI initial state.Roger Braun1+8-3
2017-11-16 08:35Add mastodon emoji folder.Roger Braun2662+2661-0
2017-11-15 17:58MastoAPI: Make attachment ids strings.Roger Braun2+3-3
2017-11-14 16:47Merge branch 'twitterapi-bitlbee' into 'develop'lambda3+39-0
2017-11-14 16:44Merge branch 'twitterapi-show-user' into 'develop'lambda3+54-0
2017-11-14 14:19Merge branch 'api-links' into 'develop'lambda1+1-1
2017-11-14 14:09Merge branch 'mastoapi-media-timeline' into 'develop'lambda2+30-0
2017-11-14 08:34Update frontend.Roger Braun16+40-20
2017-11-13 08:48MastoAPI: Fix repeat api bug.Roger Braun2+3-4
2017-11-12 13:23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun7+347-24
2017-11-12 13:23Add Mastodon frontend.Roger Braun170+206703-5
2017-11-11 19:00MastoAPI: Websocket streaming for federated timeline.Roger Braun2+44-6
2017-11-11 13:59MastoAPI: Basic streaming.Roger Braun6+155-1
2017-11-11 10:18MastoAPI: Fix reblog emojis.Roger Braun2+2-1
2017-11-10 17:24Handle existing redirect params.Roger Braun1+2-1
2017-11-10 16:37Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun7+74-7
2017-11-10 16:18MastoAPI: Use string ids everywhere.Roger Braun4+18-17
2017-11-09 09:41Add actor column to activities.Roger Braun5+32-5
2017-11-09 07:32Re-fetch user data on salmon decode error.Roger Braun3+62-5
2017-11-08 17:57Merge branch 'following-you-in-user-view' into 'develop'lambda2+41-8
2017-11-08 16:25Look through whole db for user timelines.Roger Braun3+3-1
2017-11-08 15:16Update frontend.Roger Braun13+20-19
2017-11-08 13:39Merge branch 'blocks-in-user-view' into 'develop'lambda2+39-0
2017-11-08 10:35Merge branch 'twitter-api-blocks' into 'develop'lambda5+115-0
2017-11-07 20:01Merge branch 'mastodon-emoji-endpoint' into 'develop'lambda4+15-2
2017-11-07 18:58Merge branch 'authenticated-profile-fetching' into 'develop'lambda2+6-3
2017-11-07 17:33Update frontend.Roger Braun9+14-15
2017-11-07 17:27Update fronted.Roger Braun17+54-49
2017-11-07 15:45Allow self-rt.Roger Braun1+0-1
2017-11-07 11:06Linkify fixes.Roger Braun2+16-2
2017-11-07 08:41Revert "Longer timeouts for user fetching."Roger Braun2+3-7
2017-11-07 08:11Longer timeouts for user fetching.Roger Braun2+7-3
2017-11-06 20:27Merge branch 'fix-tootdon-oauth' into 'develop'lambda2+11-1
2017-11-05 11:12Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun12+190-21
2017-11-05 11:05Fix bug when no posts are in the db.Roger Braun2+3-1
2017-11-03 07:13MastoAPI: Fix mentions always being for an anonymous user.Roger Braun1+3-3
2017-11-02 16:52update gitlab ciRoger Braun1+3-4
2017-11-02 16:45Read variable for testing db.Roger Braun1+1-1
2017-11-02 16:33Update .gitlab-ci.ymllambda1+2-2
2017-11-02 16:31Update .gitlab-ci.ymllambda1+1-1
2017-11-02 16:28Update .gitlab-ci.ymllambda1+2-4
2017-11-02 16:26Add gitlab-ci.ymllambda1+27-0
2017-11-01 08:33Handle empty terms / tags.Roger Braun2+4-1
2017-10-31 18:51Federate out content warnings.Roger Braun2+9-1
2017-10-31 18:44Allow using cws in mastodon api.Roger Braun2+4-3
2017-10-31 17:56Update README.Roger Braun1+1-1
2017-10-31 17:51Update README.Roger Braun1+1-1
2017-10-31 16:57Fix specs.Roger Braun2+9-9
2017-10-31 16:49MastoAPI: Include CW.Roger Braun3+3-2
2017-10-31 16:43TwitterAPI: Display cws.Roger Braun2+9-2
2017-10-31 16:30Save cws in the activitypub data.Roger Braun4+15-9
2017-10-31 15:37Avoid potentially slow count queries for user note count.Roger Braun4+26-2
2017-10-31 14:26Only search through last 100_000 activities for fetches.Roger Braun1+9-0
2017-10-31 13:53Merge branch 'feature/mastodon-api-fixes' into developRoger Braun4+11-10
2017-10-30 18:25Merge branch 'feld/pleroma-feld-mastodon-usersearch' into developRoger Braun21+130-57
2017-10-24 06:39Return nil for nil object requests.Roger Braun1+1-0
2017-10-23 16:36Use index in basic activity query.Roger Braun1+2-2
2017-10-23 16:30Speed up deletion and related queries.Roger Braun3+17-3
2017-10-23 14:28Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+14-3
2017-10-23 14:27MastoAPI: Add emoji output.Roger Braun3+17-3
2017-10-19 15:56Revert "Simplify query."Roger Braun1+5-2
2017-10-19 15:37Add password reset.Roger Braun10+127-0
2017-10-18 09:56Simplify query.Roger Braun1+2-5
2017-10-05 10:53Don't reject already accepted subscriptions.Roger Braun2+5-4
2017-09-17 21:03Remove tag links for now, they break some regular links.Roger Braun1+1-1
2017-09-17 13:21Add tag links.Roger Braun2+16-5
2017-09-17 12:38Update frontend.Roger Braun19+57-49
2017-09-17 12:37TwitterAPI: Return proper error.Roger Braun2+9-7
2017-09-17 12:25MastoAPI: Fix reblog view.Roger Braun1+2-2
2017-09-17 12:20MastoAPI: Return reblogs, too.Roger Braun2+10-4
2017-09-17 12:05Add tag index.Roger Braun1+9-0
2017-09-17 11:54MastoAPI: Add repeats to statusview.Roger Braun2+54-0
2017-09-17 11:24Prefer post-specific emoji.Roger Braun1+1-1
2017-09-17 11:09MastodonAPI: Add user favorites endpoint.Roger Braun4+38-0
2017-09-17 11:03TwitterAPI: Use correct endpoint for tag timeline.Roger Braun2+2-2
2017-09-17 10:08Fix typo.Roger Braun1+1-1
2017-09-17 09:45TwitterAPI: Add tag timeline.Roger Braun2+17-0
2017-09-17 09:32Use inserted_at as sort in search.Roger Braun1+1-1
2017-09-17 09:16Use desc id to sort instead of desc inserted_atRoger Braun3+3-3
2017-09-16 22:33Add missing fixtures.Roger Braun2+4-0
2017-09-16 22:06Readme update.Roger Braun1+1-1
2017-09-16 22:01Fixup old migrations.Roger Braun5+23-19
2017-09-16 14:49Make emoji configurable in files.Roger Braun5+28-2
2017-09-16 14:40Apply incoming custom emoji.Roger Braun3+18-6
2017-09-16 14:27Handle incoming emoji.Roger Braun3+15-0
2017-09-16 14:14Federate emoji out.Roger Braun6+26-5
2017-09-16 13:47Small emoji refactor.Roger Braun2+75-69
2017-09-16 13:47Don't check limit twice in TwitterAPIController.Roger Braun1+4-6
2017-09-16 12:51Sort by updated_atRoger Braun1+2-1
2017-09-16 12:40Don't specify order in results for now.Roger Braun1+1-2
2017-09-16 12:33TwitterAPI: Add search.Roger Braun4+50-0
2017-09-16 11:44Federate banners out.Roger Braun2+14-1
2017-09-16 11:24Banners are objects.Roger Braun1+4-4
2017-09-16 11:16Update banner from remote accounts.Roger Braun1+4-2
2017-09-16 10:07Add info about clients to readme.Roger Braun1+9-0
2017-09-16 09:52Add undocumented default user default settings.Roger Braun2+12-2
2017-09-16 09:37Fix callback state.Roger Braun1+1-1
2017-09-16 09:26Add remote user fetching to search.Roger Braun2+14-1
2017-09-16 09:06Add fts search index.Roger Braun1+8-0
2017-09-16 08:50Set search config to 'english'.Roger Braun1+2-2
2017-09-16 08:42Add basic search.Roger Braun3+45-0
2017-09-15 15:50MastoAPI: Fix date in account view.Roger Braun4+23-7
2017-09-15 12:44Document options in READMERoger Braun1+11-2
2017-09-15 12:39Add configuration option for registrations.Roger Braun3+11-3
2017-09-15 12:17Refactor posting and make character limit configurable.Roger Braun14+187-178
2017-09-15 08:26Add instance config options.Roger Braun3+30-2
2017-09-15 06:49MastoAPI: Set user id on replies.Roger Braun1+7-3
2017-09-15 06:18Don't die on fetching problems.Roger Braun1+12-6
2017-09-14 16:30MastoAPI: Follower-related changesRoger Braun3+128-0
2017-09-14 11:22Add tag timelines.Roger Braun4+34-1
2017-09-14 07:50MastoAPI: Add favourited_by/reblogged_by.Roger Braun3+28-0
2017-09-14 07:29Preserve state in oauthRoger Braun2+8-1
2017-09-14 07:14MastoAPI: fake out 'application' property.Roger Braun2+8-2
2017-09-14 06:38MastoAPI: Also return text_url in attachments.Roger Braun2+3-1
2017-09-14 06:11Cleanup.Roger Braun1+1-2
2017-09-14 06:08Add media upload endpoint.Roger Braun4+29-0
2017-09-13 15:45Ensure non-null bio.Roger Braun1+1-1
2017-09-13 15:36MastoAPI: Add accounts getting.Roger Braun3+40-13
2017-09-13 15:18Oh no! More datetime fixes!Roger Braun2+2-2
2017-09-13 14:38Reparse time to ensure correct format.Roger Braun2+4-2
2017-09-13 14:26Allign datetime format with mastodon.Roger Braun3+3-2
2017-09-13 14:09Return iso8601 date.Roger Braun1+1-0
2017-09-13 14:05Fix logic.Roger Braun2+4-4
2017-09-13 13:55Add relationships to masto api.Roger Braun5+65-0
2017-09-13 09:59Try host-meta call over https.Roger Braun1+7-7
2017-09-12 11:48Optimize conversation fetching.Roger Braun2+9-1
2017-09-12 11:31Remove milliseconds from mastodon api response.Roger Braun2+8-2
2017-09-12 09:43Use signed integer as attachment id.Roger Braun1+1-1
2017-09-12 09:28Use hash of attachment url as id.Roger Braun2+4-2
2017-09-12 07:34MastoAPI: Remove domain ending from account name.Roger Braun2+4-4
2017-09-12 07:11Add pagination to notifications.Roger Braun1+16-0
2017-09-12 07:06MastoAPI: More link headers.Roger Braun1+10-6
2017-09-12 06:53Add parentheses.Roger Braun1+1-1
2017-09-12 06:51MastoAPI: Add link headers to home timelineRoger Braun1+19-1
2017-09-11 19:50log ostatus handling errors.Roger Braun1+1-0
2017-09-11 19:16Merge branch 'oauth2' into 'develop'lambadalambda37+1140-99
2017-09-08 07:08Try to fetch from html again if fetching from atom gives no results.Roger Braun1+1-1
2017-09-05 12:01Workaround for masto reply breakage.Roger Braun1+16-13
2017-09-05 09:40Fix remote profile update code.Roger Braun1+2-2
2017-09-05 07:35Fix specs.Roger Braun1+3-2
2017-09-04 18:49Merge branch 'deletions' into 'develop'lambadalambda11+134-7
2017-09-04 09:04Output mastodon-style conversation ids.Roger Braun2+7-7
2017-09-04 09:03Handle mastodon conversation ids.Roger Braun3+41-1
2017-09-01 10:50Update README.Roger Braun1+13-48
2017-09-01 10:42Merge branch 'hj.doc-install' into 'develop'lambadalambda3+138-5
2017-08-29 15:30Update frontend.Roger Braun17+48-48
2017-08-29 15:22fix specs.Roger Braun1+6-2
2017-08-29 15:18Add banner and background updating.Roger Braun3+36-3
2017-08-29 13:14Add profile update.Roger Braun4+46-2
2017-08-28 17:17More sensible attachment names.Roger Braun2+14-3
2017-08-25 13:09Ignore padding for salmon public keys.Roger Braun3+14-1
2017-08-24 14:27Set twitter-style possibly_sensitive boolena.Roger Braun2+8-3
2017-08-24 14:18Add activity_type to twitter api output.Roger Braun2+15-6
2017-08-24 12:19Remove email from mastoinfo.Roger Braun1+0-1
2017-08-24 12:15Basic masto-style info.Roger Braun2+23-0
2017-08-24 12:07More meta info fixes.Roger Braun2+44-8
2017-08-24 11:36Small meta info fixes.Roger Braun2+2-1
2017-08-24 10:55Merge branch 'feauture/webfinger' into 'develop'lambadalambda25+925-17
2017-08-22 12:22add correct content type for catch-allRoger Braun1+7-1
2017-08-21 15:07Update frontend.Roger Braun17+48-48
2017-08-18 09:33Merge branch 'patch-1' into 'develop'lambadalambda1+1-1
2017-08-16 14:29Fix deletion not deleting relevant actions.Roger Braun3+12-0
2017-08-14 15:56Use unicode regex in mentions and links.Roger Braun1+2-2
2017-08-09 14:55escape attachment urls on creation.Roger Braun2+2-2
2017-08-09 14:45Cowboy and Elixir don't seem to agree on uri encoding...Roger Braun2+5-5
2017-08-09 13:21URI encode filenames...Roger Braun2+5-4
2017-08-08 10:24Order by id instead of inserted_at to better use indexes.Roger Braun1+1-1
2017-08-04 14:57Also fetch atom links.Roger Braun6+95-43
2017-08-03 15:49Revert "Better error handling for user feeds."Roger Braun1+5-7
2017-08-03 15:46Better error handling for user feeds.Roger Braun1+7-5
2017-08-03 12:14Slightly nicer webfinger error handling.Roger Braun1+7-5
2017-08-02 10:42Try refresh all invalid subscriptions.Roger Braun1+1-1
2017-08-02 10:34Handle subscriptions in queue.Roger Braun2+11-2
2017-08-02 10:03Add some debug info to websub.Roger Braun1+2-0
2017-08-01 15:35Add href to in-reply-to.Roger Braun2+14-3
2017-08-01 15:05Add basic incoming deletions.Roger Braun5+85-3
2017-08-01 12:05Display html links correctly for remote activies.Roger Braun2+38-3
2017-08-01 10:41Don't crash on activity handling problems.Roger Braun1+26-17
2017-07-31 11:31Strip all newlines in atom html content to work around mastodon bug.Roger Braun1+1-1
2017-07-31 11:27Revert "Close br tags."Roger Braun3+4-4
2017-07-31 11:27Revert "Wrap in <p>."Roger Braun2+1-4
2017-07-31 11:27Revert "Remove newlines completely so mastodon doesn't bug out."Roger Braun3+4-4
2017-07-31 11:06Remove newlines completely so mastodon doesn't bug out.Roger Braun3+4-4
2017-07-31 10:16Wrap in <p>.Roger Braun2+4-1
2017-07-31 08:46Close br tags.Roger Braun3+4-4
2017-07-29 20:07Add html alternate link to atom.Roger Braun2+4-1
2017-07-29 17:11Update frontend.Roger Braun9+14-14
2017-07-29 16:56Update frontend.Roger Braun13+43-43
2017-07-28 09:27Update frontend.Roger Braun17+48-48
2017-07-22 15:42Save follower count and note count in user.Roger Braun8+92-19
2017-07-20 18:35Add friends endpoint.Roger Braun3+27-0
2017-07-20 18:29Add followers endpoint.Roger Braun4+36-0
2017-07-20 17:37Add follower / friend fetching to user.Roger Braun2+47-0
2017-07-19 17:06Use follower address in user entry.Roger Braun4+6-5
2017-07-19 16:49Add follower_address to users, add on generation.Roger Braun4+55-6
2017-07-08 09:17Fix undo activity.Roger Braun2+31-0
2017-07-02 13:01Add way to update most recent notification id.Roger Braun4+41-1
2017-07-02 11:09Update frontend. Persistent logins.Roger Braun21+47-33
2017-07-01 14:43Make user timelines faster for users with few statuses.Roger Braun3+9-2
2017-07-01 14:39Fix test.Roger Braun1+1-1
2017-07-01 00:00Larger bio length limit for remote accounts.Roger Braun1+1-1
2017-06-30 14:59For non-create activities, grab the create activity to fav/rtRoger Braun1+6-1
2017-06-30 14:53Also fetch posts by id in fav/rts.Roger Braun1+7-3
2017-06-30 14:41Only return posts in TwAPI conversations.Roger Braun4+11-10
2017-06-30 14:30Order conversation fetches like GS does.Roger Braun3+5-4
2017-06-30 14:08Add tests for public recipients.Roger Braun1+7-0
2017-06-30 13:54Don't add public recipient to notes that don't contain it.Roger Braun2+45-2
2017-06-26 15:00Bio can actually be nil.Roger Braun1+1-1
2017-06-25 10:07Add external links to twapi.Roger Braun2+10-8
2017-06-25 09:57Save external link for notes.Roger Braun2+7-0
2017-06-24 18:09update frontend.Roger Braun15+30-22
2017-06-24 12:35More resilient xml parsing.Roger Braun3+15-5
2017-06-24 11:09Update user data on fetch if it changed.Roger Braun2+13-3
2017-06-23 14:37Handle webpubs in queue.Roger Braun2+22-13
2017-06-23 14:22Some salmon debug fixes.Roger Braun3+12-7
2017-06-23 10:27use correct arity .post.Roger Braun1+1-1
2017-06-23 10:25Longer timeouts for outgoing federation.Roger Braun3+5-5
2017-06-20 15:49Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+21-21
2017-06-20 15:28Better debugging.Roger Braun1+1-1
2017-06-20 14:25Add correct index.Roger Braun1+8-0
2017-06-20 14:18Use more efficient queries.Roger Braun2+10-2
2017-06-20 14:02Use more efficient query.Roger Braun1+1-1
2017-06-20 12:10Add some debugging to federations.Roger Braun1+6-2
2017-06-20 10:00Drop the general index on activities.Roger Braun1+7-0
2017-06-20 09:49Merge branch 'develop' into refactor/user-viewRoger Braun2+9-5
2017-06-19 21:12Replace UserRepresenter with UserViewdtluna12+186-192
2017-06-19 16:06Move finmojis to representation.Roger Braun2+2-2
2017-06-19 15:51Add finmoji.Roger Braun131+83-1
2017-06-18 17:22Update frontend.Roger Braun13+43-43
2017-06-18 17:04Downcase tags coming in through the TwAPI.Roger Braun2+3-3
2017-06-18 17:01Save incoming tags as lowercase.Roger Braun2+2-2
2017-06-18 16:59Revert "Add invisible tags to TwAPI output."Roger Braun3+6-19
2017-06-18 15:20Fetch user feed on externalprofile request.Roger Braun2+13-2
2017-06-18 12:43Output tags list in TwAPI.Roger Braun2+4-2
2017-06-18 11:40Strip unsafe html on output in TwAPI.Roger Braun2+3-3
2017-06-18 11:29Slightly better html link regex.Roger Braun2+3-3
2017-06-18 11:17Remove html from user bios on display.Roger Braun2+4-4
2017-06-16 12:39Update frontend.Roger Braun17+48-48
2017-06-14 12:46Do some basic escaping.Roger Braun3+16-2
2017-06-14 11:58Move mention parsing to Formatter module.Roger Braun4+32-29
2017-06-12 15:41Update frontend.Roger Braun13+43-43
2017-06-12 15:12Enable user timelines.Roger Braun16+54-44
2017-06-12 10:52Redirect html user profile request.Roger Braun1+5-1
2017-06-08 14:44Save correct date for incoming notes.Roger Braun2+2-0
2017-06-07 18:47Update frontend.Roger Braun17+48-48
2017-06-05 13:47Fix NaN statuses per day.Roger Braun4+20-9
2017-06-05 11:06Update frontend.Roger Braun13+19-19
2017-06-04 08:25Update frontend.Roger Braun25+77-47
2017-06-02 20:47Represent object publishing date in notes.Roger Braun2+6-6
2017-06-01 16:09Update frontend.Roger Braun18+58-48
2017-06-01 09:24Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun14+87-87
2017-05-22 17:08Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun2+26-0
2017-05-20 11:35Extract note handler.Roger Braun3+87-84
2017-05-20 08:44Output ref instead of href for conversation.Roger Braun2+7-7
2017-05-19 14:08Try fetching shares.Roger Braun1+13-2
2017-05-19 13:53Also show activities in OStatus.Roger Braun3+34-3
2017-05-18 17:10Fix specs.Roger Braun1+1-0
2017-05-18 16:18Add categories to ostatus output.Roger Braun3+7-2
2017-05-18 15:18Update html_sanitize_ex.Roger Braun2+3-3
2017-05-18 15:03save correct inReplyToStatusId.Roger Braun1+3-3
2017-05-18 14:58Wire up inReplyToStatusIds for ostatus.Roger Braun1+9-1
2017-05-18 14:41Keep newlines around.Roger Braun3+5-5
2017-05-18 14:24Add invisible tags to TwAPI output.Roger Braun3+21-6
2017-05-18 13:58Handle incoming tags.Roger Braun3+74-1
2017-05-18 13:16Save tags in object.Roger Braun3+11-6
2017-05-17 16:00Twitter API refactoring.Roger Braun3+91-87
2017-05-17 16:00Add Formatter.Roger Braun2+41-0
2017-05-16 13:31AP refactoring.Roger Braun12+325-238
2017-05-15 16:25Fix mention replacing.Roger Braun2+22-5
2017-05-12 17:06Update frontend.Roger Braun17+48-49
2017-05-12 16:58On user making, check if we have a user with that uri.Roger Braun1+6-2
2017-05-12 16:50Fetch user on externalprofile if we don't know himRoger Braun1+3-2
2017-05-11 15:59Fix cws.Roger Braun7+455-7
2017-05-11 07:34More debugging code.Roger Braun1+3-0
2017-05-11 07:32Don't fetch if we don't even have a inReplyTo.Roger Braun1+1-1
2017-05-11 07:13Add debugging help.Roger Braun2+6-0
2017-05-10 17:29Repair retweets.Roger Braun2+3-2
2017-05-10 17:24Add problematic mastodon message.Roger Braun1+72-0
2017-05-10 17:12Actually guess 3 days...Roger Braun1+1-1
2017-05-10 17:08Only try refreshing every 6 hours.Roger Braun1+2-2
2017-05-10 17:04Handle cases where we don't get lease_seconds returned.Roger Braun1+9-2
2017-05-10 16:54Correct active state websub name.Roger Braun2+3-3
2017-05-10 16:46Handle incoming follows.Roger Braun8+427-4
2017-05-10 16:45Set valid_until date.Roger Braun2+6-5
2017-05-10 16:45Add option to keep id for follows.Roger Braun1+3-1
2017-05-10 16:44Add externalprofile to TwAPI.Roger Braun5+38-0
2017-05-10 16:44Refresh subscriptions.Roger Braun3+45-3
2017-05-10 16:43Only kick off websubs for local users.Roger Braun1+1-1
2017-05-10 08:16Use changeset for remote user creation.Roger Braun3+11-9
2017-05-09 16:11Add some basic changesets.Roger Braun4+75-2
2017-05-09 16:11Get fresh objects on changes.Roger Braun1+2-2
2017-05-08 22:20Quick fix for database filling.Roger Braun1+2-1
2017-05-08 18:12Add class=attachment to attachment links.Roger Braun2+2-2
2017-05-08 17:35Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+131-4
2017-05-07 18:30typo.Roger Braun1+0-1
2017-05-07 18:20Add some twapi fixes.Roger Braun2+8-2
2017-05-07 18:16Add some debugging info.Roger Braun1+2-0
2017-05-07 18:13Prevent double insertions.Roger Braun2+19-8
2017-05-07 18:05Preserve ids on favorites / retweets.Roger Braun3+20-6
2017-05-07 17:28Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activityRoger Braun91+7810-327
2017-04-28 13:06Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activitydtluna36+923-32
2017-04-21 16:54Add Undo of Follow Activity insertiondtluna6+51-6
2017-04-21 15:36Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-namedtluna8+100-14
2017-04-20 07:57Refactor unfollow/2dtluna1+4-12
2017-04-20 07:46Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-namedtluna3+28-12
2017-04-20 07:39Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-namedtluna3+18-12
2017-04-19 09:50Merge branch 'feature/user-timeline' into 'develop' Feature/user timeline See merge request !8lambadalambda6+155-2
2017-04-17 09:46Merge branch 'bugfix/repeated-follow-unfollow' into 'develop' Add error messages for repeated follows and unfollows See merge request !7lambadalambda4+56-28
2017-04-17 09:43Fix syntax error.Roger Braun1+1-0
2017-04-17 09:37Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun3+12-0
2017-04-17 09:36Switch cache implementation for size limiting.Roger Braun5+16-15
2017-04-16 14:07Update frontend.Roger Braun9+14-14
2017-04-16 14:06Add basic Avatar updating code.Roger Braun4+37-2
2017-04-16 13:40Display the users avatar if he has one set.Roger Braun2+11-8
2017-04-16 13:28Add avatar objects to user, fix specs.Roger Braun9+60-37
2017-04-16 12:23Support data uris in uploads.Roger Braun3+36-1
2017-04-16 09:52Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun1+661-0
2017-04-16 09:51Preserve newlines in messages.Roger Braun2+3-2
2017-04-16 09:16Update frontend again.Roger Braun9+14-14
2017-04-16 09:04Update frontend.Roger Braun21+118-50
2017-04-16 09:01Add registration to the TwAPI controller.Roger Braun3+50-0
2017-04-16 08:25Add user registration to TwAPI.Roger Braun2+55-2
2017-04-15 14:42Use changeset in user registration mix task.Roger Braun1+5-3
2017-04-15 14:40Add user registration changeset.Roger Braun3+62-0
2017-04-15 12:16Address liking / announcing to the original author.Roger Braun2+4-4
2017-04-15 12:09Add retweeting to TwAPI controller.Roger Braun3+29-0
2017-04-15 11:54Add announcements / retweets to TwAPI.Roger Braun5+91-4
2017-04-15 10:11Add announcements to activitypub.Roger Braun2+39-0
2017-04-14 16:59Update object correctly after setting context.Roger Braun2+7-0
2017-04-14 16:27Add unliking to TwAPI controller.Roger Braun4+34-3
2017-04-14 16:15Add unfavoriting to TwAPI.Roger Braun2+30-0
2017-04-14 16:08Add unliking to activitypub.Roger Braun4+67-9
2017-04-14 15:29Make new users follow themselves.Roger Braun1+1-1
2017-04-14 15:13Add basic user caching.Roger Braun7+41-4
2017-04-14 14:13Fix uploads and favorites in twidere / twittnuker.Roger Braun3+31-13
2017-04-14 13:07Favorite changes.Roger Braun5+57-33
2017-04-13 15:22Add favoriting to TwAPI controller.Roger Braun4+39-0
2017-04-13 15:05Display like activities.Roger Braun3+42-0
2017-04-13 15:05Update factory.Roger Braun1+18-0
2017-04-13 14:19Add favoriting to twitter api.Roger Braun4+34-4
2017-04-13 13:50Add liking to ActivityPub.Roger Braun2+56-2
2017-04-13 13:49Add utility functions for objects and activities.Roger Braun3+41-0
2017-04-13 13:49Add factories for testing.Roger Braun4+50-0
2017-04-13 12:56Add actor to objects.Roger Braun2+3-1
2017-04-12 17:34Fix twitter api date.Roger Braun4+29-7
2017-04-12 15:47Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into developRoger Braun1+2-0
2017-04-12 15:47Add basic config endpoint.Roger Braun2+15-0
2017-04-12 15:22Don't return html in the text field.Roger Braun2+5-4
2017-04-12 15:11Add max_id fetching to activity fetching.Roger Braun2+20-0
2017-04-12 14:53Test friends timeline more thoroughly.Roger Braun1+1-0
2017-04-12 14:45Return directly addressed activities in friends timeline.Roger Braun2+4-2
2017-04-12 14:38Fix user representation after following.Roger Braun2+3-3
2017-04-10 12:44Merge branch 'develop' into 'develop' Add Follow activity insertion See merge request !1lambadalambda5+33-7
2017-04-05 10:27Add user registration mix task.Roger Braun1+21-0
2017-04-05 09:59Fix replies.Roger Braun1+1-1
2017-04-05 09:59Remove vestigial file.Roger Braun1+0-17
2017-04-04 15:21Add Pleroma-FE snapshot.Roger Braun92+2988-0
2017-04-03 16:28Parse mentions, save them, output them in TwAPI.Roger Braun4+93-17
2017-04-03 16:28Add HTML sanitization library.Roger Braun2+3-0
2017-04-03 16:27Use standard base url in User.Roger Braun1+1-6
2017-04-03 16:27Add TODO file.Roger Braun1+1-0
2017-03-30 16:07Connect attachments with objects, not activities.Roger Braun4+9-9
2017-03-30 16:07Put objects in inserted activties into the db.Roger Braun3+10-1
2017-03-30 16:06Add index to objects.Roger Braun1+7-0
2017-03-30 15:07Add attachments to the TwAPI.Roger Braun7+73-13
2017-03-30 14:08Basic ObjectRepresenter.Roger Braun2+45-0
2017-03-30 14:08Return mimetype with attachment.Roger Braun2+12-4
2017-03-30 13:29Short circuit user verification if cookie is present.Roger Braun2+60-9
2017-03-30 12:34Ignore uploads.Roger Braun1+2-0
2017-03-30 12:32Add port if specified.Roger Braun3+21-15
2017-03-29 00:05Basic file uploading via TwAPI.Roger Braun10+57-6
2017-03-28 23:39Add Uploads.Roger Braun5+48-0
2017-03-28 15:22Add conversation fetching to TwAPI controller.Roger Braun5+64-6
2017-03-28 12:49Return statusnet_conversation_id in TwAPI.Roger Braun4+15-12
2017-03-28 12:40Add conversation id to activities.Roger Braun3+25-4
2017-03-28 12:04Fix spec.Roger Braun1+1-1
2017-03-24 00:16Add single status fetching to TwAPI.Roger Braun8+58-12
2017-03-23 23:09Add fetching of activities in context.Roger Braun2+18-0
2017-03-23 23:00Add inReplyToStatus to TwAPI.Roger Braun2+6-3
2017-03-23 22:34Add context and inReplyTo.Roger Braun3+57-10
2017-03-23 20:22Add id to objects, too.Roger Braun2+26-0
2017-03-23 16:56Generate ids for activities.Roger Braun2+24-4
2017-03-23 14:51Return user specific json for logged in users.Roger Braun10+72-29
2017-03-23 12:13Add unfollowing to TwAPI.Roger Braun7+75-1
2017-03-22 17:36Add following TwAPI endpoint.Roger Braun7+78-1
2017-03-22 16:25Add friends timeline.Roger Braun4+39-3
2017-03-22 15:51Add friends status fetching.Roger Braun6+46-13
2017-03-22 13:45Add fetching for recipients.Roger Braun3+28-2
2017-03-21 20:09Add public timeline TwAPI.Roger Braun6+37-6
2017-03-21 19:31Add since_id for activitypub fetching.Roger Braun2+17-1
2017-03-21 19:22Add limiting to activity pub fetching.Roger Braun3+39-16
2017-03-21 17:17Add status posting via TwAPI.Roger Braun6+42-19
2017-03-21 16:53Basic status creation and retrieval.Roger Braun14+272-9
2017-03-21 08:21Basic AP objects.Roger Braun6+69-0
2017-03-20 20:30Add Twitter API verify_credentials endpoint.Roger Braun3+71-1
2017-03-20 20:30Add Twitter API user representer.Roger Braun3+95-0
2017-03-20 20:28Don't use fetch access in plug.Roger Braun1+1-1
2017-03-20 20:28Add user schema.Roger Braun2+29-0
2017-03-20 16:45Add basic auth.Roger Braun5+174-3
2017-03-17 16:09Phoenix skeletonRoger Braun25+873-0
2019-02-07 15:41Pleroma.Formatter: Replace with/height on emojis to class='emoji'Haelwenn (lanodan) Monnier1+1-3
2019-02-03 14:13download-mastofe-build.sh: New scriptHaelwenn (lanodan) Monnier1+28-0
2019-02-03 11:31[MastoAPI] Add switching of frontend flavoursHaelwenn (lanodan) Monnier5+70-5
2019-02-02 18:06Plugs.HTTPSecurityPlug: Add webpacker to connect-srcHaelwenn (lanodan) Monnier1+8-1
2019-02-01 12:10Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev modeHaelwenn (lanodan) Monnier1+3-1
2018-10-30 01:04.mailmap: Link lanodan’s Gitlab to regular commitsHaelwenn (lanodan) Monnier1+1-0
2018-10-16 01:57rebase.sh: script (legacy)Haelwenn (lanodan) Monnier1+6-0
2018-09-16 21:09[PleromaFE] Update frontendHaelwenn (lanodan) Monnier24+1208-81
2018-05-20 15:35lib/pleroma/web/mastodon_api/views/status_view.ex: More than 4 attachementsHaelwenn (lanodan) Monnier1+1-1
2018-04-30 00:31lib/pleroma/web/router.ex: Remove complete globbing allowing to 404 on unknown APIsHaelwenn (lanodan) Monnier1+10-1
2018-03-22 05:43priv/static/instance/panel.html: Personnal configHaelwenn (lanodan) Monnier1+7-4
2018-02-03 23:23upgrade.sh: CreateHaelwenn (lanodan) Monnier3+42-1
2018-11-22 06:12config/dev.exs: Don’t put secure cookies on devHaelwenn (lanodan) Monnier1+2-1
2019-02-08 12:18Merge branch 'fix/do-split-migration-for-local-users-only' into 'develop'lambda1+3-3
2019-02-08 12:10Merge branch 'mark-streaming-feature-for-ios-apps' into 'develop'lambda1+5-4
2019-02-08 12:09Merge branch 'oauth2_strengthening' into 'develop'lambda2+9-9
2019-02-07 02:19Merge branch 'remove-pawoo-apps-from-readme' into 'develop'kaniini1+0-1
2019-02-07 02:18Merge branch 'mark-streaming-feature-for-apps-in-readme' into 'develop'kaniini1+3-3
2019-02-06 22:40Merge branch 'rename-followings' into 'develop'kaniini9+27-27
2019-02-06 18:39Merge branch 'bugfix/rich-media-card' into 'develop'Haelwenn2+59-2
2019-02-06 18:19Merge branch 'add-admin-and-moderator-fields' into 'develop'kaniini5+78-9
2019-02-06 18:02Merge branch 'mr/exsyslogger-doc-and-format' into 'develop'Haelwenn2+21-1
2019-02-06 17:47Merge branch 'fix/activitypub-user-view-badmap' into 'develop'rinpatch1+2-0
2019-02-06 09:47Merge branch '2019-02-06-update-frontend' into 'develop'lambda21+84-77
2019-02-05 21:01Merge branch 'bugfix/rich-media-non-unicode-nuclear-option' into 'develop'rinpatch1+4-14
2019-02-05 20:27Merge branch 'fix-dm-index' into 'develop'kaniini2+31-1
2019-02-05 20:26Merge branch 'feature/ap-c2s-whoami' into 'develop'kaniini2+9-0
2019-02-05 20:13Merge branch 'testfix/twitter-api' into 'develop'kaniini1+1-1
2019-02-05 18:56Merge branch 'feature/split-hide-network-v2' into 'develop'kaniini10+90-45
2019-02-05 18:53Merge branch 'bugfix/rich-media-image-nil' into 'develop'kaniini2+7-2
2019-02-05 11:30Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'lambda1+2-0
2019-02-05 11:29Merge branch 'patch-2' into 'develop'lambda1+1-0
2019-02-05 11:28Merge branch 'bugfix/rich-media-nil' into 'develop'lambda1+2-0
2019-02-04 19:20Merge branch 'feature/mrf-tag' into 'develop'Haelwenn2+173-0
2019-02-04 17:32Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'rinpatch1+4-1
2019-02-04 16:52Merge branch 'mime-riff' into 'develop'kaniini1+9-1
2019-02-04 16:01Merge branch 'fix/rich-media-relative-path' into 'develop'rinpatch1+14-3
2019-02-04 12:36Merge branch 'feature/hellthread-filter-improvements' into 'develop'rinpatch4+47-11
2019-02-03 21:06Merge branch 'mogrify-orient' into 'develop'kaniini2+3-3
2019-02-03 18:19Merge branch '589-fix-cache' into 'develop'lambda8+51-19
2019-02-03 15:47Merge branch '582_federation_retirement_optimization' into 'develop'kaniini8+178-43
2019-02-02 10:48Merge branch 'fix/oauth-page-responsiveness' into 'develop'rinpatch1+2-1
2019-02-01 20:23Merge branch 'revert-0a82a7e6' into 'develop'kaniini10+45-88
2019-02-01 19:45Merge branch 'hotfix/object-normalize-cache' into 'develop'href1+2-2
2019-02-01 19:39Merge branch 'streaming-api-url-fix' into 'develop'href2+5-1
2019-02-01 19:18Merge branch 'develop' into 'develop'href3+85-8
2019-02-01 17:27Merge branch 'bugfix/get_list_return_404' into 'develop'Haelwenn1+4-1
2019-02-01 17:05Merge branch 'feature/split-hide-network' into 'develop'kaniini10+88-45
2019-02-01 14:24Merge branch 'serve-sw-pleroma.js' into 'develop'lambda2+2-2
2019-02-01 09:33Merge branch 'fix-rich-media-toggle' into 'develop'lambda1+1-1
2019-02-01 09:14Merge branch '534_federation_targets_reachability' into 'develop'href24+775-115
2019-01-31 22:28Merge branch 'docs/pleroma-api-invite-token' into 'develop'Haelwenn1+1-0
2019-01-31 18:50Merge branch 'user-follow-all-unique' into 'develop'kaniini2+23-1
2019-01-31 16:54Merge branch 'bugfix/rich-media-non-unicode' into 'develop'lambda4+4948-13
2019-01-31 16:28Merge branch 'develop' into 'develop'kaniini1+1-1
2019-01-31 16:22Merge branch 'fix/rich-media-disable-in-config' into 'develop'kaniini3+7-1
2019-01-31 12:16Merge branch 'revert-4d3655c4' into 'develop'lambda5+0-1240
2019-01-31 11:29Merge branch 'spc-fix-3' into 'develop'kaniini5+1240-0
2019-01-31 10:16Merge branch 'features/glitch-soc-frontend' into 'develop'Haelwenn9+162-11
2019-01-31 10:12Merge branch 'update-mastofe/glitch-soc-2019-01-28' into 'develop'Haelwenn551+1417-659
2019-01-30 21:38Merge branch 'add-wiki-reference-to-readme' into 'develop'kaniini1+28-27
2019-01-30 20:18Merge branch 'multiple-hackney-pools' into 'develop'lambda3+3-3
2019-01-30 20:17Merge branch '2019-1-30-update-frontend' into 'develop'lambda36+140-93
2019-01-30 19:01Merge branch 'multiple-hackney-pools' into 'develop'kaniini8+86-12
2019-01-30 18:50Merge branch 'better-following' into 'develop'kaniini3+38-29
2019-01-30 10:56Merge branch 'docs/fix-frontend_config' into 'develop'Haelwenn1+1-1
2019-01-30 10:38Merge branch 'docs/fix-frontend_config' into 'develop'kaniini1+2-2
2019-01-29 19:24Merge branch 'docs/fix-pleroma-api-title' into 'develop'lambda1+1-5
2019-01-29 14:47Merge branch 'bugfix/fix-rejects' into 'develop'kaniini2+21-2
2019-01-29 13:54Merge branch 'hj-happiness-improvement' into 'develop'kaniini8+159-19
2019-01-29 05:11Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'Haelwenn17+159-131
2019-01-28 14:31Merge branch 'app-list-changes' into 'develop'kaniini1+8-5
2019-01-28 11:48Merge branch 'safe-render-activities' into 'develop'Haelwenn1+0-1
2019-01-28 10:49Merge branch 'oauth-login-failure-bug' into 'develop'href2+27-1
2019-01-28 08:23Merge branch 'patch-2' into 'develop'Haelwenn1+1-1
2019-01-27 22:01Merge branch 'notice-404-to-fe' into 'develop'rinpatch2+7-4
2019-01-27 20:10Merge branch 'safe-render-activities' into 'develop'lambda3+29-2
2019-01-27 19:10Merge branch 'discard-invalid-likes' into 'develop'kaniini1+5-5
2019-01-27 15:22Merge branch 'hotfix/favorites-index' into 'develop'kaniini1+8-0
2019-01-27 15:16Merge branch 'flake-random-worker-id' into 'develop'kaniini1+3-18
2019-01-27 14:28Merge branch 'docs/emoji-endpoint-similarities' into 'develop'rinpatch1+1-0
2019-01-27 12:45Merge branch 'features/mastoapi-multi-hashtag' into 'develop'kaniini4+108-4
2019-01-27 09:45Merge branch 'features/masto-account-view-rights' into 'develop'Haelwenn2+9-3
2019-01-26 17:30Merge branch 'hardening/mastodon-rich-media' into 'develop'Haelwenn1+10-2
2019-01-26 17:27Merge branch 'webpush-endpoint-size' into 'develop'kaniini1+9-0
2019-01-26 16:17Merge branch 'flake-from-int' into 'develop'kaniini2+5-0
2019-01-26 15:57Merge branch 'join-in-preloads' into 'develop'kaniini2+10-3
2019-01-26 15:47Merge branch 'features/mastoapi-cards' into 'develop'kaniini6+70-12
2019-01-26 14:10Merge branch 'documentation/mastalab' into 'develop'kaniini1+1-0
2019-01-26 13:41Merge branch 'bugfix/content_nil_lenght_check' into 'develop'kaniini2+12-1
2019-01-25 15:16Merge branch 'oembed_provider' into 'develop'kaniini13+476-22
2019-01-25 10:23Merge branch 'update/pleroma-fe-20190125-hotfix' into 'develop'lambda10+25-25
2019-01-25 05:19Merge branch 'fix/tusky-dm' into 'develop'kaniini9+79-52
2019-01-25 04:59Merge branch 'classic-flakeids' into 'develop'kaniini21+542-37
2019-01-25 04:57Merge branch 'update/pleroma-fe-20190125' into 'develop'kaniini16+67-66
2019-01-24 13:22Merge branch 'fix-activity_visibility-autovacuum' into 'develop'kaniini1+37-0
2019-01-24 10:20Merge branch 'feature/mrf-anti-followbot' into 'develop'href2+114-0
2019-01-23 23:47Merge branch 'fix/hide-network-setting' into 'develop'kaniini2+5-0
2019-01-23 13:25Merge branch 's3-namespace' into 'develop'kaniini1+9-1
2019-01-23 13:20Merge branch 'fix-info-id' into 'develop'href1+9-0
2019-01-23 12:14Merge branch 'rename/pleroma_activity_consistency' into 'develop'lambda20+57-64
2019-01-22 16:10Merge branch 'mr/20190122-activity-visibility-update' into 'develop'href1+36-0
2019-01-22 14:28Merge branch 'fix/activity_get_by_id' into 'develop'Haelwenn1+4-0
2019-01-22 14:18Merge branch '502_stats_fix_for_nil_info_deactivated' into 'develop'lambda2+12-1
2019-01-22 09:03Merge branch 'uploader-controller' into 'develop'kaniini3+63-4
2019-01-21 20:02Merge branch 'fix-buggy-test' into 'develop'rinpatch1+2-2
2019-01-21 16:19Merge branch 'proxy-no-default-plug-cache' into 'develop'lambda1+18-5
2019-01-21 13:03Merge branch '530_federator_user_info_overwrite_fix' into 'develop'lambda2+6-7
2019-01-21 12:35Merge branch 'feature/dm-sanity' into 'develop'lambda8+186-4
2019-01-21 05:22Merge branch 'bugfix/gen_signing_salt' into 'develop'rinpatch2+4-1
2019-01-20 23:06Merge branch '116-send-delete-event' into 'develop'kaniini3+44-10
2019-01-20 10:58Merge branch 'add-custom-emoji-test' into 'develop'lambda1+7-0
2019-01-20 10:42Merge branch '2019-1-20-update-frontend' into 'develop'lambda20+70-70
2019-01-20 10:24Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'lambda7+230-41
2019-01-19 23:44Merge branch 'bugfix/improve-boost-targeting' into 'develop'kaniini5+32-13
2019-01-19 07:36Merge branch '491_full_mentions_in_user_bio' into 'develop'kaniini5+45-15
2019-01-17 19:27Merge branch '502_instance_stats_active_users_count_fix' into 'develop'kaniini3+15-5
2019-01-17 19:22Merge branch 'bad-copy-paste' into 'develop'kaniini1+1-1
2019-01-17 19:21Merge branch 'attachment-links' into 'develop'kaniini4+11-3
2019-01-17 19:21Merge branch 'change-mix-location' into 'develop'kaniini1+13-5
2019-01-17 03:19Merge branch 'resilient-user-view-2' into 'develop'kaniini4+57-14
2019-01-16 09:06Merge branch 'feature/improve-microformats' into 'develop'lambda7+37-27
2019-01-16 08:59Merge branch '518_instance_stats_fix' into 'develop'lambda2+24-7
2019-01-15 20:02Merge branch 'bugfix/websub-hardening' into 'develop'lambda2+13-0
2019-01-15 20:00Merge branch 'bugfix/tesla-query-params' into 'develop'lambda2+9-1
2019-01-15 08:51Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'lambda1+3-2
2019-01-15 07:01Merge branch 'bugfix/upload_with_question_mark' into 'develop'rinpatch2+22-1
2019-01-14 18:52Merge branch 'media-url-escape' into 'develop'rinpatch2+16-1
2019-01-14 18:49Merge branch 'load-all-dms' into 'develop'lambda1+0-10
2019-01-14 07:28Merge branch 'feature/add-oembed-parser' into 'develop'kaniini5+77-1
2019-01-14 07:27Merge branch 'activitypub-likes' into 'develop'kaniini8+200-3
2019-01-14 07:25Merge branch 'fix-nginx-caching' into 'develop'kaniini1+3-1
2019-01-14 07:23Merge branch 'feature/mrf-no-placeholder-text-policy' into 'develop'kaniini1+29-0
2019-01-13 16:01Merge branch 'bugfix/favourites-link-header' into 'develop'lambda2+34-4
2019-01-11 23:09Merge branch 'bugfix/pinned-statuses' into 'develop'kaniini2+24-0
2019-01-11 10:02Merge branch 'fix-spellign' into 'develop'scarlett1+1-1
2019-01-10 18:49Merge branch 'fix-varnish-chunked' into 'develop'kaniini1+51-25
2019-01-10 18:42Merge branch 'activitypub-dereference-activity-id' into 'develop'kaniini3+57-14
2019-01-10 18:09Merge branch 'feature/add-twitter-card-parser' into 'develop'kaniini6+72-27
2019-01-10 18:03Merge branch 'twapi-follower-pagination' into 'develop'kaniini3+83-8
2019-01-10 03:54Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'Haelwenn2+50-2
2019-01-10 02:39Merge branch 'feature/pinned-posts' into 'develop'kaniini19+370-14
2019-01-10 02:33Merge branch 'mass-follow' into 'develop'kaniini2+31-4
2019-01-10 02:31Merge branch 'dm-optimizations' into 'develop'kaniini3+95-14
2019-01-10 01:08Merge branch 'fix-alphasort' into 'develop'kaniini1+21-21
2019-01-09 18:42Merge branch 'hotfix/ogp-cachex-fix' into 'develop'rinpatch1+1-1
2019-01-09 16:26Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'lambda4+20-7
2019-01-09 07:09Merge branch 'hotfix/media-proxy-uri' into 'develop'kaniini3+97-12
2019-01-08 22:58Merge branch 'autofollow' into 'develop'rinpatch4+38-2
2019-01-07 22:25Merge branch 'features/syslog_logger' into 'develop'kaniini4+19-2
2019-01-07 20:39Merge branch 'spc-fix-2' into 'develop'kaniini2+10-5
2019-01-07 17:09Merge branch 'resilient-user-view' into 'develop'kaniini3+52-1
2019-01-07 12:20Merge branch 'scarlett/pleroma-search-visibility-check' into 'develop'lambda2+26-5
2019-01-05 22:54Merge branch 'fix/multiple-follow-notifications-from-same-user' into 'develop'kaniini2+43-1
2019-01-05 22:34Merge branch 'fix/user-search-null-name' into 'develop'kaniini2+11-1
2019-01-05 22:33Merge branch 'fix_486' into 'develop'kaniini1+8-2
2019-01-05 22:29Merge branch 'activitypub-tombstone-fix' into 'develop'kaniini3+29-0
2019-01-05 21:52Merge branch 'emoji-in-summary' into 'develop'scarlett4+34-5
2019-01-04 23:56Merge branch 'feature/rich-media-cachex' into 'develop'rinpatch2+19-1
2019-01-04 23:35Merge branch 'fix/html-cache-content-collision' into 'develop'kaniini3+21-28
2019-01-04 20:50Merge branch 'feature/rich-media' into 'develop'kaniini9+179-1
2019-01-04 20:32Merge branch 'activitypub-c2s-delete-activity' into 'develop'kaniini2+101-17
2019-01-03 22:30Merge branch 'mr/retry-queue-remove-fold' into 'develop'kaniini1+1-2
2019-01-03 22:29Merge branch 'media-proxy-remove-empty-conf-defaults' into 'develop'kaniini1+1-7
2019-01-03 18:53Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'kaniini1+1-0
2019-01-03 17:04Merge branch 'captcha' into 'develop'rinpatch10+125-97
2019-01-03 08:59Merge branch 'fix-chat' into 'develop'rinpatch1+13-0
2019-01-02 16:23Merge branch 'fix/reserve-media-username' into 'develop'rinpatch1+2-1
2019-01-01 20:12Merge branch 'pool-usage' into 'develop'kaniini4+9-12
2019-01-01 18:55Merge branch 'configurable-federator' into 'develop'rinpatch4+27-14
2019-01-01 16:55Merge branch '2019-1-1-update-frontend' into 'develop'lambda19+69-69
2019-01-01 13:48Merge branch 'cleanup/admin-api-useless-if' into 'develop'lambda1+2-7
2018-12-31 15:49Merge branch 'features/admin-api-user-views' into 'develop'kaniini3+19-6
2018-12-31 15:49Merge branch 'docs/admin-api' into 'develop'kaniini3+105-3
2018-12-31 15:43Merge branch 'maintenance/copyright-2019' into 'develop'kaniini137+137-137
2018-12-31 09:56Merge branch 'fix/scrubber-cache' into 'develop'lambda6+70-9
2018-12-30 21:47Merge branch 'mr/retry-queue' into 'develop'kaniini2+202-24
2018-12-30 19:50Merge branch 'activitypub-c2s' into 'develop'kaniini5+186-7
2018-12-29 17:30Merge branch 'fix_485' into 'develop'Haelwenn1+1-1
2018-12-29 13:47Merge branch '2018-12-29-update-frontend' into 'develop'lambda20+78-74
2018-12-29 11:46Merge branch 'carrot-bullying' into 'develop'kaniini4+29-1
2018-12-29 11:34Merge branch '483_blocks_import_export' into 'develop'kaniini8+173-19
2018-12-29 11:32Merge branch 'support/issue_480' into 'develop'kaniini3+18-4
2018-12-29 03:03Merge branch '471_invalid_accounts_rendering' into 'develop'kaniini3+86-61
2018-12-28 20:14Merge branch 'systemd-drop-sysadmin-privilege' into 'develop'kaniini1+2-0
2018-12-28 18:33Merge branch 'fix/no-attachment-links' into 'develop'kaniini1+1-1
2018-12-28 18:30Merge branch 'fix/public-timeline-auth' into 'develop'kaniini2+61-1
2018-12-27 22:10Merge branch '396_elixir_1.7' into 'develop'Haelwenn2+3-3
2018-12-27 19:37Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'kaniini9+53-13
2018-12-27 19:35Merge branch 'reserve-user-names' into 'develop'kaniini5+61-3
2018-12-27 19:22Merge branch 'feature/exclude_reblogs' into 'develop'kaniini5+74-0
2018-12-26 20:11Merge branch 'fix/ci-set-mix-env-globally' into 'develop'Haelwenn1+5-4
2018-12-25 17:53Merge branch 'legal-boilerplate' into 'develop'lambda224+896-0
2018-12-23 14:46Merge branch 'bugfix/trans_fix_url_videos' into 'develop'lambda7+97-14
2018-12-23 13:17Merge branch 'hotfix/activity-without-content' into 'develop'lambda1+5-3
2018-12-23 11:28Merge branch 'feature/hellthread-mitigation' into 'develop'kaniini3+23-0
2018-12-20 16:31Merge branch 'ci-test-fix' into 'develop'lambda1+2-2
2018-12-20 13:28Merge branch '114_email_confirmation' into 'develop'kaniini21+398-24
2018-12-20 09:35Merge branch 'support/issue_413' into 'develop'kaniini2+16-9
2018-12-20 09:06Merge branch 'fix/readme-md-config-typo' into 'develop'kaniini1+1-1
2018-12-20 04:12Merge branch 'readme' into 'develop'kaniini1+4-4
2018-12-20 04:01Merge branch 'documentation/copy-pleroma-api' into 'develop'kaniini4+100-3
2018-12-19 00:12Merge branch 'userless-admin' into 'develop'kaniini4+78-2
2018-12-18 21:11Merge branch 'fix/ci-cache-improved' into 'develop'lambda1+2-0
2018-12-18 20:23Merge branch 'fix/formatter-ignore-html-chars' into 'develop'lambda2+15-3
2018-12-18 15:42Merge branch 'feature/new-user-routes' into 'develop'lambda1+2-2
2018-12-18 15:41Merge branch 'new-routes-integration' into 'develop'lambda19+68-68
2018-12-18 15:18Merge branch 'ci-test-fix' into 'develop'lambda1+2-0
2018-12-18 10:42Merge branch 'runtime-static-plug' into 'develop'lambda7+107-3
2018-12-17 20:36Merge branch '2018-12-17-update-frontend' into 'develop'lambda30+118-103
2018-12-17 20:24Merge branch 'fix-test' into 'develop'lambda1+6-1
2018-12-17 20:16Merge branch '459_fix_user_profile_crash' into 'develop'lambda1+4-1
2018-12-17 20:11Merge branch 'support/issue_449' into 'develop'lambda2+22-1
2018-12-17 19:45Merge branch 'captcha' into 'develop'lambda12+288-25
2018-12-17 19:38Merge branch 'fix-tags' into 'develop'lambda3+20-3
2018-12-17 19:37Merge branch 'test-mix-tasks' into 'develop'lambda5+370-13
2018-12-17 19:30Merge branch 'phoenix14' into 'develop'lambda16+500-211
2018-12-17 09:19Merge branch 'testfix/webfinger-jrd' into 'develop'lambda2+14-1
2018-12-16 13:19Merge branch 'netbsd-script' into 'develop'scarlett1+57-0
2018-12-16 12:13Merge branch 'develop' into 'develop'Haelwenn3+114-0
2018-12-16 11:21Merge branch 'fix/masto-put-settings' into 'develop'eal3+23-4
2018-12-16 11:08Merge branch 'fix/dev-exs-enable-unsecure-cookies-by-default' into 'develop'eal1+1-0
2018-12-15 15:31Merge branch 'bugfix/webfinger-jrd' into 'develop'lambda2+38-0
2018-12-15 15:23Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'lambda1+6-0
2018-12-15 15:22Merge branch 'tests-warning-as-errors' into 'develop'lambda1+1-6
2018-12-15 15:21Merge branch 'feature/mix-task-instance-port-specification' into 'develop'lambda2+11-7
2018-12-14 20:30Merge branch 'fix/issue_433' into 'develop'href7+49-11
2018-12-14 20:22Merge branch '114_email_invites' into 'develop'href7+145-2
2018-12-14 20:20Merge branch 'fix/issue_272' into 'develop'href2+49-2
2018-12-14 18:50Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'href8+154-110
2018-12-14 13:00Merge branch 'feature/file-size-checking' into 'develop'href1+8-0
2018-12-14 09:16Merge branch '114_user_registration_emails' into 'develop'href13+169-2
2018-12-14 08:26Merge branch 'fix/double-rt-or-fav' into 'develop'lambda2+44-2
2018-12-14 08:25Merge branch 'fix/qvitter-fav-object' into 'develop'lambda2+9-0
2018-12-14 08:23Merge branch '2018-12-13-update-frontend' into 'develop'lambda37+1307-107
2018-12-13 15:13Merge branch 'username-underscores' into 'develop'lambda4+23-9
2018-12-13 15:10Merge branch 'fix/mix-tasks-set-user-info' into 'develop'lambda1+26-17
2018-12-12 20:38Merge branch 'fix/nginx-safari' into 'develop'lambda1+5-0
2018-12-12 07:28Merge branch 'support/issue_442' into 'develop'kaniini32+204-184
2018-12-10 23:32Merge branch 'new-fe-options' into 'develop'scarlett3+14-2
2018-12-10 19:55Merge branch '2018-12-10-update-frontend' into 'develop'lambda19+66-65
2018-12-10 19:08Merge branch 'fix_empty_bio_crash' into 'develop'lambda2+23-2
2018-12-10 19:06Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'lambda1+9-2
2018-12-10 19:06Merge branch 'fix/config-md-typos' into 'develop'lambda1+3-3
2018-12-10 19:05Merge branch 'support/bugfix_272' into 'develop'lambda2+66-49
2018-12-10 19:04Merge branch 'fix/theora-detection-read-bytes' into 'develop'lambda1+1-1
2018-12-10 19:03Merge branch 'anonymize-filter-text' into 'develop'lambda2+27-3
2018-12-10 18:28Merge branch 'parallel588/pleroma-support/compile_warnings' into 'develop'lambda58+240-288
2018-12-09 13:53Merge branch 'angristan-docker' into 'develop'Haelwenn1+1-1
2018-12-08 09:12Merge branch 'fix/add-upload.ex' into 'develop'lambda1+98-0
2018-12-08 09:12Merge branch 'fix/nodeinfo-nil-features' into 'develop'lambda1+22-17
2018-12-08 09:11Merge branch 'fix/media-proxy-url-encoded' into 'develop'lambda3+51-2
2018-12-08 09:08Merge branch 'fix/typo-relay-ex' into 'develop'lambda1+1-1
2018-12-07 18:49Merge branch 'fix/gopher-respect-ip' into 'develop'lambda1+1-1
2018-12-07 18:48Merge branch 'media-proxy-follow-redirect' into 'develop'lambda1+1-1
2018-12-07 18:25Merge branch '394_user_tags' into 'develop'lambda10+168-7
2018-12-07 18:13Merge branch 'emoji-alphabetical-ordering' into 'develop'lambda1+1-1
2018-12-07 09:23Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'lambda1+5-1
2018-12-07 09:19Merge branch 'fix/typo-in-relay-doc' into 'develop'lambda1+1-1
2018-12-07 06:48Merge branch 'fix/add-common.ex' into 'develop'eal1+24-0
2018-12-06 22:09Merge branch 'refactor/mix-tasks' into 'develop'kaniini21+568-573
2018-12-06 16:01Merge branch 'fix/mastodon-api-settings' into 'develop'kaniini3+10-7
2018-12-06 15:57Merge branch 'correct-and-improve-http-options' into 'develop'kaniini8+20-27
2018-12-06 15:36Merge branch 're-mrf' into 'develop'kaniini2+41-0
2018-12-06 15:35Merge branch 'feature/compat/push-subscriptions' into 'develop'kaniini15+291-10
2018-12-06 07:36Merge branch '210_twitter_api_uploads_alt_text' into 'develop'kaniini11+180-46
2018-12-05 21:41Merge branch 'follower-hiding' into 'develop'kaniini7+241-13
2018-12-05 20:47Merge branch 'dev_vald_fe/data_tag' into 'develop'kaniini7+31-23
2018-12-05 17:55Merge branch 'support/oauth_fetch_token' into 'develop'lambda2+112-18
2018-12-05 17:53Merge branch 'fix/mix-tasks-userinfo' into 'develop'lambda3+27-23
2018-12-05 08:28Merge branch 'bugfix/408' into 'develop'lambda2+13-0
2018-12-04 19:00Merge branch 'optional-retry-queue' into 'develop'kaniini1+9-1
2018-12-04 18:41Merge branch 'feature/integration_tesla' into 'develop'kaniini37+1067-923
2018-12-04 18:36Merge branch 'bugfix/mrf-simple-media-removal' into 'develop'lambda1+1-1
2018-12-03 16:31Merge branch 'fix/parse-user-bio' into 'develop'lambda7+64-20
2018-12-03 16:14Merge branch 'fix-media-proxy-defaults' into 'develop'lambda1+2-2
2018-12-03 06:03Merge branch 'update-pleroma-frontend' into 'develop'kaniini14+60-58
2018-12-02 23:07Merge branch 'user_info_fixes_again' into 'develop'Haelwenn4+11-3
2018-12-01 22:11Merge branch 'validate-user-info' into 'develop'kaniini46+634-405
2018-12-01 15:17Merge branch 'fix/config-replace-try-catch-with-file-exists' into 'develop'lambda1+5-6
2018-12-01 03:09Merge branch 'feature/anonymize-filenames' into 'develop'kaniini2+24-0
2018-11-30 18:15Merge branch 'feature/reverse-proxy' into 'develop'kaniini31+1217-423
2018-11-30 17:57Merge branch 'config-delete' into 'develop'lambda2+29-0
2018-11-30 17:56Merge branch 'supervisor-order' into 'develop'lambda2+42-35
2018-11-30 04:36Merge branch 'bugfix/server-true-in-prod' into 'develop'kaniini1+0-1
2018-11-29 09:34Merge branch 'enable-ci-cache' into 'develop'lambda1+5-0
2018-11-28 21:10Merge branch 'fix-list-stream-privacy' into 'develop'lambda2+110-2
2018-11-27 23:20Merge branch 'revert-02e43d44' into 'develop'kaniini1+0-2
2018-11-27 22:59Merge branch 'chore/mix-lock-update' into 'develop'kaniini1+2-0
2018-11-27 17:10Merge branch 'fix/version-string-force-git-abbrev-size' into 'develop'kaniini1+1-1
2018-11-27 16:55Merge branch 'ogg-theora-detection' into 'develop'kaniini1+7-1
2018-11-27 00:12Merge branch 'feature/mrf-user-allowlist' into 'develop'Haelwenn3+42-0
2018-11-26 23:59Merge branch 'fix/pleromafe-title' into 'develop'kaniini1+3-1
2018-11-26 22:24Merge branch 'bugfix/csp-no-https' into 'develop'kaniini1+5-1
2018-11-26 19:56Merge branch 'add-manifest-src-to-csp' into 'develop'Haelwenn1+1-0
2018-11-25 02:54Merge branch 'bugfix/public-mastoapi-websocket' into 'develop'kaniini3+84-13
2018-11-22 00:28Merge branch 'feature/admin-api' into 'develop'kaniini9+412-14
2018-11-21 16:53Merge branch 'feature/improve-version' into 'develop'kaniini6+58-13
2018-11-20 22:25Merge branch 'runtime-fixes' into 'develop'kaniini9+26-22
2018-11-20 19:04Merge branch 'feature/retry-queue' into 'develop'Haelwenn5+150-25
2018-11-20 18:09Merge branch 'fix/mediaproxy-empty-url' into 'develop'kaniini2+117-2
2018-11-18 17:29Merge branch 'update/pleroma-fe-20181118' into 'develop'kaniini13+58-58
2018-11-17 22:43Merge branch 'security/as2-object-render-hardening' into 'develop'lambda2+52-1
2018-11-17 22:20Merge branch 'bugfix/notice-urls-should-return-objects' into 'develop'lambda2+41-3
2018-11-17 21:52Merge branch 'security/spoofing-hardening' into 'develop'lambda7+195-17
2018-11-17 18:33Merge branch 'security/actor-containment' into 'develop'lambda7+107-7
2018-11-17 16:41Merge branch 'feature/uploader-mdii' into 'develop'kaniini2+30-0
2018-11-16 23:34Merge branch 'bugfix/dm-timeline-scope' into 'develop'kaniini2+10-3
2018-11-16 18:13Merge branch 'feature/pleromafe-usersearch' into 'develop'lambda5+42-2
2018-11-16 17:47Merge branch 'bugfix/csp-remove-form-action' into 'develop'kaniini1+0-1
2018-11-16 15:52Merge branch 'fix/test' into 'develop'lambda1+2-0
2018-11-14 18:17Merge branch 'fix-media-proxy-filename' into 'develop'lambda2+2-2
2018-11-14 16:10Merge branch 'update/pleroma-fe-20181114' into 'develop'kaniini16+73-59
2018-11-14 08:52Merge branch 'twitter-api-direct-messages' into 'develop'kaniini5+75-2
2018-11-13 15:15Merge branch 'media-proxy-safety' into 'develop'lambda3+46-5
2018-11-13 13:23Merge branch 'security/cookie-hardening' into 'develop'lambda1+6-1
2018-11-13 12:24Merge branch 'add-MIX_ENV-to-systemd-example' into 'develop'lambda1+1-0
2018-11-13 12:22Merge branch 'whalebird' into 'develop'lambda1+2-1
2018-11-12 17:08Merge branch 'twitter-api-null-display-name' into 'develop'scarlett2+13-2
2018-11-12 15:30Merge branch 'feature/csp-plug' into 'develop'kaniini10+155-52
2018-11-11 16:44Merge branch 'update-readme' into 'develop'Haelwenn1+3-1
2018-11-11 13:41Merge branch 'fix-list-streaming' into 'develop'kaniini1+7-3
2018-11-11 05:49Merge branch 'bugfix/corsplug-config' into 'develop'kaniini2+14-10
2018-11-11 05:34Merge branch 'bugfix/oauth-padding' into 'develop'kaniini1+3-0
2018-11-10 12:37Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'lambda3+71-1
2018-11-10 12:25Merge branch 'feature/documentation' into 'develop'kaniini17+198-137
2018-11-10 11:50Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'kaniini3+46-4
2018-11-10 11:37Merge branch 'bugfix/local-jsonld-context' into 'develop'kaniini3+28-3
2018-11-10 11:17Merge branch 'tests/prismo-url-map' into 'develop'kaniini4+83-0
2018-11-09 16:00Merge branch 'bugfix/no-cc-mentions' into 'develop'lambda7+204-38
2018-11-08 17:42Merge branch 'feature/jsonld-context-cleanup' into 'develop'kaniini2+2-13
2018-11-08 16:23Merge branch 'small-jsonld-refactor' into 'develop'lambda4+9-22
2018-11-07 22:33Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'kaniini5+116-0
2018-11-07 22:32Merge branch 'runtime-config' into 'develop'kaniini18+191-163
2018-11-07 16:04Merge branch 'mastodon-api-relationships-without-id-param' into 'develop'lambda1+6-0
2018-11-06 21:24Merge branch 'patch-2' into 'develop'kaniini1+0-1
2018-11-06 16:18Merge branch 'unify-mastodon-oauth' into 'develop'kaniini4+52-49
2018-11-06 15:35Merge branch 'runtime-router' into 'develop'kaniini11+183-35
2018-11-06 15:09Merge branch 'remove-config-agent' into 'develop'lambda7+61-26
2018-11-06 07:37Merge branch 'use-the-same-example-domain-and-use-it-as-variable' into 'develop'kaniini3+36-24
2018-11-06 07:33Merge branch 'runtime-emojis-fix-finmoji-return' into 'develop'kaniini1+1-1
2018-11-05 18:40Merge branch 'runtime-emojis' into 'develop'lambda5+205-126
2018-11-04 03:09Merge branch 'tests-for-emtpy-content' into 'develop'kaniini1+18-0
2018-11-03 15:36Merge branch 'feature/cors-again' into 'develop'kaniini3+4-1
2018-11-03 13:54Merge branch 'bugfix/harden_status_output' into 'develop'Haelwenn1+4-4
2018-11-03 12:40Merge branch 'hashtag-search-case-sensitivity-test' into 'develop'lambda1+11-2
2018-11-02 20:05Merge branch 'fix_hashtag_search' into 'develop'lambda1+1-0
2018-11-02 18:55Merge branch 'bugfix/dont-break-on-empty-in-reply-to' into 'develop'lambda2+17-0
2018-11-01 14:14Merge branch 'hotfix/prismo-twitterapi' into 'develop'Haelwenn1+1-1
2018-11-01 10:48Merge branch 'feature/as2-page-support' into 'develop'kaniini4+4-4
2018-11-01 09:31Merge branch 'bugfix/filter-id' into 'develop'kaniini3+110-11
2018-11-01 09:10Merge branch 'feature/relay-tests' into 'develop'kaniini9+125-8
2018-11-01 09:05Merge branch 'bugfix/prismo.news_article_url' into 'develop'Haelwenn2+23-1
2018-11-01 08:51Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini7+59-15
2018-11-01 07:43Merge branch 'refactor/object-cache-deletion' into 'develop'kaniini4+41-5
2018-11-01 05:58Merge branch 'bugfix/caching-activity-delete' into 'develop'Haelwenn1+2-1
2018-10-31 22:36Merge branch 'bugfix/allow-self-like' into 'develop'kaniini1+0-2
2018-10-30 23:22Merge branch 'allow-abbr' into 'develop'kaniini1+2-0
2018-10-30 20:30Merge branch 'reactivate' into 'develop'kaniini5+20-5
2018-10-29 20:14Merge branch 'feature/upload-limits' into 'develop'kaniini6+103-56
2018-10-29 18:07Merge branch 'feature/s3-force-media-proxy' into 'develop'kaniini3+17-4
2018-10-29 17:33Merge branch 'bugfix/mediaproxy-leaks-2-electric-boogaloo' into 'develop'kaniini1+2-0
2018-10-29 15:28Merge branch 'bugfix/mediaproxy-leaks' into 'develop'kaniini2+5-4
2018-10-28 19:54Merge branch 'feature/unsubscribe-user-task' into 'develop'kaniini1+32-0
2018-10-28 05:52Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'kaniini1+3-2
2018-10-28 05:49Merge branch 'psql-setup-cleanup' into 'develop'kaniini1+2-5
2018-10-26 19:03Merge branch 'update-pleroma-frontend' into 'develop'kaniini15+76-56
2018-10-26 06:45Merge branch 'feature/broken-thread-filtering' into 'develop'kaniini4+85-1
2018-10-26 06:39Merge branch 'bugfix/http-fd-exhaustion-mediaproxy' into 'develop'kaniini1+1-1
2018-10-26 03:14Merge branch 'bugfix/fd-exhaustion' into 'develop'kaniini1+2-1
2018-10-26 01:36Merge branch 'bugfix/unshared-inbox-check' into 'develop'kaniini1+5-0
2018-10-25 23:49Merge branch 'feature/nodeinfo-frontend-config' into 'develop'kaniini1+20-4
2018-10-25 18:24Merge branch 'finmoji-optional' into 'develop'kaniini2+10-3
2018-10-25 05:30Merge branch 'bugfix/user-inbox-bcc' into 'develop'kaniini4+74-3
2018-10-25 04:38Merge branch 'bugfix/ap-uri-user-search' into 'develop'kaniini1+2-0
2018-10-25 04:35Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'Haelwenn2+30-6
2018-10-25 04:16Merge branch 'feature/add-in-reply-to-profileurl' into 'develop'kaniini5+20-14
2018-10-25 03:11Merge branch 'feature/in-reply-to-screen-name' into 'develop'kaniini5+28-0
2018-10-25 00:16Merge branch 'update-pleroma-frontend' into 'develop'kaniini14+59-56
2018-10-25 00:15Merge branch 'security/add-security-directives-to-systemd-example' into 'develop'kaniini1+10-0
2018-10-23 00:56Merge branch 'bugfix/html-scrub-comments' into 'develop'kaniini1+2-4
2018-10-23 00:50Merge branch 'new-frontend-options' into 'develop'kaniini2+6-2
2018-10-20 10:14Merge branch 'pleroma-list-belongs' into 'develop'eal4+46-0
2018-10-18 14:36Merge branch 'bugfix/html-scrub-schemes' into 'develop'kaniini3+34-31
2018-10-17 19:33Merge branch 'bugfix/osada-mention' into 'develop'kaniini5+153-1
2018-10-17 04:24Merge branch 'import-maybe-direct-follow' into 'develop'Haelwenn1+1-1
2018-10-14 20:42Merge branch 'feature/markdown-enable-tags' into 'develop'kaniini1+1-0
2018-10-14 19:29Merge branch 'security/clear-oauth-with-password' into 'develop'kaniini5+77-2
2018-10-11 10:56Merge branch 'security/fix-local-locked-accounts' into 'develop'kaniini2+19-1
2018-10-10 08:00Merge branch 'bugfix/length-enforce-subjects' into 'develop'kaniini1+2-1
2018-10-07 01:34Merge branch 'feature/mrf-transparency-opt-out' into 'develop'Haelwenn2+19-14
2018-10-07 01:16Merge branch 'security/follow-always-async' into 'develop'kaniini7+53-32
2018-10-07 01:10Merge branch 'patch-2' into 'develop'kaniini1+1-1
2018-10-07 01:09Merge branch 'update-pleroma-frontend' into 'develop'kaniini13+55-55
2018-10-05 21:17Merge branch 'revert-d31bbb1c' into 'develop'kaniini10+93-9
2018-10-05 20:41Merge branch 'feature/nodeinfo_federation_info' into 'develop'kaniini1+29-1
2018-09-30 05:32Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'kaniini1+1-1
2018-09-28 19:20Merge branch 'bugfix/magnet-links' into 'develop'Haelwenn2+11-10
2018-09-28 09:25Merge branch 'feature/twitter_api/fields' into 'develop'Haelwenn2+43-5
2018-09-28 00:51Merge branch 'bugfix/object-fetching-handle-mrf-reject' into 'develop'kaniini1+3-0
2018-09-28 00:14Merge branch 'security/ap-unsigned-create' into 'develop'kaniini1+17-7
2018-09-27 20:25Merge branch 'bugfix/kroeg' into 'develop'kaniini8+185-47
2018-09-24 14:17Merge branch 'fix/s3/filenames-with-spaces' into 'develop'kaniini1+5-1
2018-09-22 05:08Merge branch 'update/pleroma-fe-20180922' into 'develop'kaniini13+55-55
2018-09-22 03:50Merge branch 'feature/html-scrub-policy-tests' into 'develop'kaniini2+82-0
2018-09-22 03:30Merge branch 'followup/twitterapi-no-rich-text-field' into 'develop'kaniini2+10-5
2018-09-22 03:08Merge branch 'feature/rich-text-optout-backend' into 'develop'kaniini10+68-26
2018-09-21 00:00Merge branch 'feature/dynamic-user-refresh' into 'develop'kaniini4+47-30
2018-09-20 23:54Merge branch 'task-204-on-options-request' into 'develop'kaniini1+8-0
2018-09-20 16:24Merge branch 'bump-mastofe-2018-09-20' into 'develop'Haelwenn3069+6204-3199
2018-09-20 14:54Merge branch 'feature/mastodon_api_2.5.0' into 'develop'Haelwenn6+15-8
2018-09-19 04:58twitter api: fix mimetype fallback when attachments use a URI instead of a URL objectWilliam Pitcock1+1-1
2018-09-19 04:57mastodon api: default attachment type to image if one is not presentWilliam Pitcock1+1-1
2018-09-19 03:53Merge branch 'fix/fake-filters' into 'develop'Haelwenn2+0-6
2018-09-16 02:25Merge branch 'feature/mediaproxy-inline-images' into 'develop'kaniini2+48-3
2018-09-16 01:31Merge branch 'feature/mrf-scrub' into 'develop'kaniini3+32-1
2018-09-16 01:09Merge branch 'update-pleroma-frontend' into 'develop'kaniini13+55-55
2018-09-16 01:05Merge branch 'feature/html-scrub-policy' into 'develop'kaniini9+162-22
2018-09-12 18:01Merge branch 'patch-3' into 'develop'Haelwenn2+3-2
2018-09-10 02:03Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'kaniini1+3-2
2018-09-10 01:22Merge branch 'refactor/mrf-pattern-matching' into 'develop'kaniini2+88-92
2018-09-09 23:09Merge branch 'bugfix/missing-url-encoding-oauth-token-redirect' into 'develop'kaniini1+7-4
2018-09-09 13:06Merge branch 'bugfix/test-circular-reference' into 'develop'kaniini1+7-3
2018-09-09 12:15Merge branch 'update/pleroma-fe-20180909' into 'develop'kaniini20+61-65
2018-09-09 11:38Merge branch 'suggestion-api-restriction' into 'develop'kaniini3+4-1
2018-09-08 09:20Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'lambda21+595-240
2018-09-07 23:55Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'kaniini2+7-2
2018-09-07 23:55Merge branch 'improve-server-config-examples' into 'develop'kaniini4+65-23
2018-09-07 23:49Merge branch 'feature/custom_media_url' into 'develop'kaniini2+8-2
2018-09-07 23:47Merge branch 'fix/tusk' into 'develop'kaniini4+12-2
2018-09-06 06:50Merge branch 'fix/test-failure-due-to/306' into 'develop'lambda1+1-1
2018-09-05 18:20Merge branch 'fix/sign-in-with-toot' into 'develop'Haelwenn4+18-3
2018-09-03 15:00Merge branch 'feature/staff-discovery-api' into 'develop'kaniini4+39-0
2018-09-03 12:33Merge branch 'feature/mastodon_api_2.4.x' into 'develop'kaniini11+435-5
2018-09-03 12:32Merge branch 'report-chat-and-gopher-support' into 'develop'kaniini1+5-1
2018-09-03 05:54Merge branch 'nil-bio-emojis' into 'develop'kaniini2+13-1
2018-09-03 02:03Merge branch 'patch-2' into 'develop'Haelwenn1+2-0
2018-09-02 12:37Merge branch 'hotfix_broken_likes' into 'develop'kaniini2+29-1
2018-09-02 00:08Merge branch 'security/emoji-xss' into 'develop'kaniini4+19-3
2018-09-01 23:48Merge branch 'security/activitypub-spoofing' into 'develop'kaniini5+58-0
2018-09-01 21:47Merge branch 'feature/disable-config-management' into 'develop'Haelwenn2+35-25
2018-09-01 09:12Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'kaniini1+9-29
2018-09-01 08:48Merge branch 'verify-credentials-default-scope' into 'develop'kaniini3+28-3
2018-08-31 09:53Merge branch 'revert-a26d5e6b' into 'develop'lambda7+7-78
2018-08-31 04:50Merge branch 'bugfix/s3-configuration' into 'develop'kaniini1+3-1
2018-08-31 04:36Merge branch 'update/pleroma-fe-20180831' into 'develop'kaniini16+62-60
2018-08-31 04:06Merge branch 'update/pleroma-fe-config-20180831' into 'develop'kaniini2+4-0
2018-08-31 03:41Merge branch 'feature/rich-text' into 'develop'kaniini7+78-7
2018-08-30 23:06Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'kaniini1+7-0
2018-08-30 23:05Merge branch 'backendhack' into 'develop'kaniini10+227-109
2018-08-29 18:38migrations: add index creation migration and recipients_to/cc removal migrationWilliam Pitcock2+18-0
2018-08-29 18:38activity: drop recipients_to/recipients_cc fieldsWilliam Pitcock2+2-6
2018-08-29 18:33migrations: drop filler migrationWilliam Pitcock1+0-25
2018-08-29 18:32activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.William Pitcock1+4-4
2018-08-29 14:43Merge branch 'fix-mastodon-notifications-without-nickname' into 'develop'Haelwenn1+8-2
2018-08-29 09:23streamer: contain list updates in the same way as we do with the database queryWilliam Pitcock1+19-2
2018-08-29 08:51mastodon api: use bounded AP object graph query to enforce containment of private statusesWilliam Pitcock1+7-2
2018-08-29 08:51activitypub: allow querying the activity/object graph bounded to a specific to/cc setWilliam Pitcock1+21-0
2018-08-29 08:50test: add testcase proving lists system does not leak non-public postsWilliam Pitcock1+24-0
2018-08-29 08:43migrations: add migration to fill in recipients_to/recipients_cc fieldsWilliam Pitcock1+25-0
2018-08-29 08:37activity: add recipients_to and recipients_cc fieldsWilliam Pitcock3+31-5
2018-08-28 18:54installation/pleroma.nginx: Add Content-Security-PolicyHaelwenn (lanodan) Monnier1+1-0
2018-08-28 00:29Merge branch 'feature/s3' into 'develop'kaniini5+70-2
2018-08-27 10:49Revert "enable scope options and such"William Pitcock1+2-2
2018-08-20 18:29enable scope options and suchWilliam Pitcock1+2-2
2018-08-14 17:07formattingWilliam Pitcock1+1-1
2018-08-06 11:20user: fix up notification last calculation [NOT related to upstream]William Pitcock1+6-1
2018-08-27 08:29Merge branch 'feature/relay' into 'develop'lambda13+202-7
2018-08-27 08:25Merge branch 'bugfix/announce-timeline-flooding' into 'develop'lambda3+44-7
2018-08-26 23:24Merge branch 'feature/emoji-in-local-users' into 'develop'kaniini5+61-2
2018-08-26 22:56Merge branch 'bugfix/formatting' into 'develop'kaniini1+5-2
2018-08-26 22:44Merge branch 'tests/notification-smoketests' into 'develop'kaniini1+121-0
2018-08-26 22:39Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'kaniini1+7-2
2018-08-26 21:35Merge branch 'login-with-email' into 'develop'kaniini1+10-2
2018-08-26 20:18Merge branch 'update-pleroma-frontend' into 'develop'kaniini36+60-1069
2018-08-26 20:16Merge branch 'improve-example-caddyfile' into 'develop'kaniini1+33-5
2018-08-26 20:16Merge branch 'remove-unused-settings' into 'develop'kaniini2+0-7
2018-08-25 00:20Merge branch 'feature/twitterapi-object-description' into 'develop'kaniini2+8-4
2018-08-24 22:00Merge branch 'update/pleroma-fe-20180824' into 'develop'kaniini17+59-58
2018-08-24 20:15Merge branch 'feature/tls-sni-support' into 'develop'kaniini1+24-1
2018-08-24 18:42Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'kaniini2+30-1
2018-08-24 18:27Merge branch 'config/fe-collapse-subject' into 'develop'kaniini2+5-2
2018-08-24 18:01Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'"kaniini1+1-2
2018-08-24 17:40Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'kaniini1+2-1
2018-08-23 20:56Merge branch 'fix/suggestions-api-error-handling' into 'develop'kaniini1+8-1
2018-08-23 17:09Merge branch 'develop' into 'develop'Haelwenn1+22-0
2018-08-23 01:39Merge branch 'security/activitypub-reject-bogus-ids' into 'develop'kaniini2+18-0
2018-08-22 10:09Run mix formatHaelwenn (lanodan) Monnier1+2-1
2018-08-21 23:47[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nilHaelwenn (lanodan) Monnier1+1-1
2018-08-21 23:46[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videosHaelwenn (lanodan) Monnier1+1-1
2018-08-21 16:58Merge branch 'feature/peertube_2' into 'develop'kaniini10+106-32
2018-08-21 16:56Merge branch 'sanitize-bio' into 'develop'kaniini2+3-2
2018-08-21 16:55Merge branch 'twitter-api-bios' into 'develop'kaniini4+25-16
2018-08-20 18:44Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'kaniini1+1-1
2018-08-20 18:17Merge branch 'update/pleroma-fe-20180821' into 'develop'kaniini13+23-23
2018-08-20 12:13Merge branch 'fix/redirect-on-user-fetch' into 'develop'eal1+1-1
2018-08-20 04:50Merge branch 'update/pleroma-fe-20180820' into 'develop'kaniini30+128-113
2018-08-18 18:24Merge branch 'update/pleroma-fe-20180818' into 'develop'kaniini17+58-58
2018-08-17 16:03Merge branch 'develop' into 'develop'kaniini1+1-1
2018-08-16 23:59Merge branch 'bugfix/undocumented-mastodon-app-api' into 'develop'kaniini1+5-2
2018-08-16 23:35Merge branch 'bugfix/mix-lock' into 'develop'kaniini1+9-9
2018-08-16 15:45Merge branch 'patch-2' into 'develop'kaniini1+17-17
2018-08-16 15:41Merge branch 'dev-lanodan-url-regex' into 'develop'kaniini3+42-6
2018-08-16 15:38Merge branch 'mastofe/system-font' into 'develop'kaniini1+1-1
2018-08-16 15:20Merge branch 'bugfix/federation-kroeg' into 'develop'kaniini5+95-1
2018-08-16 15:19Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'kaniini3+48-7
2018-08-16 15:17Merge branch 'fix/normalize-file-extension' into 'develop'kaniini3+40-13
2018-08-15 07:47Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'lambda4+53-1
2018-08-12 17:42formattinglain1+4-3
2018-08-12 16:41Fix for elixir 1.7.lain1+2-2
2018-08-12 16:16update frontendlain30+102-79
2018-08-12 13:29Update Mastofe.lain192+363-1606
2018-08-12 12:04Merge branch 'feature/invites' into 'develop'lambda6+177-14
2018-08-12 10:55Merge branch 'fix/remote-follow-errormessage' into 'develop'lambda1+9-0
2018-08-12 10:55Merge branch 'bugfix/gopher-empty-lines' into 'develop'lambda1+2-2
2018-08-12 10:41Merge branch 'emoji-in-account-view' into 'develop'lambda4+78-4
2018-08-10 13:45Merge branch 'bugfix/fix-gopher-server-i' into 'develop'lambda1+1-1
2018-08-06 18:07Merge branch 'bugfix/duplicate-follow-requests' into 'develop'lambda1+1-0
2018-08-06 18:07Merge branch 'feature/camelcase-hashtags' into 'develop'lambda1+2-2
2018-08-01 10:37Merge branch 'bugfix/digest-legacy-compat' into 'develop'lambda1+5-1
2018-08-01 08:11Merge branch 'security/digest-signature-validation' into 'develop'lambda4+29-2
2018-07-25 07:16Merge branch 'feature/filter_exif' into 'develop'lambda5+35-2
2018-07-19 07:35Merge branch 'tests/plume' into 'develop'lambda5+47-13
2018-07-19 07:31Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'lambda2+38-6
2018-07-19 07:31Merge branch 'feature/fe-configuration' into 'develop'lambda4+36-3
2018-07-18 08:52Merge branch 'feature/media-description' into 'develop'lambda6+41-8
2018-07-12 16:48Merge branch 'feature/object-normalization' into 'develop'lambda12+28-34
2018-07-12 16:47Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'lambda1+6-5
2018-07-12 16:46Merge branch 'bugfix/activitypub-object-actor' into 'develop'lambda1+18-2
2018-07-12 16:45Merge branch 'feature/message-summary' into 'develop'lambda4+8-4
2018-07-12 05:59Merge branch 'feature/default-scope' into 'develop'lambda4+24-6
2018-07-12 05:58Merge branch 'feature/article-support' into 'develop'lambda6+58-22
2018-07-12 05:56Merge branch 'feature/auto-shortcodes' into 'develop'lambda2+24-1
2018-07-12 05:55Merge branch 'bugfix/status-url-field' into 'develop'lambda1+1-2
2018-07-12 05:54Merge branch 'bugfix/x509-public-key' into 'develop'lambda2+2-2
2018-06-27 12:48Merge branch 'features/initial-state_rights' into 'develop'lambda1+3-0
2018-06-25 08:45Merge branch 'fix/mutes.json-emptyarray' into 'develop'lambda3+25-0
2018-06-25 06:12Merge branch 'feature/configurable-blocks' into 'develop'lambda4+45-7
2018-06-24 13:28Merge branch 'feature/application-xml-mime' into 'develop'lambda1+1-0
2018-06-24 13:17Merge branch 'features/glitch-soc-frontend' into 'develop'lambda5+67-2
2018-06-21 07:09Merge branch 'feature/mrf-simple-accept-lists' into 'develop'lambda3+16-3
2018-06-19 09:50Merge branch 'features/column_media_streaming' into 'develop'lambda2+18-2
2018-06-19 09:42Merge branch 'bugfix/block-follow-relationships' into 'develop'lambda4+109-5
2018-06-19 05:15Merge branch 'feature/exclude-replies-filter' into 'develop'lambda2+18-0
2018-06-19 05:13Merge branch 'bugfix/as2-contentmap' into 'develop'lambda3+89-0
2018-06-17 10:33Merge branch 'patch-2' into 'develop'lambda1+2-0
2018-06-16 10:39Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'lambda3+99-3
2018-06-15 20:43Merge branch 'bugfix/mastofe_thread_render' into 'develop'eal2+4-4
2018-06-15 20:01Fix typolain1+1-1
2018-06-14 19:11Merge branch 'fix/missing-file-extension' into 'develop'lambda2+37-5
2018-06-14 13:55Merge branch 'fix/mp3-recognition' into 'develop'lambda1+3-0
2018-06-14 07:23Merge branch 'patch-2' into 'develop'lambda1+0-1
2018-06-14 07:20Merge branch 'bugfix/mrf-orphaning' into 'develop'lambda1+13-8
2018-06-14 07:19Merge branch 'feature/twitterapi-unrepeat' into 'develop'lambda9+63-16
2018-06-14 07:14Merge branch 'bugfix/oauth2-param-name' into 'develop'lambda1+13-1
2018-06-14 07:13Merge branch 'bugfix/oauth-password-with-email' into 'develop'lambda1+1-1
2018-06-14 07:12Merge branch 'bugfix/mastodon-streaming-blocks' into 'develop'lambda1+30-15
2018-06-13 07:18Merge branch 'feature/webfinger-rfc7033-compliant' into 'develop'lambda1+1-1
2018-06-13 07:02Merge branch 'bugfix/webfinger-refactoring' into 'develop'lambda1+6-24
2018-06-12 17:37update frontendlain18+60-58
2018-06-12 12:42set_moderator: ensureall applications are started.eal1+1-1
2018-06-12 12:11Merge branch 'patch-2' into 'develop'lambda1+0-0
2018-06-12 08:26Merge branch 'develop' into 'develop'lambda4+112-44
2018-06-12 07:19Merge branch 'feature/list-streaming' into 'develop'lambda6+56-3
2018-06-12 07:18Merge branch 'feature/locked-accounts-part-1' into 'develop'lambda12+474-11
2018-06-12 07:12Merge branch 'patch-2' into 'develop'lambda1+13-3
2018-06-11 19:59Merge branch 'fix/mix-task-caching' into 'develop'eal1+1-1
2018-06-11 11:19Merge branch 'feature/domain-blocks' into 'develop'lambda7+115-3
2018-06-08 11:10Merge branch 'users' into 'develop'lambda2+17-10
2018-06-08 11:08Merge branch 'feature/rejectnonpublic' into 'develop'lambda1+29-0
2018-06-08 06:02Merge branch 'mastopost' into 'develop'lambda1+10-1
2018-06-08 05:10Merge branch 'bugfix/locked-account-regression' into 'develop'lambda3+27-3
2018-06-07 14:44Merge branch 'feature/quarantine' into 'develop'lambda2+16-1
2018-06-07 14:42Merge branch 'import' into 'develop'lambda3+52-37
2018-06-06 16:44Merge branch 'bugfix/webfinger-xml-crash' into 'develop'lambda3+8-4
2018-06-06 08:27Merge branch 'fix/oauth-http-basic' into 'develop'lambda3+156-14
2018-06-05 21:18Merge branch 'fix/emoji-picker' into 'develop'eal1+1-0
2018-06-03 19:52Merge branch 'develop' into 'develop'lambda1+18-0
2018-06-03 19:04Better error handling for OstatusController.lain2+108-37
2018-06-03 17:58Better error handling for ActivityPubControllerlain3+11-8
2018-06-03 17:28Better error handling for MastodonApiController.lain2+24-4
2018-06-03 17:11Better error handling in TwitterApiController.lain5+54-14
2018-06-02 17:45Revert "Update Mastofe."lain182+1580-360
2018-06-02 14:11Update Mastofe.lain182+360-1580
2018-06-02 13:39Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+11-5
2018-05-30 18:00Fix url guessing attacks.lain4+74-4
2018-05-30 12:31Merge branch 'fix/dm-timeline-activities' into 'develop'eal1+3-1
2018-05-29 10:58Merge branch 'patch-3' into 'develop'lambda1+1-0
2018-05-29 10:58Merge branch 'fix/link-headers' into 'develop'lambda1+32-10
2018-05-28 10:39Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+6-4
2018-05-28 10:38Only return certain activities in TwitterAPI mentions.lain1+5-0
2018-05-26 19:06Fix user topic streaming.lain1+1-1
2018-05-26 14:26Merge branch 'csaurus/pleroma-feature/mstdn-direct-api' into developlain8+158-8
2018-05-26 13:20There are no symbols in JSON.lain1+1-1
2018-05-26 13:15Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into developlain13+327-30
2018-05-26 09:50Merge branch 'feature/mastodon-s2s-block-opt-out' into 'develop'lambda2+9-2
2018-05-25 07:15Merge branch 'feature/blocks-deny-refollow' into 'develop'lambda2+29-15
2018-05-25 07:13Merge branch 'bugfix/follow-query-overhead' into 'develop'lambda2+15-5
2018-05-24 20:22Merge branch 'feature/lists' into 'develop'lambda8+439-2
2018-05-24 19:52Merge branch 'feature/incoming-remote-unfollow' into 'develop'lambda18+475-62
2018-05-24 17:25update frontendlain9+17-17
2018-05-24 17:16Merge branch 'feature/change-password' into 'develop'lambda5+106-6
2018-05-24 10:44More efficient queries.lain2+5-3
2018-05-23 15:25Don't save double tags in AP objects we createlain2+14-1
2018-05-23 09:03Merge branch 'feature/deps-migration' into 'develop'lambda10+42-49
2018-05-22 14:26Repair some access-control headers required for third-party webclientsNiklas Poslovski1+2-2
2018-05-22 14:02Merge branch 'nipos-develop' into developlain1+1-0
2018-05-21 21:20Merge branch 'feature/clarify-http-sig-error' into 'develop'lambda1+1-1
2018-05-21 13:58Merge branch 'bugfix/webfinger-statusnet' into 'develop'lambda4+18-1
2018-05-21 10:32Actually fix missing alias.lain1+1-1
2018-05-21 10:09Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+1-1
2018-05-21 10:09Add missing alias.lain1+1-0
2018-05-20 17:26More fixes.lain1+2-1
2018-05-20 17:22Fix specs.lain1+2-1
2018-05-20 16:29update frontendlain38+284-36
2018-05-20 16:01Return visilility in twitter api, too.lain2+5-3
2018-05-20 14:15Return private / direct posts on user timelines, too.lain4+60-25
2018-05-20 11:24update frontendlain9+17-17
2018-05-20 10:57Merge branch 'feature/account-deletion' into 'develop'lambda5+66-0
2018-05-20 10:55Merge branch 'feature/undo-like-federation' into 'develop'lambda9+125-10
2018-05-19 09:31Merge branch 'feature/webfinger-mime-ld-json' into 'develop'lambda4+29-0
2018-05-19 09:30Merge branch 'feature/remote-user-deactivation' into 'develop'lambda2+27-0
2018-05-19 09:27Fix linking problem.lain2+8-0
2018-05-19 09:17Merge branch 'bugfix/hubzilla-compat' into 'develop'lambda11+126-14
2018-05-16 15:55Fix User search.lain5+54-13
2018-05-16 11:02update frontendlain20+62-57
2018-05-13 11:02Fix format.lain1+4-1
2018-05-13 10:54Modify sort index for activities.lain1+9-0
2018-05-13 10:38Revert "Remove 'unlisted' handling for now."lain2+1-3
2018-05-13 10:07Remove 'unlisted' handling for now.lain2+3-1
2018-05-13 09:59Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain14+280-26
2018-05-13 09:58Unlisted fetching: Reverse logiclain1+1-1
2018-05-13 09:19Merge branch 'kaniini/pleroma-bugfix/unlisted-statuses' into developlain2+23-1
2018-05-13 08:39Merge branch 'patch-2' into 'develop'lambda1+10-0
2018-05-13 08:34Merge branch 'feld-varnish' into 'develop'lambda1+2-3
2018-05-13 08:24Merge branch 'feature/chain-policies' into 'develop'lambda5+33-3
2018-05-13 08:16Merge branch 'no-self-notification' into 'develop'lambda3+12-2
2018-05-11 07:18Merge branch 'patch-1' into 'develop'lambda1+0-1
2018-05-07 16:11More warning fixes.lain6+15-7
2018-05-06 18:43Merge branch 'feld-varnish' into 'develop'lambda1+2-8
2018-05-06 18:42Merge branch 'feld-warnings' into 'develop'lambda30+97-107
2018-05-06 18:41Merge branch 'fix/unsafe-variables' into 'develop'lambda5+50-35
2018-05-05 11:41Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+9-0
2018-05-05 11:40Streamer: Don't send out stream events for blocked users.lain2+83-14
2018-05-05 11:40Unify wss uri generation.lain1+1-1
2018-05-05 09:15Idempotency: Use special cache, keep for 6 hours.lain3+30-7
2018-05-04 21:16Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+69-0
2018-05-04 21:15update frontendlain1+2-2
2018-05-04 19:15Don't expire idempotency cache for five minutes.lain2+6-0
2018-05-04 18:30MastodonAPI: Support idempotency key.lain2+32-3
2018-04-29 14:56update frontendlain10+20-19
2018-04-29 09:28Fix format.lain2+10-12
2018-04-29 09:26Merge branch 'patch-bio' into 'develop'lambda2+18-1
2018-04-28 14:10Insert object after being rewritten.lain1+5-3
2018-04-28 13:49Merge branch 'fix/blocked-user-boosts' into 'develop'lambda2+23-1
2018-04-27 05:49Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'lambda1+2-1
2018-04-26 05:07Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+1-1
2018-04-26 05:06Resurrect instance specific panel.lain1+1-1
2018-04-25 14:10Optionally deactivate public timelines.lain2+22-13
2018-04-25 13:41Align local bio limits to remote limit.lain1+1-1
2018-04-24 19:26Merge branch 'gitignore' into 'develop'lambda1+5-0
2018-04-24 19:25Fix formatting.lain1+12-4
2018-04-24 17:21Merge branch 'feature/message-rewrite-facility' into 'develop'lambda5+93-2
2018-04-24 12:28Update .gitlab-ci.ymllambda1+1-0
2018-04-24 12:25Merge branch 'dashie/pleroma-fix/delete-decrement-statuses-count' into developlain3+31-1
2018-04-24 05:54Merge branch 'favicon_tag' into 'develop'lambda1+1-1
2018-04-23 17:23update frontendlain9+17-17
2018-04-23 17:09update frontendlain10+18-18
2018-04-22 08:01Small cleanup.lain3+9-3
2018-04-22 07:56Merge branch 'develop' into fix/note-count-not-updatinglain2+19-9
2018-04-21 09:58Update note count in ActivityPub.create.eal3+15-16
2018-04-21 08:05Merge branch '146-enable-custom-panel-by-default-and-have-default-content' into 'develop'lambda2+3-2
2018-04-21 08:05Merge branch 'readme-update' into 'develop'lambda1+10-4
2018-04-21 07:59Merge branch 'nginx-certbot-doc' into 'develop'lambda1+10-1
2018-04-21 07:43Formatting fixes.lain6+24-11
2018-04-21 07:34add formatterlain1+3-0
2018-04-21 07:30.lain1+1-3
2018-04-21 07:28.lain1+1-0
2018-04-21 07:27..lain1+1-0
2018-04-21 07:24Update CI.lain1+1-1
2018-04-21 07:22Make search use id index too.lain1+1-1
2018-04-20 11:10Formatting.lain4+48-22
2018-04-20 11:09Add format checking to CI.lain1+6-0
2018-04-19 19:44Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain6+194-3
2018-04-19 19:44fix againlain1+1-1
2018-04-19 11:04fix againlain1+1-1
2018-04-19 10:50Fix generate configlain1+0-8
2018-04-19 10:29Revert "Ask for proxy URL if proxy enabled."eal2+1-9
2018-04-19 07:41Merge branch 'bugfix/strange-formatting-on-mastodon' into 'develop'lambda1+1-0
2018-04-18 14:52rm_user: also ensure that cache is running.eal1+1-1
2018-04-18 14:41Merge branch 'fix/rm-user-task' into 'develop'lambda1+2-2
2018-04-18 11:26Merge branch 'fix/login-with-username-or-email' into 'develop'lambda5+11-4
2018-04-17 09:09update frontendlain29+192-76
2018-04-13 09:46Update README.mdlambda1+4-0
2018-04-13 07:43Merge branch 'mix_task_rm_user' into 'develop'lambda1+14-0
2018-04-11 20:58Merge branch 'develop' into 'develop'lambda2+19-3
2018-04-11 20:03update frontendlain17+57-57
2018-04-11 19:55update frontendlain31+131-110
2018-04-11 14:27Merge branch 'feld-hackneyupdate' into 'develop'lambda2+9-8
2018-04-10 19:05Fix register_user task.lain1+1-1
2018-04-10 16:38Order masto searches by date.lain1+34-30
2018-04-10 14:46Merge branch 'mastofe-250c885de655ed0b45b76cc35c5782e019b5a0ec' into 'develop'lambda71+404-111
2018-04-10 14:45Merge branch 'feld-varnish' into 'develop'lambda1+0-4
2018-04-10 08:14Merge branch 'patch-1' into 'develop'lambda1+24-25
2018-04-09 08:42Merge branch 'bugfix/user-search-with-at-sign' into 'develop'lambda1+3-0
2018-04-09 08:41Merge branch 'develop' into 'develop'lambda1+24-11
2018-04-09 06:58Merge branch 'develop' into 'develop'lambda1+27-0
2018-04-08 06:02Merge branch 'feature/mastodon-api-for-tootstream' into 'develop'lambda2+3-1
2018-04-08 06:01Merge branch 'fix/persisted-mastofe-settings' into 'develop'lambda2+19-1
2018-04-07 14:41Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+15-9
2018-04-07 14:40Only search in public data for now.lain3+9-0
2018-04-07 14:35Update Readme.lain1+9-0
2018-04-06 14:35Accept port number in urls.lain2+8-1
2018-04-05 11:59MastodonAPI search: return only create activities.lain1+4-0
2018-04-05 11:15Delete Caddyfilelambda1+0-5
2018-04-05 10:54Merge branch 'develop' into 'develop'lambda2+2-2
2018-04-04 13:23TwitterAPI: Don't put follows into the public tls.lain1+2-2
2018-04-04 09:29Handle + in links.lain2+8-1
2018-04-03 16:34Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain89+142-133
2018-04-03 16:32Use user url in mention if we have it.lain2+11-3
2018-04-02 14:27Load all users at once in timelines.lain5+94-30
2018-04-02 13:29Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+5-1
2018-04-02 13:28Use context_ids directly if we have them.lain3+6-12
2018-04-02 13:17Generates contexts and ids on insertion time.lain3+42-4
2018-04-02 12:46Pre-fetch conversation ids.lain2+63-2
2018-04-02 11:15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain298+1709-139309
2018-04-02 11:13Fail faster.lain2+62-11
2018-04-02 11:13Fix some test stuff.lain2+14-10
2018-04-02 11:12Add mock.lain2+4-1
2018-04-01 12:58Respond to proper ActivityPub type.lain1+2-1
2018-03-31 19:14Use correct linefeed.lain1+1-1
2018-03-31 19:11Small fix.lain1+1-1
2018-03-31 19:10Fix typo.lain1+1-1
2018-03-31 19:09Modify newlines.lain1+1-1
2018-03-31 19:02Remove inspect.lain1+0-1
2018-03-31 19:00Proper info.lain1+7-2
2018-03-31 18:48No tabs.lain1+1-0
2018-03-31 18:02Don't fetch anything except ap_id for follower / following collections.lain3+119-19
2018-03-31 16:22Gopher: Add like / repeat count.lain1+6-1
2018-03-31 15:51Add gopher server.lain3+148-0
2018-03-31 10:52update frontendlain12+17-17
2018-03-30 14:50Remove unused ActivityRepresenter module.lain4+25-290
2018-03-30 13:49TwitterApiController: Use ActivityView.lain3+56-21
2018-03-30 13:32TwApi ActivityView: Add delete activities.lain2+46-1
2018-03-30 13:17TwApi ActivityView: Add follows.lain2+52-1
2018-03-30 13:01Format the code.lain111+5013-2871
2018-03-30 12:48Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+9-2
2018-03-30 12:46TwApi ActivityView: Add announces.lain2+59-0
2018-03-30 11:49TwApi ActivityView: Add Like rendering.lain2+66-2
2018-03-30 10:57Add ActivityViewTest.lain1+49-0
2018-03-30 10:19Fix TwApi reply visibility.lain1+2-2
2018-03-28 14:03Clean up prod.exs a bit.lain1+1-5
2018-03-28 07:56Don't go through all available emoji.lain3+8-10
2018-03-27 20:24Add basic activity view.lain3+79-7
2018-03-27 18:09Return version in instance endpoint, set version to 0.9.0.lain2+3-3
2018-03-27 17:59Fix migration.lain1+8-0
2018-03-27 17:48Drop index for 'local', it confuses the query planner.lain1+7-0
2018-03-27 16:18Reduce OP fetching queries.lain3+46-11
2018-03-27 15:43Don't try to fetch OP if none is there.lain2+13-1
2018-03-27 14:45More Jason changes.lain8+36-36
2018-03-27 14:10Add missing types.lain1+1-0
2018-03-27 14:09Switch to Jason for json handling.lain4+11-1
2018-03-27 13:22Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain3+3-3
2018-03-27 13:22Update dependencies.lain1+39-37
2018-03-26 08:31Speed up follower query.lain2+2-1
2018-03-26 07:53Add index for user follower address.lain1+8-0
2018-03-26 07:51Fix atom feed pagination.lain1+4-1
2018-03-25 17:34Fix follower collection id.lain1+1-1
2018-03-25 15:08Return "audio" info in mastodon api.lain1+1-0
2018-03-25 13:40Merge branch 'feature/oauth-token-password' into 'develop'lambda1+21-0
2018-03-24 21:49Merge branch 'bugfix/activitypub-hashtags' into 'develop'lambda3+89-0
2018-03-24 14:09Fix tests.lain2+9-2
2018-03-24 14:02Unify user fetching.lain1+2-1
2018-03-24 13:45Fetch the same data from json webfinger as from xml webfinger.lain4+32-3
2018-03-24 10:03Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain1+5-22
2018-03-24 10:03Fix hashtags.lain4+115-58
2018-03-23 18:52Strip html from emoji stuff.lain2+7-1
2018-03-23 15:07For outgoing objects, fake mastodon style ap id for ostatus.lain2+24-0
2018-03-22 11:48Merge branch 'develop' into kaniini/pleroma-feature/activitypub-endpointslain10+133-52
2018-03-22 05:23activitypub: add outbox endpointWilliam Pitcock3+63-0
2018-03-22 04:47activitypub: add restrict_limitWilliam Pitcock1+7-0
2018-03-21 17:23activitypub: implement following/followers endpointsWilliam Pitcock4+118-15
2018-03-21 06:12Fetch relayed messages from source while we don't have linked data sigs.lain1+2-1
2018-03-20 06:00Merge branch 'feld-varnish' into 'develop'lambda1+132-0
2018-03-20 05:58Merge branch 'patch-README' into 'develop'lambda1+1-0
2018-03-20 05:58Merge branch 'feld-mastoweb5000' into 'develop'lambda3+3-5
2018-03-20 05:57Merge branch 'feld-Logger' into 'develop'lambda12+22-22
2018-03-19 16:42Use connection pools.lain5+9-5
2018-03-19 09:28Only fetch if it's http.lain2+6-3
2018-03-16 05:30mastodon api: fix rendering the mentions JSONWilliam Pitcock1+2-2
2018-03-16 05:30mastodon api tests: invalidate user cache prior to importing a test replyWilliam Pitcock1+3-0
2018-03-13 17:46activitypub transmogrifier: rewrite non-http URLs using the object's external URLWilliam Pitcock2+33-0
2018-03-13 17:33Do more jobs by default.lain1+1-1
2018-03-13 17:32Only push to still valid websub subscriptions.lain1+2-1
2018-03-13 13:59Merge branch 'andarna/pleroma-develop' into developlain2+4-0
2018-03-13 07:05Fix Mastodon emojis.lain1+37-0
2018-03-12 10:30Ignore incoming empty chat messages.lain1+8-5
2018-03-11 13:47Don't validate on missing public key.lain3+9-0
2018-03-11 13:43Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+22-6
2018-03-11 13:37More signature debugging.lain4+73-27
2018-03-08 18:50update frontendlain9+16-16
2018-03-08 18:07Restrict activity fixing more.lain1+2-1
2018-03-08 18:00Update pleroma.nginxlambda1+2-0
2018-03-08 12:29Merge branch 'feature/activitypub' into 'develop'lambda79+3493-169
2018-03-05 08:27Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developlain2+6-5
2018-03-05 08:26Add way to disable federation.lain3+27-14
2018-02-21 17:33Moderator READMElain1+6-0
2018-02-21 17:33Add moderator task.lain1+27-0
2018-02-21 17:24Add password reset task.lain2+25-0
2018-02-20 17:54Allow moderators to delete posts.lain1+1-1
2018-02-20 17:44Add moderator function.lain2+22-5
2018-02-12 09:23Add missing support file.lain1+6-0
2018-02-12 09:13Make test output easier to read.lain19+82-86
2018-02-12 08:33Fix some test warnings.lain2+7-7
2018-02-12 07:15Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-pagination' into developlain3+19-2
2018-02-11 19:58update frontendlain1+4-0
2018-02-11 19:55update frontendlain14+53-52
2018-02-09 16:14update frontendRoger Braun14+21-23
2018-02-09 12:43UtilController: Fix statusnet config api compatibility.Roger Braun1+1-1
2018-02-09 08:57Merge branch 'develop' into 'develop'lambda3+20-0
2018-02-08 18:18Merge branch 'fix/config-disable-chat' into 'develop'lambda4+14-3
2018-02-08 15:03Fix compile errors on 1.4.5Roger Braun2+0-2
2018-02-07 12:44update frontendRoger Braun18+57-57
2018-02-05 22:06Update required Elixir version in READMEeal1+1-1
2018-02-05 21:57Merge branch 'fix/no-image-upload-filetype' into 'develop'eal1+1-1
2018-02-03 13:05Merge branch 'move-backend-images' into 'develop'lambda6+15-15
2018-02-02 16:14Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun11+63-15
2018-02-02 16:14Update frontend.Roger Braun14+23-21
2018-01-30 11:21Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun5+36-2
2018-01-30 11:20Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into developRoger Braun3+6-2
2018-01-29 16:45Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun31+31-0
2018-01-29 16:44Fix incoming Pleroma CWs. Closes #96.Roger Braun1+1-2
2018-01-26 14:12Update frontend.Roger Braun17+56-56
2018-01-26 13:31Fix config.Roger Braun1+1-1
2018-01-26 13:28Update frontend.Roger Braun14+23-21
2018-01-20 17:38Stats: Make less crashy and improve query.Roger Braun1+7-8
2018-01-20 15:02Merge branch 'feature/remote-follow' into 'develop'lambda7+98-1
2018-01-18 01:42Revert "Add remote follow pages."eal5+0-92
2018-01-18 01:42Revert "Add remote follow path to webfinger."eal2+1-6
2018-01-17 22:22Add remote follow pages.eal5+92-0
2018-01-16 00:17Add remote follow path to webfinger.eal2+6-1
2018-01-16 14:18Merge branch 'fix/background-profile-fetch' into 'develop'lambda2+7-5
2018-01-15 20:26Merge branch 'default-pictures' into 'develop'eal8+24-20
2018-01-15 17:44Merge branch 'prod.exs' into 'develop'eal1+6-3
2018-01-15 17:26Merge branch 'fix/pleroma.nginx' into 'develop'eal1+0-2
2018-01-15 08:04Merge branch 'stats-daemon' into 'develop'lambda5+54-7
2018-01-12 20:57Merge branch 'add-mediaproxy-question-to-configgen' into 'develop'eal2+15-1
2017-12-23 14:40Unlink follow import process from the one processing request.eal1+1-1
2017-12-22 12:07Merge branch 'media-proxy-fix-encoding' into 'develop'lambda1+0-1
2017-12-20 14:22Merge branch 'media-proxy' into 'develop'lambda10+152-11
2017-12-19 15:15Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developLain Iwakura3+39-7
2017-12-19 15:15Fix timelines in subway tooter.Lain Iwakura3+7-2
2017-12-18 15:56MastoAPI: Fix always-sensitive bugs.Lain Iwakura3+5-5
2017-12-18 15:16Send out salmons before websub.Lain Iwakura1+3-3
2017-12-18 10:59Merge branch 'feature/follow-import' into 'develop'lambda2+27-1
2017-12-11 19:01Fix some more tests.eal2+5-3
2017-12-11 16:41Fix tests.eal2+4-4
2017-12-11 16:21Merge branch 'fix/tootdon-mentions' into 'develop'lambda1+1-1
2017-12-09 09:10Merge branch 'feature/user_deletion' into developRoger Braun9+175-26
2017-12-08 12:34Merge branch 'fix/linkify' into 'develop'lambda3+22-3
2017-12-08 12:32Merge branch 'fix/mastoapi-attachment-linking' into 'develop'lambda3+8-3
2017-12-08 12:31Merge branch 'postgresetup' into 'develop'lambda4+18-7
2017-12-07 18:07Add websocket upgrade to example nginx config.eal1+3-0
2017-12-05 11:27Merge branch 'feature/chat' into 'develop'lambda23+124-60
2017-12-05 09:10Merge branch 'fix/odd-passwords' into 'develop'lambda1+1-1
2017-12-03 12:34OStatus: Add user bio as summary fieldRoger Braun2+2-0
2017-11-30 14:00Add count index for local users.Lain Iwakura1+7-0
2017-11-30 13:59MastodonAPI: Add proper user count.Lain Iwakura3+22-1
2017-11-28 16:46Merge branch 'salmon-native-keys' into 'develop'lambda1+22-9
2017-11-27 16:24Return xml notice at /notice path.Lain Iwakura3+24-0
2017-11-25 23:10Merge branch 'patch-1' into 'develop'eal1+1-1
2017-11-24 07:37Update frontend.Roger Braun13+21-21
2017-11-23 15:41More readme updates.Lain Iwakura1+7-1
2017-11-23 15:35Add mix deps.get back to readme.Lain Iwakura1+2-0
2017-11-23 15:22Add configuration generation tool, update readme.Lain Iwakura4+40-51
2017-11-23 11:06MastodonUI login: Show error message on error.Roger Braun2+8-1
2017-11-22 15:10untoot.Roger Braun1+2-3
2017-11-22 14:19Merge branch 'develop' into 'develop'lambda2+150-0
2017-11-22 13:42Update README.mdlambda1+1-1
2017-11-22 11:19Update frontend.Roger Braun17+55-55
2017-11-21 23:09Merge branch 'fix/self-follow' into 'develop'eal2+2-0
2017-11-20 20:55Merge branch 'fix/mastoapi-attachment-count' into 'develop'eal1+1-1
2017-11-20 17:16Make /api/friends/ids test deterministic.eal1+2-2
2017-11-20 16:53Treat internal emoji like external.Roger Braun4+12-9
2017-11-20 07:54MastoAPI: Add max_toot_chars.Roger Braun1+2-1
2017-11-20 07:27Merge branch 'fix/self-follow' into 'develop'lambda6+26-14
2017-11-19 14:10Federator Queue: Add seperate in/out queues.Roger Braun1+24-9
2017-11-19 12:47MastodonAPI: Streaming fixes.Roger Braun1+13-7
2017-11-19 12:31Update frontend.Roger Braun21+67-67
2017-11-19 12:23MastodonAPI: Add sign out.Roger Braun2+11-4
2017-11-19 12:07Fix flakey test.Roger Braun1+1-1
2017-11-19 11:59MastoAPI: Only return create activties in contexts.Roger Braun1+1-0
2017-11-19 11:50Merge branch 'feature/fix-warnings' into 'develop'lambda26+89-94
2017-11-18 15:58Merge branch 'formatting-fixes' into 'develop'lambda4+9-7
2017-11-18 14:38Merge branch 'fix/mastofe-login-redirect' into 'develop'eal1+1-1
2017-11-18 14:34Merge branch 'sensitive-content-bit' into 'develop'eal3+14-2
2017-11-18 11:22Don't start streamer during tests.Roger Braun1+1-1
2017-11-16 15:49MastoAPI: Implement all streaming functions.Roger Braun7+73-6
2017-11-16 12:48MastodonAPI: Stream fixes.Roger Braun3+13-3
2017-11-16 12:01Merge branch 'feature/masto-styled-login-page' into 'develop'lambda2+69-7
2017-11-16 08:40Add custom emoji to Mastodon UI initial state.Roger Braun1+8-3
2017-11-16 08:35Add mastodon emoji folder.Roger Braun2662+2661-0
2017-11-15 17:58MastoAPI: Make attachment ids strings.Roger Braun2+3-3
2017-11-14 16:47Merge branch 'twitterapi-bitlbee' into 'develop'lambda3+39-0
2017-11-14 16:44Merge branch 'twitterapi-show-user' into 'develop'lambda3+54-0
2017-11-14 14:19Merge branch 'api-links' into 'develop'lambda1+1-1
2017-11-14 14:09Merge branch 'mastoapi-media-timeline' into 'develop'lambda2+30-0
2017-11-14 08:34Update frontend.Roger Braun16+40-20
2017-11-13 08:48MastoAPI: Fix repeat api bug.Roger Braun2+3-4
2017-11-12 13:23Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into developRoger Braun7+347-24
2017-11-12 13:23Add Mastodon frontend.Roger Braun170+206703-5
2017-11-11 19:00MastoAPI: Websocket streaming for federated timeline.Roger Braun2+44</