Commit graph

  • ddd4a09b72 Fix merge conflict Egor Kislitsyn 2019-06-05 17:55:00 +0700
  • cfa5572d28 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists Egor Kislitsyn 2019-06-05 17:53:15 +0700
  • 024dfdc39c Typo + Linting. lain 2019-06-05 12:45:28 +0200
  • 8b9a0dd4a7 User: Don't error out when following a user that's already followed. lain 2019-06-05 12:06:45 +0200
  • 3eefb274f4 OAuth consumer: tests fix, comments, Keycloak config notes. Ivan Tashkinov 2019-06-05 13:02:13 +0300
  • 1cb245c982 Fix formatting Egor Kislitsyn 2019-06-05 16:55:17 +0700
  • 5b04f07a1e Limit search for unauthenticated users to local users only Egor Kislitsyn 2019-06-05 16:34:14 +0700
  • 17004a0f1a Create index on activities.local Egor Kislitsyn 2019-06-03 18:57:24 +0700
  • 17a6f81f7b Fix tests with enabled RUM Egor Kislitsyn 2019-05-31 17:11:45 +0700
  • 94b9e9d844 Update benchmark mix task Egor Kislitsyn 2019-05-31 16:37:33 +0700
  • 93397fce3d Contain search for unauthenticated users Egor Kislitsyn 2019-05-31 16:22:13 +0700
  • e4babb1c9f Merge branch 'explicit-addressing' into 'develop' kaniini 2019-06-05 08:28:20 +0000
  • 6ba9055b51 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists Egor Kislitsyn 2019-06-05 12:54:30 +0700
  • 9bc0f51e51 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-06-05 01:25:52 +0100
  • b1b1a270e8 Fix conflict Roman Chvanikov 2019-06-05 02:45:21 +0300
  • 5188add534 Merge branch 'remove-tag-warning' into 'develop' Haelwenn 2019-06-04 15:46:38 +0000
  • ab4915edcb Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop' Haelwenn 2019-06-04 15:34:55 +0000
  • 18c35d84fd NodeInfo: Add explicit addressing to nodeinfo. lain 2019-06-04 17:10:54 +0200
  • b5e3b1e58a Mix: Swallow git error messages during version number handling. lain 2019-06-04 16:44:56 +0200
  • f178a6f3f0 Merge branch 'issue/941' into 'develop' lain 2019-06-04 14:58:13 +0000
  • 1e7bb69a95 update ActivityPub#fetch_activities_query Maksim Pechnikov 2019-06-04 15:20:24 +0300
  • d3d1704e84 Merge branch 'develop' into issue/941 Maksim Pechnikov 2019-06-04 15:06:58 +0300
  • 0acfcf6c52 update ActivityPub#fetch_activities_query Maksim Pechnikov 2019-06-04 15:04:36 +0300
  • a3a7178b60 Participations: Filter out participations without activities. lain 2019-06-04 13:58:36 +0200
  • 0eb7464c10 Merge branch 'emoji-loader-fix' into 'develop' Haelwenn 2019-06-04 11:26:42 +0000
  • 8ac104cde0 Merge branch 'fix/fetch-votes-restrict-create' into 'develop' lain 2019-06-04 10:55:45 +0000
  • bbff7554de Add tests for get_existing_votes rinpatch 2019-06-04 13:47:53 +0300
  • 17383861ed Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities rinpatch 2019-06-04 13:38:24 +0300
  • e74581a5c4 Emoji: Don't die when files are present in the emoji folder. lain 2019-06-04 12:01:21 +0200
  • 29b022bb59 Restrict get_existing_votes to only get Create activities rinpatch 2019-06-04 12:42:10 +0300
  • 96121315f3 fix merge Maksim Pechnikov 2019-06-04 12:41:24 +0300
  • 9ce928d823 Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists Egor Kislitsyn 2019-06-04 16:28:23 +0700
  • 4cab98b7bf Merge remote-tracking branch 'origin/develop' into explicit-addressing lain 2019-06-04 11:23:46 +0200
  • d977d73b91 Merge branch 'fix/poll-performance' into 'develop' kaniini 2019-06-04 08:55:04 +0000
  • 25198d48f7 Docs: Add Explicit addressing to Readme and changelog. lain 2019-06-04 10:49:57 +0200
  • 37a4ba0624 utils: access inReplyTo as an explicit string when fetching poll results` William Pitcock 2019-06-04 08:45:03 +0000
  • 4f2e359687 Merge branch 'develop' into issue/941 Maksim Pechnikov 2019-06-04 09:49:08 +0300
  • 0f8f63c6bb Merge branch 'feature/nodeinfo-polls' into 'develop' kaniini 2019-06-04 06:29:03 +0000
  • 1c6cf0a348 nodeinfo: add pollLimits to metadata William Pitcock 2019-06-04 06:19:44 +0000
  • 9f0d0d0805 Merge branch 'feature/mrf-subchain' into 'develop' kaniini 2019-06-04 05:49:54 +0000
  • 59f6e794e1 Merge branch 'fix/mock-errors-in-tests' into 'develop' kaniini 2019-06-04 05:46:20 +0000
  • 84cc131b59 Add missing HTTP Request mocks Sergey Suprunenko 2019-06-04 05:46:19 +0000
  • 9d2563a3de Merge branch 'generic-fe-settings' into 'develop' kaniini 2019-06-04 05:43:43 +0000
  • a536f515dd Merge branch 'ueberauth_config_extension' into 'develop' kaniini 2019-06-04 05:42:49 +0000
  • 2be142ebec Merge branch 'update-oauth-template-css-fix' into 'develop' kaniini 2019-06-04 05:39:38 +0000
  • 94d12a79c4 Merge branch 'hotfix/add-in_reply_to_index' into 'develop' kaniini 2019-06-04 05:38:13 +0000
  • 7758148990 update CHANGELOG for mrf_subchain William Pitcock 2019-06-04 05:37:31 +0000
  • f6036ce3b9 Fix tests Roman Chvanikov 2019-06-04 03:38:53 +0300
  • 7718a215e9 Update changelog Roman Chvanikov 2019-06-04 03:08:00 +0300
  • bd325132ca Fix tests Roman Chvanikov 2019-06-04 03:07:49 +0300
  • 3e17610587 Add task to test emails Roman Chvanikov 2019-06-04 02:48:21 +0300
  • 6ef145b4fc Merge branch 'develop' into feature/digest-email Mark Felder 2019-06-03 15:29:53 -0500
  • 64ada7f960 fix tests Maksim Pechnikov 2019-06-03 22:51:14 +0300
  • 662e95e948 Merge branch 'fix/tag-timeline-missing-index' into 'develop' lambda 2019-06-03 19:03:35 +0000
  • 46c7e16512 updated changelog Maksim Pechnikov 2019-06-03 21:05:45 +0300
  • f13d6c7f78 update api to set skip_thread_containment Maksim Pechnikov 2019-06-03 21:02:02 +0300
  • cfc3c62b2f Add missing tag index on objects rinpatch 2019-06-03 20:42:08 +0300
  • 804b6a4d8f CommonAPI.Utils: Add tests. lain 2019-06-03 19:08:38 +0200
  • be56801dda Add index on inReplyTo for objects rinpatch 2019-06-03 19:26:43 +0300
  • f2c4c99e03 Remove repeated scope lists eugenijm 2019-06-03 18:58:04 +0300
  • 80d4d83aac CommonAPI: Add explicit addressing. lain 2019-06-03 18:17:08 +0200
  • 2b664b048e User: Add function to get AP ids from nicknames. lain 2019-06-03 18:16:11 +0200
  • 243d8ed94e Use workaround for the heavy checkmark symbol in iOS eugenijm 2019-06-03 18:00:32 +0300
  • f4e2595592 Merge branch 'develop' into update-oauth-template Mark Felder 2019-06-03 09:12:17 -0500
  • 080e1aa70e add option skip_thread_containment Maksim Pechnikov 2019-06-03 16:04:39 +0300
  • c4151feb48 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-06-03 13:29:35 +0100
  • 9789e000b0 Merge branch 'feature/polls-2-electric-boogalo' into 'develop' rinpatch 2019-06-03 12:19:19 +0000
  • dc91bcc0af Merge branch 'develop' into feature/polls-2-electric-boogalo rinpatch 2019-06-03 13:16:17 +0300
  • d33d248b69 Merge branch 'fix-dokku' into 'develop' rinpatch 2019-06-03 10:15:18 +0000
  • 9ded9443a3 CI: Actually push to correct repo. lain 2019-06-03 11:47:10 +0200
  • 314758c25b Merge branch 'align-mastodon-conversations' into 'develop' lambda 2019-06-03 09:48:37 +0000
  • e71da4468e Merge branch 'chore/ci-speedup' into 'develop' rinpatch 2019-06-03 08:35:24 +0000
  • c3bcc4f6a2 CI: Replace mix test and mix coveralls with just mix coveralls rinpatch 2019-06-03 11:24:03 +0300
  • 026b245dbc Merge branch 'develop' into feature/polls-2-electric-boogalo rinpatch 2019-06-03 11:14:52 +0300
  • 5bd41fef8b Change query order in fetch_activities_for_context_query to make poll vote exclusion work rinpatch 2019-06-03 10:58:37 +0300
  • baefb97dc4 Add a changelog entry for polls rinpatch 2019-06-03 10:55:16 +0300
  • 1fd8e19d76 Remove a TODO comment as the tests for poll view were written rinpatch 2019-06-02 23:46:17 +0300
  • 2fe3a20638 Make error message about author's inability to vote more sensible rinpatch 2019-06-02 23:30:36 +0300
  • c47da0e65d Add tests for poll view rinpatch 2019-06-02 23:25:33 +0300
  • e3c460353d Refresh the object in CommonAPI.vote instead of MastoAPI controller rinpatch 2019-06-02 23:24:48 +0300
  • 83663caa81 Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification. Ivan Tashkinov 2019-06-02 17:45:32 +0300
  • 561a21986d formatting William Pitcock 2019-06-02 10:29:15 +0000
  • c724d8df98 docs: document mrf_subchain William Pitcock 2019-06-02 10:14:56 +0000
  • 38a275b31f test: add tests for subchain policy William Pitcock 2019-06-02 10:08:51 +0000
  • 4087ccdab8 mrf: add subchain policy William Pitcock 2019-06-02 09:50:16 +0000
  • edf772d41e mrf: allow a policy chain to be specified when filtering William Pitcock 2019-06-02 09:44:42 +0000
  • 1236c5dbf5 Merge branch 'bugfix/reverse-proxy-hackney-wtf' into 'develop' kaniini 2019-06-02 09:19:15 +0000
  • 52e09807d4 reverse proxy: clean up some @hackney leftovers William Pitcock 2019-06-02 09:09:58 +0000
  • 5402d04e3c Merge branch 'feature/notification-control-part-2' into 'develop' kaniini 2019-06-02 08:25:37 +0000
  • e394fc2eef fix the flaky test for users creation by admin Sachin Joshi 2019-06-02 09:48:45 +0545
  • 67bcc3ccc4 Remove index on object name used for excluding poll votes (replaced by just rewriting Note to Answer) rinpatch 2019-06-01 21:49:18 +0300
  • cfa588e357 Fix Credo issues rinpatch 2019-06-01 21:42:29 +0300
  • 6bc9e5c020 Mastodon API: Refresh the object before rendering it after voting rinpatch 2019-06-01 21:41:49 +0300
  • 444406167b Mastodon API: actually check for poll votes rinpatch 2019-06-01 21:41:23 +0300
  • 65db5e9f52 Resolve merge conflicts rinpatch 2019-06-01 16:29:58 +0300
  • 300d94c628 Add poll votes rinpatch 2019-06-01 16:07:01 +0300
  • ad5263c647 Merge remote-tracking branch 'upstream/develop' into admin-create-users Sachin Joshi 2019-06-01 11:42:37 +0545
  • 5534d4c676 make bulk user creation from admin works as a transaction Sachin Joshi 2019-06-01 11:17:53 +0545
  • e706b42f51 Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop' kaniini 2019-06-01 03:39:13 +0000
  • 14ef35f402 Merge branch 'bugfix/remove-others-follower-collections' into 'develop' kaniini 2019-06-01 03:26:46 +0000