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

Commit Graph

  • d7f4f65560 Merge branch 'bugfix/959-emoji-loading' into 'develop' rinpatch 2019-06-08 10:10:34 +00:00
  • dffc9f060a replace missing mock with a 404 rinpatch 2019-06-07 20:48:25 +03:00
  • d020f68e87 Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched rinpatch 2019-06-07 20:40:38 +03:00
  • 970f71e222 Conversations: Fetch users in one query. lain 2019-06-07 17:51:47 +02:00
  • cb3258c863 Emoji: Use full path to check if a file is a directory. lain 2019-06-07 17:31:21 +02:00
  • 76fc4c92bb Fix tests. lain 2019-06-07 17:16:56 +02:00
  • 593b8b1e6a Configuration: Skip thread containment by default lain 2019-06-07 14:28:14 +02:00
  • d5330ed125 Merge branch 'fix/replace-mix-env' into 'develop' kaniini 2019-06-07 10:58:09 +00:00
  • cb89987ca1 Merge branch 'fix/mix-tasks-ensure-no-endpoints-are-served' into 'develop' kaniini 2019-06-07 10:56:38 +00:00
  • bc597d888c Mix Tasks: Switch to Application.ensure_all_started instead of Mix.Task.run and ensure serve_endpoints is set to false rinpatch 2019-06-07 12:37:20 +03:00
  • c0fa000147 Set default config for digest to false Roman Chvanikov 2019-06-07 01:22:35 +03:00
  • 01fe5abad1 Resolve conflicts Roman Chvanikov 2019-06-07 01:20:50 +03:00
  • 92213fb87c Replace Mix.env with Pleroma.Config.get(:env) rinpatch 2019-06-06 23:59:51 +03:00
  • 62cdf701f4 Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop' kaniini 2019-06-06 14:54:29 +00:00
  • 5f1b6f5aca Merge branch 'fix-search' into 'develop' rinpatch 2019-06-06 14:26:19 +00:00
  • cb2bcee842 User Search: Boost friends more strongly. lain 2019-06-06 16:18:27 +02:00
  • 7e9f7ea0c2 MastodonAPI: Add test for user search. lain 2019-06-06 16:16:22 +02:00
  • 9ae8f012a5 Switch to manual Supervisor child specifications instead of Supervisor.Spec rinpatch 2019-06-06 16:36:56 +03:00
  • 489bd30fb9 Merge branch 'improve-search' into 'develop' rinpatch 2019-06-06 12:17:49 +00:00
  • f82382de22 [#943] Make the unauthenticated users limitation optional Egor 2019-06-06 12:17:49 +00:00
  • 3f6da9c45a Merge branch 'bugfix/377-stuck-follow-request' into 'develop' kaniini 2019-06-05 15:52:40 +00:00
  • a511d2f900 Merge branch 'improve-search' into 'develop' kaniini 2019-06-05 15:51:32 +00:00
  • e1370ba131 Utils: Use update_follow_state_for_all when appropriate. lain 2019-06-05 16:51:28 +02:00
  • ad19bfc7fe Utils: Split update_follow_state and update_follow_state_for_all. lain 2019-06-05 16:43:35 +02:00
  • 827a51e777 CommonAPI: Add test for accept_follow_request. lain 2019-06-05 15:43:54 +02:00
  • 076c9ae40e User: Remove superfluous maybe_follow. lain 2019-06-05 14:24:31 +02:00
  • 3115b64cfe Transmogrifier: Add tests for incoming follows to locked accounts. lain 2019-06-05 14:10:46 +02:00
  • 50afe5ab9e Merge branch 'fix-stuck-follows' into 'develop' rinpatch 2019-06-05 11:07:54 +00:00
  • eda4b00a6a Merge branch 'oauth_consumer_support_code' into 'develop' lain 2019-06-05 11:05:32 +00:00
  • ddd4a09b72 Fix merge conflict Egor Kislitsyn 2019-06-05 17:55:00 +07:00
  • cfa5572d28 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists Egor Kislitsyn 2019-06-05 17:53:15 +07:00
  • 024dfdc39c Typo + Linting. lain 2019-06-05 12:45:28 +02:00
  • 8b9a0dd4a7 User: Don't error out when following a user that's already followed. lain 2019-06-05 12:06:45 +02:00
  • 3eefb274f4 OAuth consumer: tests fix, comments, Keycloak config notes. Ivan Tashkinov 2019-06-05 13:02:13 +03:00
  • 1cb245c982 Fix formatting Egor Kislitsyn 2019-06-05 16:55:17 +07:00
  • 5b04f07a1e Limit search for unauthenticated users to local users only Egor Kislitsyn 2019-06-05 16:34:14 +07:00
  • 17004a0f1a Create index on activities.local Egor Kislitsyn 2019-06-03 18:57:24 +07:00
  • 17a6f81f7b Fix tests with enabled RUM Egor Kislitsyn 2019-05-31 17:11:45 +07:00
  • 94b9e9d844 Update benchmark mix task Egor Kislitsyn 2019-05-31 16:37:33 +07:00
  • 93397fce3d Contain search for unauthenticated users Egor Kislitsyn 2019-05-31 16:22:13 +07:00
  • e4babb1c9f Merge branch 'explicit-addressing' into 'develop' kaniini 2019-06-05 08:28:20 +00:00
  • 6ba9055b51 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists Egor Kislitsyn 2019-06-05 12:54:30 +07:00
  • b1b1a270e8 Fix conflict Roman Chvanikov 2019-06-05 02:45:21 +03:00
  • 5188add534 Merge branch 'remove-tag-warning' into 'develop' Haelwenn 2019-06-04 15:46:38 +00:00
  • ab4915edcb Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop' Haelwenn 2019-06-04 15:34:55 +00:00
  • 18c35d84fd NodeInfo: Add explicit addressing to nodeinfo. lain 2019-06-04 17:10:54 +02:00
  • b5e3b1e58a Mix: Swallow git error messages during version number handling. lain 2019-06-04 16:44:56 +02:00
  • f178a6f3f0 Merge branch 'issue/941' into 'develop' lain 2019-06-04 14:58:13 +00:00
  • 1e7bb69a95 update ActivityPub#fetch_activities_query Maksim Pechnikov 2019-06-04 15:20:24 +03:00
  • d3d1704e84 Merge branch 'develop' into issue/941 Maksim Pechnikov 2019-06-04 15:06:58 +03:00
  • 0acfcf6c52 update ActivityPub#fetch_activities_query Maksim Pechnikov 2019-06-04 15:04:36 +03:00
  • a3a7178b60 Participations: Filter out participations without activities. lain 2019-06-04 13:58:36 +02:00
  • 0eb7464c10 Merge branch 'emoji-loader-fix' into 'develop' Haelwenn 2019-06-04 11:26:42 +00:00
  • 8ac104cde0 Merge branch 'fix/fetch-votes-restrict-create' into 'develop' lain 2019-06-04 10:55:45 +00:00
  • bbff7554de Add tests for get_existing_votes rinpatch 2019-06-04 13:47:53 +03:00
  • 17383861ed Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities rinpatch 2019-06-04 13:38:24 +03:00
  • e74581a5c4 Emoji: Don't die when files are present in the emoji folder. lain 2019-06-04 12:01:21 +02:00
  • 29b022bb59 Restrict get_existing_votes to only get Create activities rinpatch 2019-06-04 12:42:10 +03:00
  • 96121315f3 fix merge Maksim Pechnikov 2019-06-04 12:41:24 +03:00
  • 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists Egor Kislitsyn 2019-06-04 16:28:23 +07:00
  • 4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing lain 2019-06-04 11:23:46 +02:00
  • d977d73b91 Merge branch 'fix/poll-performance' into 'develop' kaniini 2019-06-04 08:55:04 +00:00
  • 25198d48f7 Docs: Add Explicit addressing to Readme and changelog. lain 2019-06-04 10:49:57 +02:00
  • 37a4ba0624 utils: access inReplyTo as an explicit string when fetching poll results` William Pitcock 2019-06-04 08:45:03 +00:00
  • 4f2e359687 Merge branch 'develop' into issue/941 Maksim Pechnikov 2019-06-04 09:49:08 +03:00
  • 0f8f63c6bb Merge branch 'feature/nodeinfo-polls' into 'develop' kaniini 2019-06-04 06:29:03 +00:00
  • 1c6cf0a348 nodeinfo: add pollLimits to metadata William Pitcock 2019-06-04 06:19:44 +00:00
  • 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop' kaniini 2019-06-04 05:49:54 +00:00
  • 59f6e794e1 Merge branch 'fix/mock-errors-in-tests' into 'develop' kaniini 2019-06-04 05:46:20 +00:00
  • 84cc131b59 Add missing HTTP Request mocks Sergey Suprunenko 2019-06-04 05:46:19 +00:00
  • 9d2563a3de Merge branch 'generic-fe-settings' into 'develop' kaniini 2019-06-04 05:43:43 +00:00
  • a536f515dd Merge branch 'ueberauth_config_extension' into 'develop' kaniini 2019-06-04 05:42:49 +00:00
  • 2be142ebec Merge branch 'update-oauth-template-css-fix' into 'develop' kaniini 2019-06-04 05:39:38 +00:00
  • 94d12a79c4 Merge branch 'hotfix/add-in_reply_to_index' into 'develop' kaniini 2019-06-04 05:38:13 +00:00
  • 7758148990 update CHANGELOG for mrf_subchain William Pitcock 2019-06-04 05:37:31 +00:00
  • f6036ce3b9 Fix tests Roman Chvanikov 2019-06-04 03:38:53 +03:00
  • 7718a215e9 Update changelog Roman Chvanikov 2019-06-04 03:08:00 +03:00
  • bd325132ca Fix tests Roman Chvanikov 2019-06-04 03:07:49 +03:00
  • 3e17610587 Add task to test emails Roman Chvanikov 2019-06-04 02:48:21 +03:00
  • 6ef145b4fc Merge branch 'develop' into feature/digest-email Mark Felder 2019-06-03 15:29:53 -05:00
  • 64ada7f960 fix tests Maksim Pechnikov 2019-06-03 22:51:14 +03:00
  • 662e95e948 Merge branch 'fix/tag-timeline-missing-index' into 'develop' lambda 2019-06-03 19:03:35 +00:00
  • 46c7e16512 updated changelog Maksim Pechnikov 2019-06-03 21:05:45 +03:00
  • f13d6c7f78 update api to set skip_thread_containment Maksim Pechnikov 2019-06-03 21:02:02 +03:00
  • cfc3c62b2f Add missing tag index on objects rinpatch 2019-06-03 20:42:08 +03:00
  • 804b6a4d8f CommonAPI.Utils: Add tests. lain 2019-06-03 19:08:38 +02:00
  • be56801dda Add index on inReplyTo for objects rinpatch 2019-06-03 19:26:43 +03:00
  • f2c4c99e03 Remove repeated scope lists eugenijm 2019-06-03 18:58:04 +03:00
  • 80d4d83aac CommonAPI: Add explicit addressing. lain 2019-06-03 18:17:08 +02:00
  • 2b664b048e User: Add function to get AP ids from nicknames. lain 2019-06-03 18:16:11 +02:00
  • 243d8ed94e Use workaround for the heavy checkmark symbol in iOS eugenijm 2019-06-03 18:00:32 +03:00
  • f4e2595592 Merge branch 'develop' into update-oauth-template Mark Felder 2019-06-03 09:12:17 -05:00
  • 080e1aa70e add option skip_thread_containment Maksim Pechnikov 2019-06-03 16:04:39 +03:00
  • 9789e000b0 Merge branch 'feature/polls-2-electric-boogalo' into 'develop' rinpatch 2019-06-03 12:19:19 +00:00
  • dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo rinpatch 2019-06-03 13:16:17 +03:00
  • d33d248b69 Merge branch 'fix-dokku' into 'develop' rinpatch 2019-06-03 10:15:18 +00:00
  • 9ded9443a3 CI: Actually push to correct repo. lain 2019-06-03 11:47:10 +02:00
  • 314758c25b Merge branch 'align-mastodon-conversations' into 'develop' lambda 2019-06-03 09:48:37 +00:00
  • e71da4468e Merge branch 'chore/ci-speedup' into 'develop' rinpatch 2019-06-03 08:35:24 +00:00
  • c3bcc4f6a2 CI: Replace mix test and mix coveralls with just mix coveralls rinpatch 2019-06-03 11:24:03 +03:00