Commit graph

  • 04a8ffbe84 added privacy option to push notifications Maksim Pechnikov 2019-10-29 21:33:17 +0300
  • a52da55eb9 added User.NotificationSetting struct Maksim Pechnikov 2019-10-28 12:47:23 +0300
  • b7c449118b Merge branch 'develop' into issue/1383 Maksim Pechnikov 2019-11-28 21:26:56 +0300
  • ca1acfa314 Merge branch 'chore/manual-benchmark' into 'develop' rinpatch 2019-11-28 17:46:23 +0000
  • 20564600e8 Merge branch 'use-pg12-in-ci' into 'develop' lain 2019-11-28 16:58:41 +0000
  • 798aa0c335
    Use PosgreSQL v12 in the federated tests Egor Kislitsyn 2019-11-28 23:08:13 +0700
  • f0bdbe3f61 Migrations: Set users.following_count to NOT NULL lain 2019-11-28 17:01:43 +0100
  • 98990d2d61 Merge branch 'fed-testing-updates' into 'develop' lain 2019-11-28 14:34:07 +0000
  • 9a2d38107c CI: Make benchmarks manually triggered. lain 2019-11-28 15:14:11 +0100
  • 8627fb0bb5 Merge branch 'cleanup-tests-output' into 'develop' lain 2019-11-28 12:19:15 +0000
  • c7cc80a9ee obligatory format commit Sadposter 2019-11-28 10:40:50 +0000
  • fa97eddf8a make follows take precedence over domain blocks Sadposter 2019-11-28 10:38:38 +0000
  • c4b468a95b
    Cleanup tests output Egor Kislitsyn 2019-11-28 16:44:48 +0700
  • 1403a1441d added tests Maksim Pechnikov 2019-11-28 09:02:23 +0300
  • cb656938ca Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop' kaniini 2019-11-27 16:46:41 +0000
  • fcabcab443 Fetch account from report, not from status (it might be deleted) Maxim Filippov 2019-11-28 00:09:00 +0900
  • 5135656f57 Handle reopened reports with deleted statuses Maxim Filippov 2019-11-27 22:54:12 +0900
  • 50b152766f Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count lain 2019-11-27 14:48:28 +0100
  • ef1718a045 Merge branch 'remove-user-info' into 'develop' lain 2019-11-27 13:40:39 +0000
  • d55859f5a4 remove quantum package Maksim Pechnikov 2019-11-27 16:35:12 +0300
  • f36724efb1 User: Never return nil for user follower counts. lain 2019-11-27 14:13:36 +0100
  • a4f834a687 moved DigestEmail to Oban Periodic jobs Maksim Pechnikov 2019-11-27 15:59:13 +0300
  • f595cfe623
    Remove User.user_info/2 Egor Kislitsyn 2019-11-27 19:43:47 +0700
  • 1fc28a4b44
    Add a view for the move notification Egor Kislitsyn 2019-11-26 18:48:56 +0700
  • c5766a8100 moved ActivityExpiration to Oban Periodic jobs Maksim Pechnikov 2019-11-27 13:35:02 +0300
  • 6f202a401b moved ScheduledActivity to Oban Periodic jobs Maksim Pechnikov 2019-11-27 09:26:37 +0300
  • bd1984f054 update tests and Oban stwf 2019-11-26 15:24:34 -0500
  • bbec9bb727 Tests: Run the daemon lain 2019-07-22 16:32:50 +0200
  • 74aa42998f CI: Add testing stage for federated tests. lain 2019-07-22 16:18:37 +0200
  • 717d246491 Tests: Don't run federated tests by default lain 2019-07-22 16:17:18 +0200
  • f01881e82a Add federated test infrastructure Chris McCord 2019-07-11 16:33:20 -0400
  • 139b1feda1 Merge branch 'feature/direct_conversation_id_web_push' into 'develop' lain 2019-11-26 19:43:16 +0000
  • 4af69f047d
    Remove account field from web push payload Egor Kislitsyn 2019-11-27 02:32:55 +0700
  • 80ededc04f
    Add direct_conversation_id to web push payload Egor Kislitsyn 2019-11-26 19:53:43 +0700
  • eb3c47f1d8 Merge branch 'fix/prod-syslog-level' into 'develop' feld 2019-11-26 12:03:44 +0000
  • f673e3deef Default log level for syslog in prod should also be :warn Mark Felder 2019-11-26 05:46:48 -0600
  • ac3abb5414 moved Pleroma.Stats to Oban Periodic jobs Maksim Pechnikov 2019-11-26 10:53:07 +0300
  • c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-26 10:42:36 +0300
  • 5869a43fe7 Fix tests Maxim Filippov 2019-11-26 01:06:54 +0900
  • b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status Maxim Filippov 2019-11-26 00:25:43 +0900
  • dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop' lain 2019-11-25 15:23:45 +0000
  • b3b4e5ca80 AdminAPI: Grouped reports old/new fix Maxim Filippov 2019-11-22 13:35:21 +0900
  • 1364d303f8 AdminAPI: Fix grouped reports for closed/resolved reports Maxim Filippov 2019-11-25 01:39:35 +0900
  • 4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead rinpatch 2019-11-25 17:55:17 +0300
  • 02f7383891 ActivityPub controller: do not render remote users rinpatch 2019-11-25 17:19:33 +0300
  • 5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' feld 2019-11-25 13:29:53 +0000
  • 9374b52756 Merge branch 'fix/update-reports-old-format' into 'develop' feld 2019-11-25 13:29:22 +0000
  • acac6e3540 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-11-25 11:37:49 +0000
  • 756bdef5f5 Merge branch 'feature/useragent-override' into 'develop' rinpatch 2019-11-25 11:36:59 +0000
  • 0e9be6bafa moved OAuth.Token.CleanWorker to Oban Periodic jobs Maksim Pechnikov 2019-11-25 14:32:20 +0300
  • e2dc89069d move documentation section for http client Sadposter 2019-11-25 11:26:42 +0000
  • d3656c2725 add ability to set a custom user-agent string Sadposter 2019-11-25 09:53:11 +0000
  • 82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance Maxim Filippov 2019-11-25 01:46:18 +0900
  • fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance Maxim Filippov 2019-11-25 01:43:11 +0900
  • 40059c9b1e Typo Maxim Filippov 2019-11-25 00:05:52 +0900
  • 2b341627da Admin API: Render whole status in grouped reports Maxim Filippov 2019-11-25 00:04:29 +0900
  • 9f29930440 fetcher: move local object checking into a reusable function rinpatch 2019-11-23 22:55:41 +0300
  • 1636cc5b7e Removed users.info and remaining usages. Ivan Tashkinov 2019-11-23 14:06:19 +0300
  • 34cdbcbb64 Merge branch 'fix/release-envvars' into 'develop' rinpatch 2019-11-22 17:17:20 +0000
  • 4a5bb7eb02 OTP releases: only set name and distribution type if not set already rinpatch 2019-11-22 19:58:39 +0300
  • bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' lain 2019-11-22 15:39:19 +0000
  • 1d6970baf1 fix Maksim Pechnikov 2019-11-22 14:17:12 +0300
  • b64c7b35d4 Swap map with each Maxim Filippov 2019-11-22 09:11:36 +0900
  • c2ad9fd5f9 Merge branch 'list-users' into 'develop' rinpatch 2019-11-21 20:33:11 +0000
  • fbc379d689 Add CLI list users command Alex Schroeder 2019-11-17 21:58:30 +0100
  • dedb1ad5d6 Merge branch 'revert-5c6c3026' into 'develop' rinpatch 2019-11-21 15:20:05 +0000
  • 19b727bf8f Merge branch 'fix/mix-task-logging' into 'develop' lain 2019-11-21 15:04:19 +0000
  • dc9303eac5 Revert "Merge branch 'patch-1' into 'develop'" rinpatch 2019-11-21 15:03:27 +0000
  • cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-21 16:47:52 +0300
  • 8feb5dcb42 Merge branch 'issue/1348' into 'develop' lain 2019-11-21 13:13:14 +0000
  • 320690f7a5 Object: Use inspect to log missing preload. lain 2019-11-21 14:03:01 +0100
  • 1680a3479e Merge branch 'fix/user-following-count' into 'develop' lain 2019-11-21 12:26:05 +0000
  • cd8da73bbe Merge branch 'remove-useless-warning' into 'develop' lain 2019-11-21 12:22:46 +0000
  • 8ffd1c792c
    Remove version mismatch warning Egor Kislitsyn 2019-11-21 18:22:18 +0700
  • d38ab4bb89
    Fix user.following_count Egor Kislitsyn 2019-11-21 16:31:13 +0700
  • edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn. Ensure console backend logs in test environment are :warn, but mix tasks run in test env do not run with :debug because it's far too verbose. Mark Felder 2019-11-20 11:55:30 -0600
  • c65190c799 Console backend's log format should be prefixed and suffixed with newlines. This is how upstream does it by default. Mark Felder 2019-11-20 11:18:42 -0600
  • 140a54fd4e Merge branch 'develop' into fix/mix-task-logging Mark Felder 2019-11-20 09:16:46 -0600
  • 1c17f18329 Be specific about format for logs in test as we have tests that check it Mark Felder 2019-11-20 09:14:27 -0600
  • 81f1c6bc47 [#1335] Added CHANGELOG.md entry. Ivan Tashkinov 2019-11-20 15:57:51 +0300
  • 4f88b1b435 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-20 15:47:11 +0300
  • 937d6c6b32 Merge branch 'fix/sporadic-tests' into 'develop' lain 2019-11-20 12:46:33 +0000
  • de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. Ivan Tashkinov 2019-11-20 15:46:11 +0300
  • 75efdb0781 Merge branch 'fix-docker-build' into 'develop' lain 2019-11-20 10:32:58 +0000
  • 9d29a5063c fe sadposter 2019-11-20 09:48:05 +0000
  • d8286a122a stickers sadposter 2019-11-20 09:46:08 +0000
  • 555edd01ab [#1335] User AP ID relations fetching performance optimizations. Ivan Tashkinov 2019-11-20 12:19:07 +0300
  • 63711258ce
    Fix sporadically failing test Egor Kislitsyn 2019-11-20 14:25:00 +0700
  • cb513a599c Allow test builds to have info and debug logs stripped Mark Felder 2019-11-19 16:21:30 -0600
  • ff9133b978 Allow mix tasks to always run with debug logging Mark Felder 2019-11-19 16:01:17 -0600
  • 27f73d38c0 Merge branch 'chore/bump-fe' into 'develop' rinpatch 2019-11-19 21:03:42 +0000
  • dc8830da27 changelog: add 1.1.6 entries from stable rinpatch 2019-11-20 00:01:58 +0300
  • 0fe08346db bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 rinpatch 2019-11-19 19:45:20 +0300
  • 565f261338 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-19 23:22:47 +0300
  • ba5cc30165 [#1335] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring. Ivan Tashkinov 2019-11-19 23:22:10 +0300
  • 0ba3f1ffb2 Merge branch 'release/1.1.6' into 'stable' rinpatch 2019-11-19 20:04:19 +0000
  • 1fcd579b6d benchmarks/ added favourites timeline Maksim Pechnikov 2019-11-19 21:11:15 +0300
  • 708fd234bd fix order favorites activites Maksim Pechnikov 2019-11-19 20:19:41 +0300
  • 34206e4d7f changelog: fix wrong header levels rinpatch 2019-11-19 19:47:03 +0300
  • c2e9c1c8a5 bundles: bump pleroma-fe to 0eda60eeb49f4fa460fe6f9f6196ddbb014427c7 rinpatch 2019-11-19 19:45:20 +0300