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

Commit Graph

  • 422aa6befe Ostatus DeleteHandler: Fix for new option format. lain 2019-10-11 12:53:09 +02:00
  • cb8492962e SearchController: Fix test. lain 2019-10-11 12:41:44 +02:00
  • b750135acd pleroma_ctl: Make it possible to specify branches/flavours when updating rinpatch 2019-10-11 13:22:21 +03:00
  • 37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject. lain 2019-10-11 11:48:58 +02:00
  • 9b963064eb Transmogrifier: Actually store who deleted a note. lain 2019-10-11 11:25:45 +02:00
  • f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it Maxim Filippov 2019-10-11 00:24:31 +03:00
  • fb5dce481c Fix https://git.pleroma.social/pleroma/pleroma/issues/1289 yalh76 2019-10-10 20:05:54 +00:00
  • 059005ff82
         Replace user.following with Pleroma.FollowingRelationship Egor Kislitsyn 2019-10-11 02:35:32 +07:00
  • 29647dfd09 Transmogrifier: Save correct ids for incoming deletes. lain 2019-10-10 17:17:33 +02:00
  • 2c7ff32e5b
         Add thread_visibility to migrations Egor Kislitsyn 2019-10-10 21:11:34 +07:00
  • ecd7ac855b Benchmark config: Don't use the sql sandbox. lain 2019-10-10 15:42:54 +02:00
  • b9b00e6e96 Gitlab CI: Run correct benchmark task. lain 2019-10-10 15:31:32 +02:00
  • 2629493804 Benchmark config: Database adjustments. lain 2019-10-10 15:01:06 +02:00
  • c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing lain 2019-10-10 14:40:59 +02:00
  • d7f9679ff2 Merge branch 'develop' into 'reactions' lain 2019-10-10 12:38:51 +00:00
  • 02f8e2a8ab Gitlab: Run benchmark in CI. lain 2019-10-10 14:24:54 +02:00
  • 24eecc3cb4 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update Maxim Filippov 2019-10-10 03:33:55 +03:00
  • 9fd5176c35 Merge branch 'unicode-search' into 'develop' kaniini 2019-10-09 16:33:05 +00:00
  • c9b3f0151b Merge branch 'webfinger-mocks' into 'develop' kaniini 2019-10-09 16:32:28 +00:00
  • dc6d20b68d provide mocks for webfinger endpoints Steven Fuchs 2019-10-09 16:32:28 +00:00
  • 1357ec1a10 Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop' lain 2019-10-09 15:10:08 +00:00
  • 0d7109254b Migrations: Create index after filling up the db. lain 2019-10-09 16:55:58 +02:00
  • f64dfd317f Merge branch 'feature/count-statuses-task' into 'develop' lain 2019-10-09 14:11:23 +00:00
  • ad42837244 Ability to toggle activation status and permission group for a group of users Maxim Filippov 2019-10-09 17:03:54 +03:00
  • c1bae01376 Search: Add tests for unicode searches. lain 2019-10-09 16:03:45 +02:00
  • d537bfd4e1
         Add a task to re-count statuses for all users Egor Kislitsyn 2019-10-09 13:11:57 +07:00
  • 580a67f5ca Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id) eugenijm 2019-10-09 06:51:14 +03:00
  • 761ad0b48e
         Split CreateFollowingRelationships to multiple migrations Egor Kislitsyn 2019-10-08 20:27:42 +07:00
  • 6291eaa590 Update CreateFollowingRelationships Egor Kislitsyn 2019-10-08 13:06:48 +07:00
  • 6355694309 Merge branch 'chore/format-migrations' into 'develop' rinpatch 2019-10-08 12:28:10 +00:00
  • 32808208be Enable mix format for migrations rinpatch 2019-10-08 15:16:39 +03:00
  • 12ebeef130
         Add CreateFollowingRelationships migration Egor Kislitsyn 2019-10-07 19:36:10 +07:00
  • 0ff1985304 Object: Use ap_id column. lain 2019-10-08 12:21:45 +02:00
  • 8785ad8d90 Object: Automatically set ap_id from the data. lain 2019-10-08 11:57:28 +02:00
  • 51c1578780 Object: Add the ap_id column. lain 2019-10-07 18:06:48 +02:00
  • 44e0c5cabb Merge branch 'chore/bump-fe-122323f3' into 'develop' rinpatch 2019-10-07 14:54:24 +00:00
  • a502155274 Bump pleroma-fe bundle to 122323f35c rinpatch 2019-10-07 17:42:33 +03:00
  • ac113f6724 Merge branch 'backport/exclude-replies' into 'maint/1.1' kaniini 2019-10-07 13:12:46 +00:00
  • aa7fd616c7 Line is too long! Maxim Filippov 2019-10-07 16:03:23 +03:00
  • 3e1d2ace73 mastodon api: fix exclude_replies (closes #1287) Ariadne Conill 2019-10-07 12:29:33 +00:00
  • 380c67e2c3 Merge branch 'bugfix/exclude-replies' into 'develop' kaniini 2019-10-07 12:43:21 +00:00
  • 35068baf65 Merge branch 'develop' into feature/reports-groups-and-multiple-state-update Maxim Filippov 2019-10-07 15:41:41 +03:00
  • 7aceaa517b Admin API: Reports, grouped by status Maxim Filippov 2019-10-07 15:01:18 +03:00
  • 6c278cfe09 Merge branch 'develop' into 'reactions' lain 2019-10-07 12:31:51 +00:00
  • 9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287) Ariadne Conill 2019-10-07 12:29:33 +00:00
  • 0a99f1e8c5 Merge branch 'feature/move-rss-out-of-ostatus' into 'develop' kaniini 2019-10-07 12:20:41 +00:00
  • 4b3f77a99f Extract RSS Feed functionality from OStatus Sergey Suprunenko 2019-10-07 12:20:41 +00:00
  • 72bd763d9f Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1' v1.0.91 kaniini 2019-10-07 12:14:56 +00:00
  • 129fb9f499 update changelog date Ariadne Conill 2019-10-07 12:14:04 +00:00
  • d928f0c4c3 Merge branch 'chore/maint-1.1-1.1.0-rc2' into 'maint/1.1' kaniini 2019-10-07 12:12:45 +00:00
  • c5b7d2ef26 Pleroma 1.0.91 (aka 1.1 RC2). Ariadne Conill 2019-10-07 12:10:36 +00:00
  • e8395bedd2 Merge branch 'develop' into 'reactions' lain 2019-10-07 12:10:27 +00:00
  • 079d069eb4 Merge branch 'backport/remove-direct-messages-from-public-timeline' into 'maint/1.1' kaniini 2019-10-07 11:40:31 +00:00
  • cb36fe0128 Merge branch 'backport/chore-context-cleanups' into 'maint/1.1' kaniini 2019-10-07 11:37:01 +00:00
  • d3e04d5590 clean up bundled litepub schema (closes #1303) Ariadne Conill 2019-10-07 11:33:58 +00:00
  • 5c32e6ee91 Merge branch 'chore/context-cleanups' into 'develop' kaniini 2019-10-07 11:34:50 +00:00
  • 19962d2022 clean up bundled litepub schema (closes #1303) Ariadne Conill 2019-10-07 11:33:58 +00:00
  • 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 +03:00
  • d580eedfe9 Linting. lain 2019-10-07 12:40:33 +02:00
  • 73b6512907 Merge remote-tracking branch 'origin/develop' into reactions lain 2019-10-07 12:30:59 +02:00
  • 93bdc55306 Merge branch 'mrf/simple_policy/check_actor' into 'develop' kaniini 2019-10-07 10:19:24 +00:00
  • 15592f1abe Merge branch '1260-rate-limited-auth-actions' into 'develop' Haelwenn 2019-10-07 09:16:42 +00:00
  • 28fb98d69e Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions Ivan Tashkinov 2019-10-07 11:06:30 +03:00
  • 91e90aa807 Merge branch 'misskey-compat' into 'reactions' lain 2019-10-07 07:25:27 +00:00
  • b4f3c16885 Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop' Haelwenn 2019-10-07 02:14:45 +00:00
  • 58aeabd020
         mrf/simple_policy: check actor against accept/reject Haelwenn (lanodan) Monnier 2019-10-07 02:55:09 +02:00
  • f6ff19e074 Merge branch 'backport/custom-field-update' into 'maint/1.1' kaniini 2019-10-06 15:33:33 +00:00
  • b5e6ba323d Merge branch 'backport/key-moveout-1.1' into 'maint/1.1' rinpatch 2019-10-06 15:32:33 +00:00
  • c6b7980303 changelog Ariadne Conill 2019-10-06 15:17:33 +00:00
  • e442180d11 Fix muted notification migration only working with a schema rinpatch 2019-10-06 17:53:03 +03:00
  • 25cffffaf1 Merge branch 'fix/bad-migration' into 'develop' kaniini 2019-10-06 15:15:00 +00:00
  • c5338764df Extract if block into private function kPherox 2019-08-26 17:09:32 +09:00
  • cc84563796 Update test for custom fields when content-type urlencoded kPherox 2019-08-26 03:49:47 +09:00
  • 86bc83efe5 Update test for custom fields when name empty string kPherox 2019-08-26 03:25:06 +09:00
  • db6c5aa66a Change to delete empty name field kPherox 2019-08-25 07:04:46 +09:00
  • 313b134fac Fix type of fields_attributes kPherox 2019-08-25 07:02:32 +09:00
  • 81abee22b6 Rename fields to fields_attributes kPherox 2019-08-25 06:51:05 +09:00
  • 8a52f30356 Merge branch 'backport/feature-poll-refresh' into 'maint/1.1' kaniini 2019-10-06 15:07:38 +00:00
  • ee88afb2e2 Fix muted notification migration only working with a schema rinpatch 2019-10-06 17:53:03 +03:00
  • 10f4ce848a Merge branch 'backport/fix-report-email' into 'maint/1.1' kaniini 2019-10-06 14:59:58 +00:00
  • bab901bfd7 add changelog Ariadne Conill 2019-10-06 14:54:44 +00:00
  • c7313c8dfb Fix credo issues rinpatch 2019-09-18 22:09:03 +03:00
  • 40c7d6fa17 Do not refetch local objects rinpatch 2019-09-18 19:59:23 +03:00
  • 644bc1e64a Preserve internal fields when reinjecting rinpatch 2019-09-18 19:53:51 +03:00
  • 845e8ad5f6 Move object internal fields to a constant rinpatch 2019-09-18 19:24:20 +03:00
  • b9cdead076 Set updated_at even if the object stayed the same rinpatch 2019-09-18 19:07:25 +03:00
  • 8be9a9b5bb Fix wrong argument order when calling NaiveDateTime.diff rinpatch 2019-09-18 18:52:33 +03:00
  • f95ae0e50a Capture log in object refetch tests rinpatch 2019-09-18 18:31:24 +03:00
  • eae9a6d34d Initial poll refresh support rinpatch 2019-09-18 18:13:21 +03:00
  • 2a2d834ff7 Use the user.id instead of nickname in report URLs feld 2019-10-06 14:13:04 +00:00
  • a0d336a828 Fix the use of queries with a schema in a migration rinpatch 2019-10-06 17:05:51 +03:00
  • c58da11182 Move local keys out of user.info rinpatch 2019-10-06 16:22:35 +03:00
  • 2411d09215 Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop' kaniini 2019-10-06 14:32:56 +00:00
  • 125f96e706 Fix the use of queries with a schema in a migration rinpatch 2019-10-06 17:05:51 +03:00
  • 09a3b993fe Merge branch 'fix/report-email' into 'develop' feld 2019-10-06 14:13:04 +00:00
  • 1d8e956c32 Use the user.id instead of nickname in report URLs feld 2019-10-06 14:13:04 +00:00
  • 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 +03:00
  • fefbd31c6e Move local keys out of user.info rinpatch 2019-10-06 16:22:35 +03:00
  • 06b3bb54c5 Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes Ivan Tashkinov 2019-10-06 11:43:49 +03:00
  • 61097ba6ab Merge branch 'develop' into 'reactions' lain 2019-10-06 08:11:47 +00:00