Commit graph

  • d17040e997 Merge branch 'giving-up' into 'develop' rinpatch 2020-05-12 13:23:40 +0000
  • 2f2e5fea34 Give up for now and make gitlab retry failed jobs. lain 2020-05-12 15:02:37 +0200
  • e44166b510 Credo fixes. lain 2020-05-12 14:44:11 +0200
  • a61120f497 Documention: Add chat message deletion docs lain 2020-05-12 13:25:25 +0200
  • ec72cba43e Chat Controller: Add basic error handling. lain 2020-05-12 13:23:09 +0200
  • dcb5cda324 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-12 13:13:43 +0200
  • b5aa204eb8 ChatController: Support deletion of chat messages. lain 2020-05-12 13:13:03 +0200
  • dfb90a1fd6 Transmogrifier: Add tests for certain announces lain 2020-05-12 12:50:48 +0200
  • ca31af473c Transmogrifier: On incoming follow accept, update follow counts. lain 2020-05-12 12:29:37 +0200
  • d0ba1844b0 ActivityPub: Fix non-federating blocks. lain 2020-05-12 10:52:46 +0200
  • 63477d07ad unsubscribes of friends when user deactivated Maksim Pechnikov 2020-05-12 06:44:33 +0300
  • f8190aea5e Merge branch 'fix/issue-1676' into 'develop' rinpatch 2020-05-11 22:30:36 +0000
  • 2ead4e108a Merge branch 'migration-fix-markers' into 'develop' rinpatch 2020-05-11 22:13:08 +0000
  • 9b33cab06e Merge branch 'chore/gettext-update' into 'develop' rinpatch 2020-05-11 21:52:57 +0000
  • 952c6b29a1 Gettext: remove english messages and update the pot file rinpatch 2020-05-12 00:40:13 +0300
  • 1b23acf164 [#2497] Media preview proxy for images: fixes, tweaks, refactoring, tests adjustments. Ivan Tashkinov 2020-05-11 23:21:53 +0300
  • f6aa0b4a07 Migration: Fix typo lain 2020-05-11 22:03:29 +0200
  • f71376e30e Migration: Enum.chunk is deprecated. lain 2020-05-11 22:00:01 +0200
  • d8dd945a03 Markers migration: Fix migration for very large list of markers lain 2020-05-11 21:52:47 +0200
  • 768c18facb Merge branch 'fix/streamer-timeout' into 'develop' rinpatch 2020-05-11 17:07:55 +0000
  • f28ed36b4d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-11 17:14:58 +0200
  • e2b15e8ad3 Fix streamer timeout (closes #1753). href 2020-05-11 16:28:53 +0200
  • e432314105 Merge branch '1439-favorite-deletion' into 'develop' lain 2020-05-11 13:58:18 +0000
  • 679afb2de4 SideEffects test: Add test for favorite deletion. lain 2020-05-11 15:38:19 +0200
  • 79cd723a1e Merge branch '1204-object-pruning-deletion' into 'develop' rinpatch 2020-05-11 13:31:11 +0000
  • 5367a00257 Deletion: Handle the case of pruned objects. lain 2020-05-11 15:06:23 +0200
  • 3bde0fa3f6
    Add OpenAPI spec for TimelineController Egor Kislitsyn 2020-05-11 15:24:59 +0400
  • fdb98715b8 Chat: Fix wrong query. lain 2020-05-11 10:58:14 +0200
  • 84bb116ae3 Merge branch 'descriptions-fix' into 'develop' lain 2020-05-11 08:03:09 +0000
  • da6a38d205
    copy/paste fix for descriptions Alexander Strizhakov 2020-05-11 09:35:20 +0300
  • a6283bbae1 Merge branch 'release/2.0.4' into 'stable' rinpatch 2020-05-10 17:13:03 +0000
  • 489201d5d5 CHANGELOG.md: mention AP C2S change rinpatch 2020-05-10 19:54:37 +0300
  • 9c23955879 mix.exs: bump version to 2.0.4 rinpatch 2020-05-10 02:37:36 +0300
  • 69e1f23dd3 CHANGELOG.md: Add 2.0.4 entry rinpatch 2020-05-10 02:36:32 +0300
  • 1b1dfb54eb Credo fixes. lain 2020-05-10 13:28:05 +0200
  • 8cc8d960af Documentation: Add GET /chats/:id lain 2020-05-10 13:27:40 +0200
  • 8d5597ff68 ChatController: Add GET /chats/:id lain 2020-05-10 13:26:14 +0200
  • 172d9b1193 Chat: Add last_message to schema. lain 2020-05-10 13:08:01 +0200
  • 17be3ff669 Documentation: Add last_message to chat docs. lain 2020-05-10 13:01:20 +0200
  • f335e1404a ChatView: Add the last message to the view. lain 2020-05-10 13:00:01 +0200
  • e297d8c649 Documentation: Add attachment docs lain 2020-05-10 12:34:12 +0200
  • c272669909 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-10 12:32:57 +0200
  • 1054e89762 ChatOperation: Add media id to example lain 2020-05-10 12:30:24 +0200
  • 7ca83e71a9 Merge branch 'shortening-modules-name' into 'develop' lain 2020-05-10 09:05:22 +0000
  • b960a9430d [#2456] credo fix. Ivan Tashkinov 2020-05-10 09:35:12 +0300
  • b0d0d8f91b Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding Ivan Tashkinov 2020-05-10 09:17:16 +0300
  • aee88d11be [#2456] Removed support for embedded relationships in account view. Ivan Tashkinov 2020-05-10 09:16:48 +0300
  • f3f8ed9e19 Set sum types in query Roman Chvanikov 2020-05-10 09:13:24 +0300
  • 3d9a7cf0cc healthcheck: report real amount of memory allocated by beam rinpatch 2020-05-08 23:51:59 +0300
  • f7c28ae544 Webfinger: Request account info with the acct scheme lain 2020-05-03 13:48:01 +0200
  • dd7bf4aece Fix inconsistency in language for activating settings Angelina Filippova 2020-05-04 22:41:14 +0300
  • 45df70e691 AP C2S: Restrict creation to Notes for now. lain 2020-05-05 10:12:37 +0200
  • 797dd3f581 Increase tests on AP C2S Haelwenn (lanodan) Monnier 2020-04-30 18:55:25 +0200
  • 38541d99ea apache chain issue fix Alexander Strizhakov 2020-05-06 16:20:47 +0300
  • a74c31ff63 include eldap in OTP releases rinpatch 2020-05-09 14:49:46 +0300
  • 2ff79f9aae insert skeletons migration: fix for non-local locals rinpatch 2020-05-09 18:51:20 +0300
  • b3e6953d23 Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop' rinpatch 2020-05-09 21:52:00 +0000
  • 0ad89762a1 insert skeletons migration: fix for non-local locals rinpatch 2020-05-09 18:51:20 +0300
  • ac4250a18c [#2456] Clarified skip_relationships option (and its default of false) for MastodonAPI.AccountView. Ivan Tashkinov 2020-05-09 19:03:07 +0300
  • d73e8b6b12 Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop' rinpatch 2020-05-09 15:30:39 +0000
  • 14a49a0483 [#2456] Dropped support for embedded pleroma/account/relationship in statuses and notifications. Ivan Tashkinov 2020-05-09 18:05:44 +0300
  • 5e1d994785 Merge branch 'fix/eldap-otp' into 'develop' rinpatch 2020-05-09 12:18:44 +0000
  • b6d1bcc55d include eldap in OTP releases rinpatch 2020-05-09 14:49:46 +0300
  • 4c19702390 Add docs Roman Chvanikov 2020-05-09 14:32:08 +0300
  • 56819f7f06 Use index on refresh_counter_cache Roman Chvanikov 2020-05-09 13:13:26 +0300
  • 4f26539717 Fix credo warning Roman Chvanikov 2020-05-09 11:59:49 +0300
  • 5c368b004b Fix refresh_counter_cache test Roman Chvanikov 2020-05-09 11:49:54 +0300
  • 01b06d6dbf Show progress in refresh_counter_cache task Roman Chvanikov 2020-05-09 11:43:31 +0300
  • 942093683a Merge branch 'develop' into feature/admin-api-status-count-per-instance Roman Chvanikov 2020-05-09 11:31:34 +0300
  • cbe383ae83 Update stats admin endpoint Roman Chvanikov 2020-05-09 11:30:37 +0300
  • c962c6afb3 Merge branch 'fix/healthcheck-total-alloc' into 'develop' lain 2020-05-09 08:10:56 +0000
  • 39d2f2118a update counter_cache logic Roman Chvanikov 2020-05-09 01:20:50 +0300
  • 30eaef9d61 healthcheck: report real amount of memory allocated by beam rinpatch 2020-05-08 23:51:59 +0300
  • df82ee4179 Merge branch 'chore/changelog-sync' into 'develop' rinpatch 2020-05-08 20:56:16 +0000
  • f4d50fbd81 CHANGELOG.md: Add entries from 2.0.3 rinpatch 2020-05-08 23:54:16 +0300
  • bbdad85568 Initial implementation of image preview proxy. Media proxy tests refactoring. Ivan Tashkinov 2020-05-08 23:06:47 +0300
  • 3a014dd609 Merge branch 'chore/description-grammar' into 'develop' feld 2020-05-08 19:48:39 +0000
  • c9344b5f2d Minor grammar nit Mark Felder 2020-05-08 14:36:59 -0500
  • 65299daa85 Merge branch 'fix/adminfe-icons' into 'develop' feld 2020-05-08 19:34:12 +0000
  • 6a291b1834 Restore deleted icons. No idea how this happened. Mark Felder 2020-05-08 14:22:49 -0500
  • 0c2b09a9ba Add migration for counter_cache table update Roman Chvanikov 2020-05-08 22:08:11 +0300
  • b2924ab1fb Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding Ivan Tashkinov 2020-05-08 21:37:55 +0300
  • 0e1bda55e8 PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications. 7a0e554daf Ivan Tashkinov 2020-05-08 21:33:56 +0300
  • 03529f6a05 Transmogrifier: Don't modify attachments for chats. lain 2020-05-08 18:26:35 +0200
  • 570940a3fd Merge branch 'bugfix/fix-like-notifications' into 'develop' rinpatch 2020-05-08 15:00:43 +0000
  • 287f781808
    user deletion Alexander Strizhakov 2020-05-08 16:54:53 +0300
  • 1008f9ac40 fe sadposter 2020-05-08 14:38:37 +0100
  • 6e7fab3ead fe sadposter 2020-05-08 14:16:11 +0100
  • e18958a5d7 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2020-05-08 14:12:33 +0100
  • 9eede61d00 fe sadposter 2020-05-08 14:09:53 +0100
  • d0bf8cfb8f Credo fixes. lain 2020-05-08 14:11:58 +0200
  • 7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms lain 2020-05-08 13:13:37 +0200
  • fbcc53760e Merge branch 'feature/emojireactvalidator' into 'develop' lain 2020-05-08 10:41:41 +0000
  • 7e9aaa0d02 Transmogrifier tests: Remove more double tests. lain 2020-05-08 11:43:07 +0200
  • f1274c3326 Transmogrifier tests: Remove double tests. lain 2020-05-08 11:41:13 +0200
  • 4d71c4b805 fixed 'source' object in verify_credentials Maksim Pechnikov 2020-05-08 12:33:01 +0300
  • 6acbe45eb2 Builder: Extract common features of likes and reactions. lain 2020-05-08 11:30:31 +0200
  • 0cf43391f2 Merge branch 'issue/1276-2' into 'develop' lain 2020-05-08 09:23:01 +0000
  • a081135365 revert mix.lock Maksim Pechnikov 2020-05-08 12:06:24 +0300
  • 218a22c9a3 Merge branch 'fix/privacy-notification' into 'develop' lain 2020-05-08 09:04:24 +0000