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

Commit Graph

  • 829e997223 [#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests Ivan Tashkinov 2019-07-09 21:46:16 +03:00
  • 371d39e160 Merge develop Roman Chvanikov 2019-07-09 21:21:09 +03:00
  • 2bb945cb70 Merge branch 'docs/more-mastodon-api' into 'develop' kaniini 2019-07-09 18:20:36 +00:00
  • c91b5c87ff Docs/more mastodon api feld 2019-07-09 18:20:36 +00:00
  • 670a77ecbc Merge branch 'feature/allow-user-query-via-id' into 'develop' kaniini 2019-07-09 17:53:41 +00:00
  • 1417627d07 Merge branch 'remove-avatar-header' into 'develop' kaniini 2019-07-09 17:51:41 +00:00
  • 9a9b60cfbc Merge branch 'develop' into feature/allow-user-query-via-id Mark Felder 2019-07-09 12:49:04 -05:00
  • e19e829758 Merge branch 'fix/1019-correct-count-remote-users' into 'develop' kaniini 2019-07-09 17:36:35 +00:00
  • d6b0fce6e9 Fix/1019 correct count remote users Alexander Strizhakov 2019-07-09 17:36:35 +00:00
  • 4948117fcf Merge branch 'remove-swift' into 'develop' kaniini 2019-07-09 16:54:32 +00:00
  • b6fd16d0a4 Merge branch 'test-coverage' into 'develop' kaniini 2019-07-09 16:54:14 +00:00
  • 4e6e5d8042 reverse proxy tests Alexander Strizhakov 2019-07-09 16:54:13 +00:00
  • 1179a13533 Merge branch 'features/sec-websocket-protocol-header' into 'develop' kaniini 2019-07-09 16:52:22 +00:00
  • 1ab4e35f27 Merge branch 'enable-ogp-by-default' into 'develop' Haelwenn 2019-07-09 16:07:20 +00:00
  • 167f810ff1 Merge branch 'proxy-error' into 'develop' feld 2019-07-09 16:00:44 +00:00
  • e143747445 Add test for URLs with Unicode characters too Mark Felder 2019-07-09 10:55:36 -05:00
  • 95c085174d Merge branch 'test-speedup' into 'develop' Haelwenn 2019-07-09 15:35:28 +00:00
  • ce3ffad13a Remove duplicated test. New one is more comprehensive. Mark Felder 2019-07-09 10:23:22 -05:00
  • 31a59d6f23 Merge branch 'develop' into proxy-error Mark Felder 2019-07-09 10:18:30 -05:00
  • 98f13eac9e Capitalize Mark Felder 2019-07-09 10:11:42 -05:00
  • 4213a4e2aa Test that all ASCII encoded characters are preserved Mark Felder 2019-07-09 09:41:41 -05:00
  • 376a55c97f Merge branch '161-incoming-replies-depth-limit' into 'develop' rinpatch 2019-07-09 14:15:10 +00:00
  • dd5a41e2a4 Apply suggestion to docs/config.md Ivan Tashkinov 2019-07-09 10:39:36 +00:00
  • 8574ebfc12 Merge branch 'fix/966-local-user-search' into 'develop' lain 2019-07-09 08:52:49 +00:00
  • 23d4781e73 change for local user search Alexander Strizhakov 2019-07-09 08:52:49 +00:00
  • abe2e8881f Testing: Don't federate in testing. lain 2019-07-09 15:30:51 +09:00
  • 3a406db430 Merge branch 'fix/relationships-in-statuses' into 'develop' Haelwenn 2019-07-08 20:40:59 +00:00
  • 46cf81a544 [#878] Formatting fix. Ivan Tashkinov 2019-07-08 20:05:02 +03:00
  • daff85a985 [#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity. Ivan Tashkinov 2019-07-08 19:53:02 +03:00
  • f3cc2acb0f Add a changelog entry for changing the defaults rinpatch 2019-07-08 14:13:30 +03:00
  • 44b2e1fdad Formatting rinpatch 2019-07-08 14:05:57 +03:00
  • f5b91bc157 Improve wording in CHANGELOG.md rinpatch 2019-07-08 13:04:14 +03:00
  • 682f1897b7 Enable OpenGraph and TwitterCard by default rinpatch 2019-07-08 13:00:45 +03:00
  • 9e58d3c624 FallbackRedirector: Do not crash on Metadata rendering errors rinpatch 2019-07-08 12:59:49 +03:00
  • 7f609ee8f4 OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent rinpatch 2019-07-08 12:16:32 +03:00
  • 72b88c82bc Mastodon API: Fix embedded relationships not being rendered inside of statuses rinpatch 2019-07-08 11:47:40 +03:00
  • f5ad430974 make sure the url used by proxy is same as origin url encoding or decoding it breaks some of the signed url Sachin Joshi 2019-07-07 14:13:40 +05:45
  • b5ba41a725
         mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header Haelwenn (lanodan) Monnier 2019-07-07 08:58:24 +02:00
  • e174614eb9
         MastoAPI Streaming: Keep compatibility with access_token Haelwenn (lanodan) Monnier 2019-07-06 20:26:08 +02:00
  • a7885748c7
         MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol KokaKiwi 2019-06-22 19:45:21 +02:00
  • 9f23502856 Fix docs Maxim Filippov 2019-07-06 15:16:56 +03:00
  • e2f4135a8c Apply suggestion to CHANGELOG.md Ivan Tashkinov 2019-07-06 07:18:26 +00:00
  • ad8d86e7c6 Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit Ivan Tashkinov 2019-07-06 10:17:06 +03:00
  • 3589b30ddc Merge branch 'fix/1058-uploads-dir-consistency' into 'develop' rinpatch 2019-07-05 18:55:27 +00:00
  • 6c50fbcd14 Admin API: Allow querying user by ID Maxim Filippov 2019-07-05 19:33:53 +03:00
  • c1c0091441 Merge branch 'issue/1043' into 'develop' Haelwenn 2019-07-05 04:22:09 +00:00
  • 6dadf5d6f4 [#1043] fix search accounts. Maksim 2019-07-05 04:22:08 +00:00
  • 977c2d0448
         tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir Haelwenn (lanodan) Monnier 2019-07-05 06:19:27 +02:00
  • 497788a3cc Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop' rinpatch 2019-07-03 18:35:57 +00:00
  • 15eb1235ed Expose skip_thread_containment in nodeinfo Eugenij 2019-07-03 18:35:57 +00:00
  • 9b45feae9b Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop' feld 2019-07-03 16:54:47 +00:00
  • efefee8241 Split alters rather than work with indexes Roman Chvanikov 2019-07-03 14:56:02 +03:00
  • 079266d406 Merge branch 'handle-search-timeout' into 'develop' rinpatch 2019-07-03 10:19:51 +00:00
  • 5184b0f41a Use fallback values for search queries Eugenij 2019-07-03 10:19:51 +00:00
  • 11143c542a Remove httpoison from dependencies Egor Kislitsyn 2019-07-03 14:42:24 +07:00
  • 4f42093220 Remove Uploaders.Swift Egor Kislitsyn 2019-07-03 14:11:04 +07:00
  • dcadf34471 Merge branch '1048-semver-format-compliance' into 'develop' Haelwenn 2019-07-03 01:34:16 +00:00
  • 291d95dcc3 Fix migration Roman Chvanikov 2019-07-03 01:14:40 +03:00
  • 8c7d7cc936 [#1048] Fixed version parsing in pleroma_ctl. Closes #1036. Ivan Tashkinov 2019-07-02 18:47:53 +03:00
  • a02f52d12a [#1048] Resolved violations of SemVer version format. Refactoring. Ivan Tashkinov 2019-07-02 09:04:59 +03:00
  • a565dbde4f Merge branch 'admin-report-view-user-fallback' into 'develop' kaniini 2019-07-02 01:27:00 +00:00
  • ab50c6b3ca Add fallback value to the admin report view. Eugenij 2019-07-02 01:27:00 +00:00
  • 79c88a257f Merge branch 'fix/changelog' into 'develop' rinpatch 2019-07-01 11:46:07 +00:00
  • 0b3561ae72 Move changelog entries Maxim Filippov 2019-07-01 14:04:24 +03:00
  • 3b05f834f4 Merge branch 'fix/docs-dry-run' into 'develop' Haelwenn 2019-07-01 04:52:42 +00:00
  • ce827a1626 Merge branch 'ci-improvements' into 'develop' Haelwenn 2019-07-01 04:51:56 +00:00
  • 47efe52c50 Merge branch 'chore/changelog-update' into 'develop' Haelwenn 2019-07-01 04:45:00 +00:00
  • 5f1dd4fe80 Merge branch 'issue/1033' into 'develop' feld 2019-07-01 01:08:07 +00:00
  • 85c7916c94 [#1033] Fix database migrations Maksim 2019-07-01 01:08:07 +00:00
  • 611f6665ac Update changelog and admin API docs with tags, display_name, avatar additions Maxim Filippov 2019-07-01 03:36:42 +03:00
  • d2cb18b2a3 Merge branch 'develop' into feature/digest-email Roman Chvanikov 2019-06-30 21:23:35 +03:00
  • a799418573 [#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit Ivan Tashkinov 2019-06-30 16:05:00 +03:00
  • 2b9d914089 [#161] Refactoring, documentation. Ivan Tashkinov 2019-06-30 15:58:50 +03:00
  • 044eb039c2 OTP Release install docs: Remove --dry-run in cron certbot command rinpatch 2019-06-30 13:06:10 +03:00
  • 66380d36d5 Merge branch 'filter-user-statuses-by-hashtag' into 'develop' rinpatch 2019-06-30 09:08:46 +00:00
  • 1f76740e10 Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) Eugenij 2019-06-30 09:08:46 +00:00
  • e5df6487c8 Merge branch 'issues/1026' into 'develop' rinpatch 2019-06-30 07:28:35 +00:00
  • acd20f166b [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text Maksim 2019-06-30 07:28:35 +00:00
  • 4a1c36e18f Merge branch 'fix/pin-unlisted' into 'develop' Haelwenn 2019-06-30 00:59:40 +00:00
  • 4c60a562a7 Fix not being able to pin unlisted posts rinpatch 2019-06-29 22:24:03 +03:00
  • 5b7b1040b3 [#161] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching. Ivan Tashkinov 2019-06-29 20:04:50 +03:00
  • bdc1592377 Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs rinpatch 2019-06-29 14:25:47 +03:00
  • 9b1e75bac8 Merge branch 'my-develop' into 'develop' rinpatch 2019-06-29 11:24:14 +00:00
  • 4c40ada7a5 Add a caveat for docker deployment in the config docs deorsum 2019-06-29 20:39:03 +10:00
  • a8c9522e04 Merge branch 'revert/tags-releases-develop' into 'develop' rinpatch 2019-06-29 10:39:52 +00:00
  • 9504544d5b Merge branch 'revert/tags-releases' into 'master' rinpatch 2019-06-29 10:35:32 +00:00
  • 0f6e333d8b Revert "Build releases only on tags or develop" rinpatch 2019-06-29 13:27:15 +03:00
  • 5bc9e6e0f3 Revert "Build releases only on tags or develop" rinpatch 2019-06-29 13:24:26 +03:00
  • e9426d15d8 Merge branch 'rebase/docs-master' into 'master' rinpatch 2019-06-29 09:49:38 +00:00
  • 54d2873770 Build releases only on tags or develop rinpatch 2019-06-29 12:29:12 +03:00
  • f810acc7b0 Merge branch 'fix/no-untagged-builds-master' into 'develop' rinpatch 2019-06-29 09:41:31 +00:00
  • ee79c67081 Build releases only on tags or develop rinpatch 2019-06-29 12:29:12 +03:00
  • 9b014eae68 Add a warning about service files assuming installation paths rinpatch 2019-06-29 11:35:42 +03:00
  • 69585a3218 Move all upload contents despite upload folder itself. Yuji Nakao 2019-06-29 04:24:44 +00:00
  • d9f8230d2c Update migrating_from_source_otp_en.md: Replace reload-daemon with daemon-reload. Yuji Nakao 2019-06-29 04:17:49 +00:00
  • c82024adcb Merge branch 'fix/release-docs-path-warning' into 'develop' rinpatch 2019-06-29 08:44:56 +00:00
  • eddcebf8ae Add a warning about service files assuming installation paths rinpatch 2019-06-29 11:35:42 +03:00
  • b6cfc8f98b Merge branch 'patch-3' into 'develop' rinpatch 2019-06-29 06:01:33 +00:00
  • b20b2d862a Merge branch 'patch-2' into 'develop' rinpatch 2019-06-29 06:01:30 +00:00
  • ab6de9b478 Move all upload contents despite upload folder itself. Yuji Nakao 2019-06-29 04:24:44 +00:00