phnt/pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • 228bf4d214 Merge branch 'fix_test' into 'develop' lain 2019-12-04 13:25:12 +00:00
  • ed7f850ad2 fix test Maksim Pechnikov 2019-12-04 16:22:01 +03:00
  • 9487995e8b Cheat Sheet: Addg chat_limit information. lain 2019-12-04 12:51:06 +01:00
  • 21353a8ee9 Changelog: Add information about chat limit. lain 2019-12-04 12:49:46 +01:00
  • aa97fe8f17 ChatChannel: Ignore messages that are too long. lain 2019-12-04 12:48:34 +01:00
  • 3a0a400fe1 add @type to ScheduledActivity Maksim Pechnikov 2019-12-04 09:53:01 +03:00
  • 469c0956cd update excoveralls Maksim Pechnikov 2019-12-04 09:43:01 +03:00
  • 29a98b86b7 Merge branch 'develop' into issue/1383 Maksim Pechnikov 2019-12-04 09:34:44 +03:00
  • 652cc6ba4b updated ScheduledActivity Maksim Pechnikov 2019-12-03 21:30:10 +03:00
  • 05fb8d0084 Fix Pleroma.FollowingRelationship.move_following/2 Egor Kislitsyn 2019-12-03 22:31:12 +07:00
  • 4b60d41db9 Add report notes Maxim Filippov 2019-12-03 23:54:07 +09:00
  • 624e720aa4 Add with_move query param to the notifications API Egor Kislitsyn 2019-12-03 22:13:38 +07:00
  • 7722e5a67a Merge branch 'feature/move-activity' into 'develop' lain 2019-12-02 16:26:19 +00:00
  • d468cba2d5 Merge branch 'update-floki' into 'develop' rinpatch 2019-12-02 11:18:58 +00:00
  • 356a936ecb Fix mix pleroma.user list task Egor Kislitsyn 2019-12-02 18:11:45 +07:00
  • cf52106e05
         Update Floki dependency Egor Kislitsyn 2019-12-02 13:38:35 +07:00
  • 88f7cf51d4 Merge branch 'develop' into issue/1411 Maksim Pechnikov 2019-12-01 16:18:16 +03:00
  • 0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop' rinpatch 2019-11-30 10:42:51 +00:00
  • cf0c861d00 Merge branch 'hide-relation-for-friendica' into 'develop' rinpatch 2019-11-30 10:41:18 +00:00
  • b21738d4c0 Merge branch 'benchmarks/favourites_timeline' into 'develop' rinpatch 2019-11-30 10:39:48 +00:00
  • 1915b23e72
         test missing first field kPherox 2019-11-30 15:24:08 +09:00
  • 0326683932
         hide follower/following for friendica kPherox 2019-11-30 04:26:45 +09:00
  • 51111e286b [#1427] Initial support for OAuth admin scopes. Ivan Tashkinov 2019-11-29 18:57:19 +03:00
  • a990374e80 Merge branch 'fix/extract_first_external_url' into 'develop' lain 2019-11-29 10:10:30 +00:00
  • a98cda7758
         Fix Pleroma.HTML.extract_first_external_url/2 Egor Kislitsyn 2019-11-29 15:49:35 +07:00
  • 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-29 10:17:59 +03:00
  • d7b40dd4ba Merge branch 'bugfix/1447-set-following' into 'develop' rinpatch 2019-11-28 19:13:42 +00:00
  • a36607c27e add mix task to set\unset privacy option of notification Maksim Pechnikov 2019-10-30 22:59:04 +03:00
  • 04a8ffbe84 added privacy option to push notifications Maksim Pechnikov 2019-10-29 21:33:17 +03:00
  • a52da55eb9 added User.NotificationSetting struct Maksim Pechnikov 2019-10-28 12:47:23 +03:00
  • b7c449118b Merge branch 'develop' into issue/1383 Maksim Pechnikov 2019-11-28 21:26:56 +03:00
  • ca1acfa314 Merge branch 'chore/manual-benchmark' into 'develop' rinpatch 2019-11-28 17:46:23 +00:00
  • 20564600e8 Merge branch 'use-pg12-in-ci' into 'develop' lain 2019-11-28 16:58:41 +00:00
  • 798aa0c335
         Use PosgreSQL v12 in the federated tests Egor Kislitsyn 2019-11-28 23:08:13 +07:00
  • f0bdbe3f61 Migrations: Set users.following_count to NOT NULL lain 2019-11-28 17:01:43 +01:00
  • 98990d2d61 Merge branch 'fed-testing-updates' into 'develop' lain 2019-11-28 14:34:07 +00:00
  • 9a2d38107c CI: Make benchmarks manually triggered. lain 2019-11-28 15:14:11 +01:00
  • 8627fb0bb5 Merge branch 'cleanup-tests-output' into 'develop' lain 2019-11-28 12:19:15 +00:00
  • c7cc80a9ee obligatory format commit Sadposter 2019-11-28 10:40:50 +00:00
  • fa97eddf8a make follows take precedence over domain blocks Sadposter 2019-11-28 10:38:38 +00:00
  • c4b468a95b
         Cleanup tests output Egor Kislitsyn 2019-11-28 16:44:48 +07:00
  • 1403a1441d added tests Maksim Pechnikov 2019-11-28 09:02:23 +03:00
  • cb656938ca Merge branch 'bugfix/1442-dont-return-nil-for-following-count' into 'develop' kaniini 2019-11-27 16:46:41 +00:00
  • fcabcab443 Fetch account from report, not from status (it might be deleted) Maxim Filippov 2019-11-28 00:09:00 +09:00
  • 5135656f57 Handle reopened reports with deleted statuses Maxim Filippov 2019-11-27 22:54:12 +09:00
  • 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 +01:00
  • ef1718a045 Merge branch 'remove-user-info' into 'develop' lain 2019-11-27 13:40:39 +00:00
  • d55859f5a4 remove quantum package Maksim Pechnikov 2019-11-27 16:35:12 +03:00
  • f36724efb1 User: Never return nil for user follower counts. lain 2019-11-27 14:13:36 +01:00
  • a4f834a687 moved DigestEmail to Oban Periodic jobs Maksim Pechnikov 2019-11-27 15:59:13 +03:00
  • f595cfe623
         Remove User.user_info/2 Egor Kislitsyn 2019-11-27 19:43:47 +07:00
  • 1fc28a4b44
         Add a view for the move notification Egor Kislitsyn 2019-11-26 18:48:56 +07:00
  • c5766a8100 moved ActivityExpiration to Oban Periodic jobs Maksim Pechnikov 2019-11-27 13:35:02 +03:00
  • 6f202a401b moved ScheduledActivity to Oban Periodic jobs Maksim Pechnikov 2019-11-27 09:26:37 +03:00
  • bd1984f054 update tests and Oban stwf 2019-11-26 15:24:34 -05:00
  • bbec9bb727 Tests: Run the daemon lain 2019-07-22 16:32:50 +02:00
  • 74aa42998f CI: Add testing stage for federated tests. lain 2019-07-22 16:18:37 +02:00
  • 717d246491 Tests: Don't run federated tests by default lain 2019-07-22 16:17:18 +02:00
  • f01881e82a Add federated test infrastructure Chris McCord 2019-07-11 16:33:20 -04:00
  • 139b1feda1 Merge branch 'feature/direct_conversation_id_web_push' into 'develop' lain 2019-11-26 19:43:16 +00:00
  • 4af69f047d
         Remove account field from web push payload Egor Kislitsyn 2019-11-27 02:32:55 +07:00
  • 8d717c4be7 remove vim swap file feature/user-whitelist Sadposter 2019-11-26 19:07:00 +00:00
  • ae0e2446f7 obligatory format commit Sadposter 2019-11-26 18:33:15 +00:00
  • 0c79869932 fix relationship view tests Sadposter 2019-11-26 18:32:31 +00:00
  • c5a7b8ad98 add whitelist route tests Sadposter 2019-11-26 18:26:37 +00:00
  • 686174897b add API routes to whitelist/unwhitelist Sadposter 2019-11-26 18:26:17 +00:00
  • f741f79256 add user whitelist relationship Sadposter 2019-11-26 17:56:37 +00:00
  • 80ededc04f
         Add direct_conversation_id to web push payload Egor Kislitsyn 2019-11-26 19:53:43 +07:00
  • eb3c47f1d8 Merge branch 'fix/prod-syslog-level' into 'develop' feld 2019-11-26 12:03:44 +00:00
  • f673e3deef Default log level for syslog in prod should also be :warn Mark Felder 2019-11-26 05:46:48 -06:00
  • ac3abb5414 moved Pleroma.Stats to Oban Periodic jobs Maksim Pechnikov 2019-11-26 10:53:07 +03:00
  • c8d3c3bfec Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations Ivan Tashkinov 2019-11-26 10:42:36 +03:00
  • a1f7f9c634 Merge develop Roman Chvanikov 2019-11-26 04:01:27 +03:00
  • 5869a43fe7 Fix tests Maxim Filippov 2019-11-26 01:06:54 +09:00
  • b62be2564c Merge branch 'develop' into feature/admin-api-render-whole-status Maxim Filippov 2019-11-26 00:25:43 +09:00
  • dc9090810d Merge branch 'fix/ap-disable-remote-render' into 'develop' lain 2019-11-25 15:23:45 +00:00
  • b3b4e5ca80 AdminAPI: Grouped reports old/new fix Maxim Filippov 2019-11-22 13:35:21 +09:00
  • 1364d303f8 AdminAPI: Fix grouped reports for closed/resolved reports Maxim Filippov 2019-11-25 01:39:35 +09:00
  • 4b10804f21 OStatus controller: don't serve json at /notice/, redirect instead rinpatch 2019-11-25 17:55:17 +03:00
  • 02f7383891 ActivityPub controller: do not render remote users rinpatch 2019-11-25 17:19:33 +03:00
  • 5f981178d0 Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop' feld 2019-11-25 13:29:53 +00:00
  • 9374b52756 Merge branch 'fix/update-reports-old-format' into 'develop' feld 2019-11-25 13:29:22 +00:00
  • 756bdef5f5 Merge branch 'feature/useragent-override' into 'develop' rinpatch 2019-11-25 11:36:59 +00:00
  • 0e9be6bafa moved OAuth.Token.CleanWorker to Oban Periodic jobs Maksim Pechnikov 2019-11-25 14:32:20 +03:00
  • e2dc89069d move documentation section for http client Sadposter 2019-11-25 11:26:42 +00:00
  • d3656c2725 add ability to set a custom user-agent string Sadposter 2019-11-25 09:53:11 +00:00
  • 82f4e4760e Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance Maxim Filippov 2019-11-25 01:46:18 +09:00
  • fd24467b92 Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance Maxim Filippov 2019-11-25 01:43:11 +09:00
  • a4b4f6b704 AdminAPI: Fix grouped reports for closed/resolved reports fix/admin-api-grouped-reports-closed-reports Maxim Filippov 2019-11-25 01:39:35 +09:00
  • 40059c9b1e Typo Maxim Filippov 2019-11-25 00:05:52 +09:00
  • 2b341627da Admin API: Render whole status in grouped reports Maxim Filippov 2019-11-25 00:04:29 +09:00
  • 9f29930440 fetcher: move local object checking into a reusable function rinpatch 2019-11-23 22:55:41 +03:00
  • 1636cc5b7e Removed users.info and remaining usages. Ivan Tashkinov 2019-11-23 14:06:19 +03:00
  • 34cdbcbb64 Merge branch 'fix/release-envvars' into 'develop' rinpatch 2019-11-22 17:17:20 +00:00
  • 4a5bb7eb02 OTP releases: only set name and distribution type if not set already rinpatch 2019-11-22 19:58:39 +03:00
  • bd62946020 Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop' lain 2019-11-22 15:39:19 +00:00
  • 1d6970baf1 fix Maksim Pechnikov 2019-11-22 14:17:12 +03:00
  • 8103dfc515 AdminAPI: Grouped reports old/new fix fix/grouped-reports-for-deprecated-format Maxim Filippov 2019-11-22 13:35:21 +09:00
  • b64c7b35d4 Swap map with each Maxim Filippov 2019-11-22 09:11:36 +09:00
  • c2ad9fd5f9 Merge branch 'list-users' into 'develop' rinpatch 2019-11-21 20:33:11 +00:00