Commit graph

  • 3a406db430 Merge branch 'fix/relationships-in-statuses' into 'develop' Haelwenn 2019-07-08 20:40:59 +0000
  • 46cf81a544 [#878] Formatting fix. Ivan Tashkinov 2019-07-08 20:05:02 +0300
  • 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 +0300
  • f3cc2acb0f Add a changelog entry for changing the defaults rinpatch 2019-07-08 14:13:30 +0300
  • 44b2e1fdad Formatting rinpatch 2019-07-08 14:05:57 +0300
  • f5b91bc157 Improve wording in CHANGELOG.md rinpatch 2019-07-08 13:04:14 +0300
  • 682f1897b7 Enable OpenGraph and TwitterCard by default rinpatch 2019-07-08 13:00:45 +0300
  • 9e58d3c624 FallbackRedirector: Do not crash on Metadata rendering errors rinpatch 2019-07-08 12:59:49 +0300
  • 7f609ee8f4 OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent rinpatch 2019-07-08 12:16:32 +0300
  • 72b88c82bc Mastodon API: Fix embedded relationships not being rendered inside of statuses rinpatch 2019-07-08 11:47:40 +0300
  • 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 +0545
  • b5ba41a725
    mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header Haelwenn (lanodan) Monnier 2019-07-07 08:58:24 +0200
  • e174614eb9
    MastoAPI Streaming: Keep compatibility with access_token Haelwenn (lanodan) Monnier 2019-07-06 20:26:08 +0200
  • a7885748c7
    MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol KokaKiwi 2019-06-22 19:45:21 +0200
  • ed709aec2c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-07-06 18:41:06 +0100
  • 9f23502856 Fix docs Maxim Filippov 2019-07-06 15:16:56 +0300
  • e2f4135a8c Apply suggestion to CHANGELOG.md Ivan Tashkinov 2019-07-06 07:18:26 +0000
  • ad8d86e7c6 Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit Ivan Tashkinov 2019-07-06 10:17:06 +0300
  • 3589b30ddc Merge branch 'fix/1058-uploads-dir-consistency' into 'develop' rinpatch 2019-07-05 18:55:27 +0000
  • 6c50fbcd14 Admin API: Allow querying user by ID Maxim Filippov 2019-07-05 19:33:53 +0300
  • c1c0091441 Merge branch 'issue/1043' into 'develop' Haelwenn 2019-07-05 04:22:09 +0000
  • 6dadf5d6f4 [#1043] fix search accounts. Maksim 2019-07-05 04:22:08 +0000
  • 977c2d0448
    tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir Haelwenn (lanodan) Monnier 2019-07-05 06:19:27 +0200
  • 497788a3cc Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop' rinpatch 2019-07-03 18:35:57 +0000
  • 15eb1235ed Expose skip_thread_containment in nodeinfo Eugenij 2019-07-03 18:35:57 +0000
  • 9b45feae9b Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop' feld 2019-07-03 16:54:47 +0000
  • efefee8241 Split alters rather than work with indexes Roman Chvanikov 2019-07-03 14:56:02 +0300
  • 079266d406 Merge branch 'handle-search-timeout' into 'develop' rinpatch 2019-07-03 10:19:51 +0000
  • 5184b0f41a Use fallback values for search queries Eugenij 2019-07-03 10:19:51 +0000
  • 11143c542a Remove httpoison from dependencies Egor Kislitsyn 2019-07-03 14:42:24 +0700
  • 4f42093220 Remove Uploaders.Swift Egor Kislitsyn 2019-07-03 14:11:04 +0700
  • dcadf34471 Merge branch '1048-semver-format-compliance' into 'develop' Haelwenn 2019-07-03 01:34:16 +0000
  • 291d95dcc3 Fix migration Roman Chvanikov 2019-07-03 01:14:40 +0300
  • 8c7d7cc936 [#1048] Fixed version parsing in pleroma_ctl. Closes #1036. Ivan Tashkinov 2019-07-02 18:47:53 +0300
  • a02f52d12a [#1048] Resolved violations of SemVer version format. Refactoring. Ivan Tashkinov 2019-07-02 09:04:59 +0300
  • a565dbde4f Merge branch 'admin-report-view-user-fallback' into 'develop' kaniini 2019-07-02 01:27:00 +0000
  • ab50c6b3ca Add fallback value to the admin report view. Eugenij 2019-07-02 01:27:00 +0000
  • 4d8f97453b Add activity get mix task sadposter 2019-07-01 17:58:51 +0100
  • 79c88a257f Merge branch 'fix/changelog' into 'develop' rinpatch 2019-07-01 11:46:07 +0000
  • 0b3561ae72 Move changelog entries Maxim Filippov 2019-07-01 14:04:24 +0300
  • 3b05f834f4 Merge branch 'fix/docs-dry-run' into 'develop' Haelwenn 2019-07-01 04:52:42 +0000
  • ce827a1626 Merge branch 'ci-improvements' into 'develop' Haelwenn 2019-07-01 04:51:56 +0000
  • 47efe52c50 Merge branch 'chore/changelog-update' into 'develop' Haelwenn 2019-07-01 04:45:00 +0000
  • 5f1dd4fe80 Merge branch 'issue/1033' into 'develop' feld 2019-07-01 01:08:07 +0000
  • 85c7916c94 [#1033] Fix database migrations Maksim 2019-07-01 01:08:07 +0000
  • 611f6665ac Update changelog and admin API docs with tags, display_name, avatar additions Maxim Filippov 2019-07-01 03:36:42 +0300
  • d2cb18b2a3 Merge branch 'develop' into feature/digest-email Roman Chvanikov 2019-06-30 21:23:35 +0300
  • a799418573 [#161] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit Ivan Tashkinov 2019-06-30 16:05:00 +0300
  • 2b9d914089 [#161] Refactoring, documentation. Ivan Tashkinov 2019-06-30 15:58:50 +0300
  • 044eb039c2 OTP Release install docs: Remove --dry-run in cron certbot command rinpatch 2019-06-30 13:06:10 +0300
  • 66380d36d5 Merge branch 'filter-user-statuses-by-hashtag' into 'develop' rinpatch 2019-06-30 09:08:46 +0000
  • 1f76740e10 Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) Eugenij 2019-06-30 09:08:46 +0000
  • e5df6487c8 Merge branch 'issues/1026' into 'develop' rinpatch 2019-06-30 07:28:35 +0000
  • acd20f166b [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text Maksim 2019-06-30 07:28:35 +0000
  • 4a1c36e18f Merge branch 'fix/pin-unlisted' into 'develop' Haelwenn 2019-06-30 00:59:40 +0000
  • 4c60a562a7 Fix not being able to pin unlisted posts rinpatch 2019-06-29 22:24:03 +0300
  • 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 +0300
  • 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 +0300
  • 9b1e75bac8 Merge branch 'my-develop' into 'develop' rinpatch 2019-06-29 11:24:14 +0000
  • 4c40ada7a5 Add a caveat for docker deployment in the config docs deorsum 2019-06-29 20:39:03 +1000
  • a8c9522e04 Merge branch 'revert/tags-releases-develop' into 'develop' rinpatch 2019-06-29 10:39:52 +0000
  • 0f6e333d8b Revert "Build releases only on tags or develop" rinpatch 2019-06-29 13:27:15 +0300
  • f810acc7b0 Merge branch 'fix/no-untagged-builds-master' into 'develop' rinpatch 2019-06-29 09:41:31 +0000
  • ee79c67081 Build releases only on tags or develop rinpatch 2019-06-29 12:29:12 +0300
  • c82024adcb Merge branch 'fix/release-docs-path-warning' into 'develop' rinpatch 2019-06-29 08:44:56 +0000
  • eddcebf8ae Add a warning about service files assuming installation paths rinpatch 2019-06-29 11:35:42 +0300
  • b6cfc8f98b Merge branch 'patch-3' into 'develop' rinpatch 2019-06-29 06:01:33 +0000
  • b20b2d862a Merge branch 'patch-2' into 'develop' rinpatch 2019-06-29 06:01:30 +0000
  • ab6de9b478 Move all upload contents despite upload folder itself. Yuji Nakao 2019-06-29 04:24:44 +0000
  • b2548e65db Update migrating_from_source_otp_en.md: Replace reload-daemon with daemon-reload. Yuji Nakao 2019-06-29 04:17:49 +0000
  • d1549a6375 Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop' kaniini 2019-06-29 00:12:09 +0000
  • f375c2fd70 Merge branch 'feature/mrf-mediaproxy-warm' into 'develop' kaniini 2019-06-28 23:50:23 +0000
  • c22f0bfb80 test: add tests for mediaproxy warming policy William Pitcock 2019-06-28 23:41:42 +0000
  • 074ffee0b2 docs: add documentation for MediaProxyWarmingPolicy William Pitcock 2019-06-27 21:34:27 +0000
  • 034986e1fd MRF: add mediaproxy warming policy William Pitcock 2019-06-27 03:06:58 +0000
  • 657277ffc0 Resolve conflicts Roman Chvanikov 2019-06-29 00:52:50 +0300
  • c6668c2e7b Merge branch 'develop' into 'develop' rinpatch 2019-06-28 18:25:21 +0000
  • e556c96661 Update docs/installation/arch_linux_en.md, docs/installation/centos7_en.md, docs/installation/debian_based_en.md, docs/installation/debian_based_jp.md, docs/installation/gentoo_en.md files Julien Wehmschulte 2019-06-28 18:25:21 +0000
  • 87ba9d1bab Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-06-28 18:55:01 +0100
  • 456668b490 Merge branch 'release/1.0' into 'develop' lain 2019-06-28 15:29:44 +0000
  • 2286f62a36 Merge branch 'release-docs' into 'develop' lain 2019-06-28 15:26:09 +0000
  • da17bdd87e BUMP OF CHICKEN lain 2019-06-28 17:15:44 +0200
  • f5b015b998 Merge branch '2019-06-29-pleromafe' into 'develop' lain 2019-06-28 12:39:51 +0000
  • efad26bbb9 Update frontend. lain 2019-06-28 14:29:26 +0200
  • 90927e6a9a Kowalski, analysis! Maxim Filippov 2019-06-28 15:27:18 +0300
  • 452ca5250d Merge admin and mastodon user views for reports Maxim Filippov 2019-06-28 15:15:32 +0300
  • eeb419e3a0 Add a note about the develop branch rinpatch 2019-06-28 09:41:34 +0300
  • ad249f6f5f Merge branch 'fix/syslog-tag' into 'develop' kaniini 2019-06-27 21:30:54 +0000
  • e64c758cea Add changelog entry for syslog tag change Mark Felder 2019-06-27 16:25:55 -0500
  • f8ec3e129f In my experience syslog tags are usually lowercase Mark Felder 2019-06-27 13:00:22 -0500
  • e91f09cfe6 Add a note about OS/Distro packages in the readme rinpatch 2019-06-27 09:59:21 +0300
  • ceebe95c27 Add a deprecation warning to the readme rinpatch 2019-06-27 09:51:00 +0300
  • 4f44732100 Add a note on what OTP releases are rinpatch 2019-06-27 09:45:13 +0300
  • 0369a5db16 Merge branch 'idempotency-plug' into 'develop' kaniini 2019-06-27 04:20:17 +0000
  • 6587e2358c Merge branch 'fix/admin-configure' into 'develop' kaniini 2019-06-27 04:19:44 +0000
  • c6705144a2 don't delete config settings on admin update Alexander Strizhakov 2019-06-27 04:19:44 +0000
  • 8050baf7bf Update pleroma FE sadposter 2019-06-27 02:25:30 +0100
  • 0843f3e0b6 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop sadposter 2019-06-27 02:17:32 +0100
  • cfb5be3ced Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop' rinpatch 2019-06-26 19:15:37 +0000
  • 451931d36f
    Update mastofe to bundle-2019-06-26 Haelwenn (lanodan) Monnier 2019-06-26 21:06:28 +0200