Commit graph

  • 1c3f3a12ed
    Add characterLimit and vapidPublicKey to nodeinfo Egor Kislitsyn 2020-03-26 16:20:20 +0400
  • 112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering Ivan Tashkinov 2020-03-26 09:43:58 +0300
  • af820f8cf1 Merge branch 'benchmark_timeline' into 'develop' rinpatch 2020-03-25 18:06:00 +0000
  • de62e633d3 Merge branch '1364-notifications-sending-control' into 'develop' rinpatch 2020-03-25 18:00:24 +0000
  • ff1baae7e9 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering Ivan Tashkinov 2020-03-25 20:41:17 +0300
  • 460e41585c Further preloading (more endpoints), refactoring, tests. Ivan Tashkinov 2020-03-25 20:33:34 +0300
  • c8475cd5c6 Apply suggestion to benchmarks/load_testing/generator.ex lain 2020-03-25 15:48:15 +0000
  • d96139f789 Merge branch 'add-test-update_credentials' into 'develop' Haelwenn 2020-03-25 14:57:19 +0000
  • 9081a071ee
    Add a test for accounts/update_credentials Egor Kislitsyn 2020-03-25 18:46:17 +0400
  • be5e2c4dbb Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1). Ivan Tashkinov 2020-03-25 17:01:45 +0300
  • 3fa3d45dbe [#1364] Minor improvements / comments. Further fixes of incorrect usage of "relations" as a short form of "relationships". Ivan Tashkinov 2020-03-25 13:05:00 +0300
  • 012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control Ivan Tashkinov 2020-03-25 09:05:17 +0300
  • e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships". Ivan Tashkinov 2020-03-25 09:04:00 +0300
  • 03a18cf037
    node_info_test: Bump default features list Haelwenn (lanodan) Monnier 2020-03-24 20:39:19 +0100
  • 212c31c637
    Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions Haelwenn (lanodan) Monnier 2020-03-24 20:32:49 +0100
  • 64165d1df9
    node_info_test.exs: Add test on the default feature list Haelwenn (lanodan) Monnier 2020-03-24 20:21:27 +0100
  • 8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering Ivan Tashkinov 2020-03-24 22:15:37 +0300
  • 13cbb9f6ad Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related). Ivan Tashkinov 2020-03-24 22:14:26 +0300
  • 8eebc75c15 Merge branch 'fix/activity-deletion' into 'develop' feld 2020-03-24 19:10:32 +0000
  • f316882464 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex rinpatch 2020-03-24 18:37:53 +0000
  • aaf00f1ff5 Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex lain 2020-03-24 18:24:09 +0000
  • 74560e888e Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex lain 2020-03-24 18:20:58 +0000
  • 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop' lain 2020-03-24 17:34:13 +0000
  • 4a2538967c
    Support pagination in conversations Egor Kislitsyn 2020-03-24 20:18:27 +0400
  • d1a9716a98
    Fix activity deletion Egor Kislitsyn 2020-03-24 17:38:18 +0400
  • 3189c44a0c
    Remove some TwitterAPI endpoints Egor Kislitsyn 2020-03-24 15:21:40 +0400
  • fbf02a3722 Merge branch 'bugfix/profile-bio-newline' into 'develop' rinpatch 2020-03-23 19:32:01 +0000
  • 3bd2829e5c Benchmarks: Add timeline benchmark lain 2020-03-23 18:56:01 +0100
  • eec1fcaf55 Home timeline tests: Add failing test for relationships lain 2020-03-23 15:58:55 +0100
  • 86f2fbc81e Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering Ivan Tashkinov 2020-03-23 14:34:58 +0300
  • d931a59072 Merge branch 'support-emoji-staticfe' into 'develop' rinpatch 2020-03-23 10:43:20 +0000
  • 5a34dca8ed
    Add emoji support in statuses in staticfe Egor Kislitsyn 2020-03-23 14:03:31 +0400
  • 3c78e5f327 Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring. Ivan Tashkinov 2020-03-23 12:01:11 +0300
  • a6ee6784bc
    creating trusted app from adminFE & mix task Alexander Strizhakov 2020-02-28 11:16:40 +0300
  • c2e415143b WIP: preloading of user relations for timeline/statuses rendering (performance improvement). Ivan Tashkinov 2020-03-22 21:51:44 +0300
  • 15be6ba9c2
    AccountView: fix for other forms of <br> in bio Haelwenn (lanodan) Monnier 2020-03-22 16:38:12 +0100
  • 7dbf1ffa86 Merge branch 'fix/ecto_ssl_option' into 'develop' rinpatch 2020-03-22 14:32:40 +0000
  • 4633793bc1 Merge branch 'relationship-remove-outdated-hack' into 'develop' Haelwenn 2020-03-22 14:25:11 +0000
  • 981e015f1b Mastodon API Account view: Remove an outdated hack rinpatch 2020-03-22 17:10:37 +0300
  • fc2eb1fbd6
    Fix formatter warnings Egor Kislitsyn 2020-03-20 22:16:57 +0400
  • 80e1571610
    Merge branch 'develop' into global-status-expiration Egor Kislitsyn 2020-03-20 22:08:34 +0400
  • 7f9b5284fa
    updating clear_config Alexander Strizhakov 2020-03-20 20:58:47 +0300
  • 9bae9b1b1b
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-20 20:47:54 +0300
  • cb8236cda6
    Add embeddable posts Egor Kislitsyn 2020-03-20 21:19:34 +0400
  • d74405fc1a Merge branch 'fix-feed-pagination' into 'develop' lain 2020-03-20 16:57:51 +0000
  • d23e81903d Merge branch 'clear-config-test-improvements' into 'develop' lain 2020-03-20 16:54:55 +0000
  • 1c05f539aa Improved in-test clear_config/n applicability (setup / setup_all / in-test usage). Ivan Tashkinov 2020-03-20 18:33:00 +0300
  • 0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements Ivan Tashkinov 2020-03-20 18:08:23 +0300
  • 5efa5b0c4a Merge branch 'feature/1206-restrict-unauthenticated' into 'develop' lain 2020-03-20 14:40:08 +0000
  • 6c1232b486 NotificationController: Fix test. lain 2020-03-20 15:00:28 +0100
  • 1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 lain 2020-03-20 14:52:58 +0100
  • fe15f0ba15
    restrict_unauthenticated setting Alexander Strizhakov 2020-03-20 13:04:37 +0300
  • d63dca8d99 Merge branch 'feature/1635-notifications-include-types' into 'develop' lain 2020-03-20 13:27:29 +0000
  • 98a60df41f
    include_types parameter in /api/v1/notifications Alexander Strizhakov 2020-03-18 17:37:54 +0300
  • a8aa917530
    Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity Haelwenn (lanodan) Monnier 2020-03-19 19:25:50 +0100
  • 952cb589f4 Merge branch 'fix-testing' into 'develop' lain 2020-03-19 18:10:39 +0000
  • c1fd4f6653
    transmogrifier.ex: rework fix_attachment for better IR Haelwenn (lanodan) Monnier 2020-03-19 19:10:03 +0100
  • 9b9d67bbec Fix linting. lain 2020-03-19 18:16:12 +0100
  • 3c2c32b460 Merge branch 'remake-remodel' into develop lain 2020-03-19 18:00:55 +0100
  • a8c6933ca0 remove federated testing stwf 2020-03-19 12:25:36 -0400
  • 7d275970ab Add emoji reactions to features in nodeinfo Mark Felder 2020-03-19 10:08:11 -0500
  • f9d622d25a
    WIP Haelwenn (lanodan) Monnier 2020-03-19 15:08:49 +0100
  • ec3719f539 Improved in-test config management functions. Ivan Tashkinov 2020-03-18 20:30:31 +0300
  • 51ce0813d3
    Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun Alexander Strizhakov 2020-03-18 14:08:40 +0300
  • f9ecb513fa
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-18 14:08:21 +0300
  • 69341cbcba Merge branch 'feature/1530-removing-with_move' into 'develop' rinpatch 2020-03-18 10:12:50 +0000
  • d3cf7e19fb
    activity_pub_controller_test.exs: test posting with AP C2S uploaded media Haelwenn (lanodan) Monnier 2020-03-17 13:02:10 +0100
  • 4705590f76 Fix ssl option on Ecto config breaking release Cevado 2020-03-16 22:02:01 -0300
  • b17d8d305f Enable Gun adapter by default Mark Felder 2020-03-16 15:39:34 -0500
  • 7438833685 [#1364] Improved notification-related tests. Ivan Tashkinov 2020-03-16 21:58:10 +0300
  • 13cce9c0de Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials. eugenijm 2020-01-31 21:07:46 +0300
  • e4380afc18 Merge branch 'docs/mrf_object_age' into 'develop' Haelwenn 2020-03-16 17:42:10 +0000
  • d198e7fa2a Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password eugenijm 2020-01-28 09:47:59 +0300
  • f3791add99
    removing with_move parameter Alexander Strizhakov 2020-03-16 20:05:21 +0300
  • 8dd01b24d2 Improve documentation of mrf_object_age Mark Felder 2020-03-16 11:44:53 -0500
  • 0e07c5ef57 Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control Ivan Tashkinov 2020-03-16 17:58:42 +0300
  • b80958d4e3 Merge branch 'feat/templates' into 'develop' rinpatch 2020-03-16 14:32:23 +0000
  • 7829de6da4 gitlab: create templates for bug reports and release MRs rinpatch 2020-03-16 17:26:28 +0300
  • bf474ca3c1
    fix Alexander Strizhakov 2020-03-16 16:23:49 +0300
  • 35471205f8
    temp fix for :gun.info MatchError Alexander Strizhakov 2020-03-16 15:47:25 +0300
  • 5ad54d1bd5
    Merge remote-tracking branch 'origin/develop' into global-status-expiration Egor Kislitsyn 2020-03-16 16:31:15 +0400
  • 3805e09b9c
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-16 14:35:27 +0300
  • 421e35b578
    Merge branch 'develop' into global-status-expiration Egor Kislitsyn 2020-03-16 15:31:31 +0400
  • ac5c2b66b9 Merge branch 'fix-warnings-in-tests' into 'develop' rinpatch 2020-03-16 11:27:10 +0000
  • f0651730bd
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-16 14:25:55 +0300
  • dc2ec84c0f
    warnings fix Alexander Strizhakov 2020-03-16 14:19:36 +0300
  • c2527b8c63 Merge branch 'removing-deprecated' into 'develop' rinpatch 2020-03-16 11:08:06 +0000
  • ba90a6d3e5
    removing from descriptions.exs deprecated settings Alexander Strizhakov 2020-03-16 14:01:35 +0300
  • 89e4b3ebbd
    fix for content-type header for tag feed Alexander Strizhakov 2020-03-13 17:58:14 +0300
  • 91870c8995
    adding rss for user feed Alexander Strizhakov 2020-03-13 17:41:26 +0300
  • 26e2076659
    fix for feed page pagination Alexander Strizhakov 2020-03-10 18:11:48 +0300
  • bb49d8f5a0 Merge branch 'release/2.0.1' into 'stable' rinpatch 2020-03-15 21:54:24 +0000
  • 8d15d6c3ab CHANGELOG.md: Add upgrade notes for 2.0.1 rinpatch 2020-03-16 00:50:03 +0300
  • be500f8c88 CHANGELOG.md: Add remaining entries for 2.0.1 rinpatch 2020-03-16 00:18:16 +0300
  • e25197788f static-fe tests: fix to work on stable rinpatch 2020-03-16 00:17:28 +0300
  • c46d035f7b rate limiter: disable based on if remote ip was found, not on if the plug was enabled rinpatch 2020-03-13 21:15:42 +0300
  • 9d09755291 rip out fetch_initial_posts rinpatch 2020-03-14 15:39:58 +0300
  • fcf51a77ba Merge branch 'features/staticfe-sanitization' into 'develop' rinpatch 2020-03-15 19:53:52 +0000
  • 34fd1c2c9d Merge branch 'bugfix/earmark_renderer_test' into 'develop' rinpatch 2020-03-15 20:04:31 +0000
  • df2608ebf8 Merge branch 'features/staticfe-sanitization' into 'develop' rinpatch 2020-03-15 19:53:52 +0000