9205 Commits (e7fb593d130e0ad62e3690dce4a0913fe3d40ef0)

 

All Branches   

Search

Author	SHA1	Message	Date
Ivan Tashkinov	e7fb593d13	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn	28f8fcf8b0	Merge branch 'fix/follow-and-blocks-import' into 'develop' ... Fix follower/blocks import when nicknames starts with @ Closes #1698 See merge request pleroma/pleroma!2416	4 years ago
Haelwenn	468cc977be	Merge branch 'bugfix/following-fix-status-code' into 'develop' ... AccountController: Use code 400 for self-follow. Closes #1674 See merge request pleroma/pleroma!2413	4 years ago
Haelwenn	238058ecae	Merge branch 'bugfix/1543-streaming-boosts' into 'develop' ... Streamer: Stream boosts to the boosting user. Closes #1543 See merge request pleroma/pleroma!2415	4 years ago
Ivan Tashkinov	b03aeae8b9	Apply suggestion to lib/pleroma/notification.ex	4 years ago
Egor Kislitsyn	771c1ad735	Update CHANGELOG	4 years ago
Egor Kislitsyn	6db52c3b36	Fix Oban warning ... Warning example: [warn] Expected Elixir.Pleroma.Workers.BackgroundWorker.perform/2 to return :ok, {:ok, value}, or {:error, reason}. Instead received: [error: "not found @user@server.party", error: "not found "] The job will be considered a success.	4 years ago
Egor Kislitsyn	e7771424a8	Fix blocks import	4 years ago
Egor Kislitsyn	88b82e5c3e	Fix follow import	4 years ago
lain	7a3a88a13e	Streamer: Stream boosts to the boosting user.	4 years ago
Haelwenn	1855c597c2	Merge branch 'feature/voters-count' into 'develop' ... Polls: Persist and show voters' count Closes #1702 See merge request pleroma/pleroma!2411	4 years ago
Haelwenn	2e73c19edc	Merge branch 'worker-messages' into 'develop' ... Worker messages Closes #1705 See merge request pleroma/pleroma!2410	4 years ago
lain	1cd38dfffa	Merge branch 'microformats' into 'develop' ... static_fe: Add microformats2 classes See merge request pleroma/pleroma!2215	4 years ago
Karol Kosek	452072ec95	static_fe: Add microformats2 classes	4 years ago
lain	5b39526198	AccountController: Use code 400 for self-follow.	4 years ago
lain	69ecc39038	Merge branch 'fix/1689-fix-migrate-to-db' into 'develop' ... Fix migrate to db config Closes #1689 See merge request pleroma/pleroma!2394	4 years ago
lain	c466e739b6	Merge branch 'docs/debian-packages' into 'develop' ... debian_based_*.md: Use erlang-nox metapackage See merge request pleroma/pleroma!2268	4 years ago
lain	568f48435e	Apply suggestion to docs/installation/debian_based_en.md	4 years ago
lain	5102468d0f	Polls: Persist and show voters' count	4 years ago
lain	923513b641	Federator: Return proper values for jobs	4 years ago
lain	f719a5b23a	WebPush: Return proper values for jobs.	4 years ago
lain	3c828016d9	Merge branch 'openapi/custom-emojis' into 'develop' ... Add OpenAPI spec for CustomEmojiController See merge request pleroma/pleroma!2375	4 years ago
Ivan Tashkinov	bb5d0eafa4	Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users ... # Conflicts: # CHANGELOG.md	4 years ago
rinpatch	e57c1b60e4	Merge branch 'accept-deletes' into 'develop' ... Always accept deletions through SimplePolicy, add :reject_deletes group See merge request pleroma/pleroma!2371	4 years ago
rinpatch	7e456ac7f6	Merge branch 'router-cleanup' into 'develop' ... Cleanup and DRY the Router See merge request pleroma/pleroma!2406	4 years ago
Alex Gleason	bedc558809	Merge remote-tracking branch 'upstream/develop' into accept-deletes	4 years ago
Alex Gleason	b54c8813d6	Add :reject_deletes option to SimplePolicy	4 years ago
lain	28165dad3a	Merge branch 'cleanup-subscription-controller' into 'develop' ... Cleanup SubscriptionController See merge request pleroma/pleroma!2393	4 years ago
lain	baeb9fb451	Merge branch 'fix-object_age_policy' into 'develop' ... Fix ObjectAgePolicy See merge request pleroma/pleroma!2404	4 years ago
Ilja	8b4de61d64	Fix ObjectAgePolicyTest ... The policy didn't block old posts as it should. * I fixed it and tested on a test server * I added the settings to description so that this information is shown in nodeinfo * TODO: I didn't work TTD and still need to fix the tests	4 years ago
lain	617a9f6208	Merge branch 'mrf-docs-update' into 'develop' ... Expand MRF SimplePolicy docs See merge request pleroma/pleroma!2370	4 years ago
Egor Kislitsyn	258d897579	Cleanup and DRY the Router	4 years ago
rinpatch	918a8094fc	Merge branch '1559-follow-request-notifications' into 'develop' ... [#1559] Support for "follow_request" notifications Closes #1559 See merge request pleroma/pleroma!2354	4 years ago
rinpatch	389fb36fb5	Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop' ... mix.exs: Do not bail out when .git doesn’t exists See merge request pleroma/pleroma!2405	4 years ago
Haelwenn (lanodan) Monnier	c906ffc51a	mix.exs: Do not bail out when .git doesn’t exists	4 years ago
Haelwenn	79445ae5d2	Merge branch 'bugfix/1697-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo Closes #1697 See merge request pleroma/pleroma!2403	4 years ago
Haelwenn	d698ecef9b	Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs	4 years ago
Haelwenn	24f760c2f7	Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex	4 years ago
Haelwenn (lanodan) Monnier	eb61564005	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo	4 years ago
rinpatch	f1843db41d	Merge branch '1682-basic-auth-permissions-fix' into 'develop' ... [#1682] Fixed Basic Auth permissions issue Closes #1682 See merge request pleroma/pleroma!2401	4 years ago
Haelwenn	e303d80dcb	Merge branch 'update/pleroma-fe-20200417' into 'develop' ... pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4 See merge request pleroma/pleroma!2402	4 years ago
Mark Felder	24e0db6310	pleroma-fe bundle: update to ac9985aedbc2ed53121eec06a95013186c4eefd4	4 years ago
Ivan Tashkinov	66f55106bd	[#1682] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.	4 years ago
rinpatch	e0d7847bc5	Merge branch 'sideeffects-test' into 'develop' ... SideEffects: Test for notification creation. See merge request pleroma/pleroma!2399	4 years ago
lain	26d9c83316	SideEffects: Test for notification creation.	4 years ago
rinpatch	6936854878	Merge branch 'bugfix/1695-user_emoji_miration' into 'develop' ... migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering Closes #1695 See merge request pleroma/pleroma!2398	4 years ago
Ivan Tashkinov	6e6f95c6ae	Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn (lanodan) Monnier	46f051048f	migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering	4 years ago
Alexander Strizhakov	6cda360fea	don't restart postgrex	4 years ago
Haelwenn	09bd1d12c1	Merge branch 'sync-changelog' into 'develop' ... Move changelog entries to unreleased section See merge request pleroma/pleroma!2397	4 years ago