Commit Graph

  • b607ae1a1c
    removing grouped reports admin api endpoint Alexander Strizhakov 2020-03-30 13:50:00 +03:00
  • 1fcdcb12a7
    updating gun with bug fix Alexander Strizhakov 2020-03-30 12:47:12 +03:00
  • 2afc7a9112
    changelog fix Alexander Strizhakov 2020-03-30 12:16:45 +03:00
  • f497cf2f7c
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-30 12:15:23 +03:00
  • 96e2796557
    use in timelines benchmark new user generator Alexander Strizhakov 2020-03-30 11:59:14 +03:00
  • 56503c385e
    fix Alexander Strizhakov 2020-03-17 13:47:13 +03:00
  • 1f29ecdcd7
    sync with develop Alexander Strizhakov 2020-02-18 12:19:10 +03:00
  • eb9744cade
    activities generation tasks Alexander Strizhakov 2020-01-14 14:42:30 +03:00
  • e999c67cee Merge branch 'feature/funkwhale-audio' into 'develop' Haelwenn 2020-03-29 19:18:22 +00:00
  • dfd2c74184 Merge branch 'develop' into issue/1276 Maksim Pechnikov 2020-03-29 06:57:34 +03:00
  • 8e68127004 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-28 11:27:13 -05:00
  • be9d18461a FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.). Ivan Tashkinov 2020-03-28 18:49:03 +03:00
  • 4e81b4b190 Merge branch 'relations-preloading-for-statuses-rendering' into 'develop' lain 2020-03-27 19:14:46 +00:00
  • dfbc05d496 Misc refactoring / tweaks (ThreadMute.exists?/2). Ivan Tashkinov 2020-03-27 08:01:03 +03:00
  • 6b793d3f83 Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering). Ivan Tashkinov 2020-03-26 21:54:01 +03:00
  • 29ab1d9f8d Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 lain 2020-03-26 17:24:10 +01:00
  • 69fc1dd69f Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex lain 2020-03-26 14:45:28 +00:00
  • 0c60c0a76a Validators: Use correct type for IDs. lain 2020-03-26 15:44:14 +01:00
  • 0adaab8e75 Bump copyright dates. lain 2020-03-26 15:37:42 +01:00
  • eaacc64839 Refactors. lain 2020-03-26 15:33:10 +01:00
  • ee979dd6d7 Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 lain 2020-03-26 15:24:06 +01:00
  • d7aa0b645b Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex lain 2020-03-26 14:23:19 +00:00
  • 4cf1007a7d ActivityPub: Small refactor. lain 2020-03-26 15:16:54 +01:00
  • 94a6590e3c
    Partially restore /api/statusnet/config.json Egor Kislitsyn 2020-03-26 17:59:45 +04:00
  • 1c3f3a12ed
    Add characterLimit and vapidPublicKey to nodeinfo Egor Kislitsyn 2020-03-26 16:20:20 +04:00
  • 112101ca52 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering Ivan Tashkinov 2020-03-26 09:43:58 +03:00
  • ee97e39346 Bump copyright Your New SJW Waifu 2020-03-25 15:07:49 -05:00
  • 1fbb50ca2d Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-25 15:05:57 -05:00
  • 98472b04bf Add sponsorship mrf Your New SJW Waifu 2020-03-25 14:59:24 -05:00
  • af820f8cf1 Merge branch 'benchmark_timeline' into 'develop' rinpatch 2020-03-25 18:06:00 +00:00
  • de62e633d3 Merge branch '1364-notifications-sending-control' into 'develop' rinpatch 2020-03-25 18:00:24 +00:00
  • ff1baae7e9 Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering Ivan Tashkinov 2020-03-25 20:41:17 +03:00
  • 460e41585c Further preloading (more endpoints), refactoring, tests. Ivan Tashkinov 2020-03-25 20:33:34 +03:00
  • c8475cd5c6 Apply suggestion to benchmarks/load_testing/generator.ex lain 2020-03-25 15:48:15 +00:00
  • d96139f789 Merge branch 'add-test-update_credentials' into 'develop' Haelwenn 2020-03-25 14:57:19 +00:00
  • 9081a071ee
    Add a test for accounts/update_credentials Egor Kislitsyn 2020-03-25 18:46:17 +04:00
  • be5e2c4dbb Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1). Ivan Tashkinov 2020-03-25 17:01:45 +03:00
  • 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 +03:00
  • 012d428e1f Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control Ivan Tashkinov 2020-03-25 09:05:17 +03:00
  • e743c22329 Fixed incorrect usage of "relations" as a short form of "relationships". Ivan Tashkinov 2020-03-25 09:04:00 +03:00
  • 03a18cf037
    node_info_test: Bump default features list Haelwenn (lanodan) Monnier 2020-03-24 20:39:19 +01:00
  • 212c31c637
    Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions Haelwenn (lanodan) Monnier 2020-03-24 20:32:49 +01:00
  • 64165d1df9
    node_info_test.exs: Add test on the default feature list Haelwenn (lanodan) Monnier 2020-03-24 20:21:27 +01:00
  • 8f1d622b8d Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering Ivan Tashkinov 2020-03-24 22:15:37 +03:00
  • 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 +03:00
  • 8eebc75c15 Merge branch 'fix/activity-deletion' into 'develop' feld 2020-03-24 19:10:32 +00:00
  • f316882464 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex rinpatch 2020-03-24 18:37:53 +00:00
  • 2bb5ade487 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-24 13:28:11 -05:00
  • aaf00f1ff5 Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex lain 2020-03-24 18:24:09 +00:00
  • 74560e888e Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex lain 2020-03-24 18:20:58 +00:00
  • 1d75d0ed7a Merge branch 'admin-api-change-password' into 'develop' lain 2020-03-24 17:34:13 +00:00
  • 4a2538967c
    Support pagination in conversations Egor Kislitsyn 2020-03-24 20:18:27 +04:00
  • d1a9716a98
    Fix activity deletion Egor Kislitsyn 2020-03-24 17:38:18 +04:00
  • 3189c44a0c
    Remove some TwitterAPI endpoints Egor Kislitsyn 2020-03-24 15:21:40 +04:00
  • fbf02a3722 Merge branch 'bugfix/profile-bio-newline' into 'develop' rinpatch 2020-03-23 19:32:01 +00:00
  • 3bd2829e5c Benchmarks: Add timeline benchmark lain 2020-03-23 18:56:01 +01:00
  • eec1fcaf55 Home timeline tests: Add failing test for relationships lain 2020-03-23 15:58:55 +01:00
  • 86f2fbc81e Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering Ivan Tashkinov 2020-03-23 14:34:58 +03:00
  • d931a59072 Merge branch 'support-emoji-staticfe' into 'develop' rinpatch 2020-03-23 10:43:20 +00:00
  • 5a34dca8ed
    Add emoji support in statuses in staticfe Egor Kislitsyn 2020-03-23 14:03:31 +04:00
  • 3c78e5f327 Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring. Ivan Tashkinov 2020-03-23 12:01:11 +03:00
  • a6ee6784bc
    creating trusted app from adminFE & mix task Alexander Strizhakov 2020-02-28 11:16:40 +03:00
  • c2e415143b WIP: preloading of user relations for timeline/statuses rendering (performance improvement). Ivan Tashkinov 2020-03-22 21:51:44 +03:00
  • 15be6ba9c2
    AccountView: fix for other forms of <br> in bio Haelwenn (lanodan) Monnier 2020-03-22 16:38:12 +01:00
  • 7dbf1ffa86 Merge branch 'fix/ecto_ssl_option' into 'develop' rinpatch 2020-03-22 14:32:40 +00:00
  • 4633793bc1 Merge branch 'relationship-remove-outdated-hack' into 'develop' Haelwenn 2020-03-22 14:25:11 +00:00
  • 981e015f1b Mastodon API Account view: Remove an outdated hack rinpatch 2020-03-22 17:10:37 +03:00
  • a516dec0fd Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-21 16:48:58 -05:00
  • fc2eb1fbd6
    Fix formatter warnings Egor Kislitsyn 2020-03-20 22:16:57 +04:00
  • 80e1571610
    Merge branch 'develop' into global-status-expiration Egor Kislitsyn 2020-03-20 22:08:34 +04:00
  • 7f9b5284fa
    updating clear_config Alexander Strizhakov 2020-03-20 20:58:47 +03:00
  • 9bae9b1b1b
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-20 20:47:54 +03:00
  • cb8236cda6
    Add embeddable posts Egor Kislitsyn 2020-03-20 21:19:34 +04:00
  • 160d4e6af6
    fix for doubled path on import fix/1604-emoji-path Alexander Strizhakov 2020-03-18 11:59:00 +03:00
  • d74405fc1a Merge branch 'fix-feed-pagination' into 'develop' lain 2020-03-20 16:57:51 +00:00
  • d23e81903d Merge branch 'clear-config-test-improvements' into 'develop' lain 2020-03-20 16:54:55 +00:00
  • 1c05f539aa Improved in-test clear_config/n applicability (setup / setup_all / in-test usage). Ivan Tashkinov 2020-03-20 18:33:00 +03:00
  • 0e27c274f4 Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements Ivan Tashkinov 2020-03-20 18:08:23 +03:00
  • 5efa5b0c4a Merge branch 'feature/1206-restrict-unauthenticated' into 'develop' lain 2020-03-20 14:40:08 +00:00
  • 6c1232b486 NotificationController: Fix test. lain 2020-03-20 15:00:28 +01:00
  • 1aa8aa7d7f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2 lain 2020-03-20 14:52:58 +01:00
  • fe15f0ba15
    restrict_unauthenticated setting Alexander Strizhakov 2020-03-20 13:04:37 +03:00
  • d63dca8d99 Merge branch 'feature/1635-notifications-include-types' into 'develop' lain 2020-03-20 13:27:29 +00:00
  • 98a60df41f
    include_types parameter in /api/v1/notifications Alexander Strizhakov 2020-03-18 17:37:54 +03:00
  • 3ca8bd6c98 Merge branch 'develop' into contextes-boundaries rustra 2020-03-19 20:35:21 +01:00
  • a8aa917530
    Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity Haelwenn (lanodan) Monnier 2020-03-19 19:25:50 +01:00
  • 952cb589f4 Merge branch 'fix-testing' into 'develop' lain 2020-03-19 18:10:39 +00:00
  • c1fd4f6653
    transmogrifier.ex: rework fix_attachment for better IR Haelwenn (lanodan) Monnier 2020-03-19 19:10:03 +01:00
  • 9b9d67bbec Fix linting. lain 2020-03-19 18:16:12 +01:00
  • 3c2c32b460 Merge branch 'remake-remodel' into develop lain 2020-03-19 18:00:55 +01:00
  • a8c6933ca0 remove federated testing stwf 2020-03-19 12:25:36 -04:00
  • 7d275970ab Add emoji reactions to features in nodeinfo Mark Felder 2020-03-19 10:08:11 -05:00
  • f9d622d25a
    WIP Haelwenn (lanodan) Monnier 2020-03-19 15:08:49 +01:00
  • ec3719f539 Improved in-test config management functions. Ivan Tashkinov 2020-03-18 20:30:31 +03:00
  • 1618061c8b Not needed Your New SJW Waifu 2020-03-18 12:13:10 -05:00
  • a1ad1ca37f Formaatted stuff Your New SJW Waifu 2020-03-18 12:00:06 -05:00
  • fb6a8c0ce1 Merge remote-tracking branch 'upstream/develop' into neckbeard Your New SJW Waifu 2020-03-18 11:17:33 -05:00
  • 51ce0813d3
    Merge branch 'gun' of git.pleroma.social:alex.s/pleroma into gun Alexander Strizhakov 2020-03-18 14:08:40 +03:00
  • f9ecb513fa
    Merge branch 'develop' into gun Alexander Strizhakov 2020-03-18 14:08:21 +03:00
  • 69341cbcba Merge branch 'feature/1530-removing-with_move' into 'develop' rinpatch 2020-03-18 10:12:50 +00:00