Commit graph

  • 12ebeef130
    Add CreateFollowingRelationships migration Egor Kislitsyn 2019-10-07 19:36:10 +0700
  • 44e0c5cabb Merge branch 'chore/bump-fe-122323f3' into 'develop' rinpatch 2019-10-07 14:54:24 +0000
  • a502155274 Bump pleroma-fe bundle to 122323f35c rinpatch 2019-10-07 17:42:33 +0300
  • ac113f6724 Merge branch 'backport/exclude-replies' into 'maint/1.1' kaniini 2019-10-07 13:12:46 +0000
  • aa7fd616c7 Line is too long! Maxim Filippov 2019-10-07 16:03:23 +0300
  • 3e1d2ace73 mastodon api: fix exclude_replies (closes #1287) Ariadne Conill 2019-10-07 12:29:33 +0000
  • 380c67e2c3 Merge branch 'bugfix/exclude-replies' into 'develop' kaniini 2019-10-07 12:43:21 +0000
  • 35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update Maxim Filippov 2019-10-07 15:41:41 +0300
  • 7aceaa517b Admin API: Reports, grouped by status Maxim Filippov 2019-10-07 15:01:18 +0300
  • 6c278cfe09 Merge branch 'develop' into 'reactions' lain 2019-10-07 12:31:51 +0000
  • 9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287) Ariadne Conill 2019-10-07 12:29:33 +0000
  • 0a99f1e8c5 Merge branch 'feature/move-rss-out-of-ostatus' into 'develop' kaniini 2019-10-07 12:20:41 +0000
  • 4b3f77a99f Extract RSS Feed functionality from OStatus Sergey Suprunenko 2019-10-07 12:20:41 +0000
  • 72bd763d9f Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1' kaniini 2019-10-07 12:14:56 +0000
  • 129fb9f499 update changelog date Ariadne Conill 2019-10-07 12:14:04 +0000
  • d928f0c4c3 Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1' kaniini 2019-10-07 12:12:45 +0000
  • c5b7d2ef26 Pleroma 1.0.91 (aka 1.1 RC2). Ariadne Conill 2019-10-07 12:10:36 +0000
  • e8395bedd2 Merge branch 'develop' into 'reactions' lain 2019-10-07 12:10:27 +0000
  • 079d069eb4 Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1' kaniini 2019-10-07 11:40:31 +0000
  • cb36fe0128 Merge branch 'backport/chore-context-cleanups' into 'maint/1.1' kaniini 2019-10-07 11:37:01 +0000
  • d3e04d5590 clean up bundled litepub schema (closes #1303) Ariadne Conill 2019-10-07 11:33:58 +0000
  • 5c32e6ee91 Merge branch 'chore/context-cleanups' into 'develop' kaniini 2019-10-07 11:34:50 +0000
  • 19962d2022 clean up bundled litepub schema (closes #1303) Ariadne Conill 2019-10-07 11:33:58 +0000
  • 790ae8e189 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public) eugenijm 2019-09-20 17:54:38 +0300
  • d580eedfe9 Linting. lain 2019-10-07 12:40:33 +0200
  • 73b6512907 Merge remote-tracking branch 'origin/develop' into reactions lain 2019-10-07 12:30:59 +0200
  • 93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop' kaniini 2019-10-07 10:19:24 +0000
  • 15592f1abe Merge branch '1260-rate-limited-auth-actions' into 'develop' Haelwenn 2019-10-07 09:16:42 +0000
  • 28fb98d69e Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions Ivan Tashkinov 2019-10-07 11:06:30 +0300
  • 91e90aa807 Merge branch 'misskey-compat' into 'reactions' lain 2019-10-07 07:25:27 +0000
  • b4f3c16885 Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' Haelwenn 2019-10-07 02:14:45 +0000
  • 58aeabd020
    mrf/simple_policy: check actor against accept/reject Haelwenn (lanodan) Monnier 2019-10-07 02:55:09 +0200
  • f6ff19e074 Merge branch 'backport/custom-field-update' into 'maint/1.1' kaniini 2019-10-06 15:33:33 +0000
  • b5e6ba323d Merge branch 'backport/key-moveout-1.1' into 'maint/1.1' rinpatch 2019-10-06 15:32:33 +0000
  • c6b7980303 changelog Ariadne Conill 2019-10-06 15:17:33 +0000
  • e442180d11 Fix muted notification migration only working with a schema rinpatch 2019-10-06 17:53:03 +0300
  • 25cffffaf1 Merge branch 'fix/bad-migration' into 'develop' kaniini 2019-10-06 15:15:00 +0000
  • c5338764df Extract if block into private function kPherox 2019-08-26 17:09:32 +0900
  • cc84563796 Update test for custom fields when content-type urlencoded kPherox 2019-08-26 03:49:47 +0900
  • 86bc83efe5 Update test for custom fields when name empty string kPherox 2019-08-26 03:25:06 +0900
  • db6c5aa66a Change to delete empty name field kPherox 2019-08-25 07:04:46 +0900
  • 313b134fac Fix type of fields_attributes kPherox 2019-08-25 07:02:32 +0900
  • 81abee22b6 Rename fields to fields_attributes kPherox 2019-08-25 06:51:05 +0900
  • 8a52f30356 Merge branch 'backport/feature-poll-refresh' into 'maint/1.1' kaniini 2019-10-06 15:07:38 +0000
  • ee88afb2e2 Fix muted notification migration only working with a schema rinpatch 2019-10-06 17:53:03 +0300
  • 10f4ce848a Merge branch 'backport/fix-report-email' into 'maint/1.1' kaniini 2019-10-06 14:59:58 +0000
  • bab901bfd7 add changelog Ariadne Conill 2019-10-06 14:54:44 +0000
  • c7313c8dfb Fix credo issues rinpatch 2019-09-18 22:09:03 +0300
  • 40c7d6fa17 Do not refetch local objects rinpatch 2019-09-18 19:59:23 +0300
  • 644bc1e64a Preserve internal fields when reinjecting rinpatch 2019-09-18 19:53:51 +0300
  • 845e8ad5f6 Move object internal fields to a constant rinpatch 2019-09-18 19:24:20 +0300
  • b9cdead076 Set updated_at even if the object stayed the same rinpatch 2019-09-18 19:07:25 +0300
  • 8be9a9b5bb Fix wrong argument order when calling NaiveDateTime.diff rinpatch 2019-09-18 18:52:33 +0300
  • f95ae0e50a Capture log in object refetch tests rinpatch 2019-09-18 18:31:24 +0300
  • eae9a6d34d Initial poll refresh support rinpatch 2019-09-18 18:13:21 +0300
  • 2a2d834ff7 Use the user.id instead of nickname in report URLs feld 2019-10-06 14:13:04 +0000
  • a0d336a828 Fix the use of queries with a schema in a migration rinpatch 2019-10-06 17:05:51 +0300
  • c58da11182 Move local keys out of user.info rinpatch 2019-10-06 16:22:35 +0300
  • 2411d09215 Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop' kaniini 2019-10-06 14:32:56 +0000
  • 125f96e706 Fix the use of queries with a schema in a migration rinpatch 2019-10-06 17:05:51 +0300
  • 09a3b993fe Merge branch 'fix/report-email' into 'develop' feld 2019-10-06 14:13:04 +0000
  • 1d8e956c32 Use the user.id instead of nickname in report URLs feld 2019-10-06 14:13:04 +0000
  • b93856874d [#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-10-06 17:12:17 +0300
  • fefbd31c6e Move local keys out of user.info rinpatch 2019-10-06 16:22:35 +0300
  • 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-10-06 11:43:49 +0300
  • 61097ba6ab Merge branch 'develop' into 'reactions' lain 2019-10-06 08:11:47 +0000
  • f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions Ivan Tashkinov 2019-10-06 09:30:49 +0300
  • 9e34919dcd Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop' Haelwenn 2019-10-06 04:41:06 +0000
  • 294e08cb65 Merge branch 'backport/update-activity-fixes' into 'maint/1.1' kaniini 2019-10-05 19:46:23 +0000
  • 565809592c update changelog Ariadne Conill 2019-10-05 19:32:23 +0000
  • b97a7709c7 CommonAPI: Create profile updates as public. lain 2019-10-05 14:53:50 +0200
  • 4d85e07e9e ActivityPub / Transmogrifier: Correctly store incoming Update id. lain 2019-10-05 14:49:45 +0200
  • 7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop' kaniini 2019-10-05 19:28:53 +0000
  • 45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop' kaniini 2019-10-05 19:28:29 +0000
  • 17ff4b43cb Merge branch 'unread-conversation-count' into 'develop' kaniini 2019-10-05 19:28:07 +0000
  • f1c77f9682 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-10-05 18:22:05 +0100
  • 8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity eugenijm 2019-10-02 00:37:08 +0300
  • 0ee6100c8d Merge branch 'update-activity-fixes' into 'develop' kaniini 2019-10-05 15:51:19 +0000
  • 1ed8fbc4d9 Merge remote-tracking branch 'origin/develop' into reactions lain 2019-10-05 15:10:57 +0200
  • 276a520163 CommonAPI: Create profile updates as public. lain 2019-10-05 14:53:50 +0200
  • 4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id. lain 2019-10-05 14:49:45 +0200
  • b1ff66dc5f Add test for handling Announces with inlined object from different origin Thibaut Girka 2019-10-05 12:46:06 +0200
  • 791d93ff0e Make credo happy Thibaut Girka 2019-10-02 13:46:06 +0200
  • 977e711e22 Import object from self-Announce whenever possible Thibaut Girka 2019-10-02 13:18:51 +0200
  • e51c20f28a Merge branch 'revert-5c04e817' into 'develop' kaniini 2019-10-05 10:00:44 +0000
  • e07e9cb75e Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'" kaniini 2019-10-05 10:00:05 +0000
  • 6a85f7d1ea Transmogrifier: Extend misskey like compatibility. lain 2019-10-05 10:45:42 +0200
  • d9aaea44ff Merge remote-tracking branch 'origin/develop' into reactions lain 2019-10-05 10:42:29 +0200
  • 4168ead672 Merge branch 'backport/bugfix-notification-nil-actor' into 'maint/1.1' kaniini 2019-10-04 22:37:45 +0000
  • 2714caac8b update changelog Ariadne Conill 2019-10-04 21:43:15 +0000
  • dbd78de176 notification_view.ex: Make sure account isn’t empty Haelwenn (lanodan) Monnier 2019-10-04 06:47:36 +0200
  • 43be47c161 Merge branch 'backport/hex-flake-id' into 'maint/1.1' kaniini 2019-10-04 22:11:34 +0000
  • 15513f02d0 Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1' kaniini 2019-10-04 22:01:38 +0000
  • c19e539d37 changelog Ariadne Conill 2019-10-04 22:00:18 +0000
  • 67d772dd73 Replace Pleroma.FlakeId with flake_id hex package Egor Kislitsyn 2019-09-18 21:54:31 +0700
  • 7307d7d676 Track failed proxy urls and don't request them again Sergey Suprunenko 2019-10-01 20:00:27 +0000
  • 1dd6d81ddf Merge branch 'backport/issue-1296' into 'maint/1.1' kaniini 2019-10-04 21:47:34 +0000
  • a859abed2e update changelog Ariadne Conill 2019-10-04 21:36:49 +0000
  • 16a1f95623 removed legacy api: "/objects/:uuid/likes" Maksim Pechnikov 2019-10-04 22:20:53 +0300
  • 923dff21b3 Merge branch 'backport/undo-fixes' into 'maint/1.1' kaniini 2019-10-04 21:29:01 +0000