9203 Commits (5165287ff49ff894d2c318fd1138b789a97f9cce)

 

All Branches   

Search

Author	SHA1	Message	Date
lain	5165287ff4	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	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
lain	b5df4a98e4	ChatMessageView: Support emoji.	4 years ago
lain	7e53da250e	ChatMessage: Support emoji.	4 years ago
lain	b836d3d104	ChatMessageValidator: Require `published` field	4 years ago
lain	139b9d1338	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	4 years ago
lain	970b74383b	Credo fixes.	4 years ago
lain	5b6818b3e5	CommonAPI: Obey local limit for chat messages.	4 years ago
lain	ce23673ca1	ChatMessageValidator: Don't validate messages that are too long.	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
lain	c845820911	Notifications: Create a chat notification.	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	8c2c325598	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms	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
lain	372614cfd3	ChatView: Add a mastodon api representation of the recipient.	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
lain	d45ae64858	ChatController: Use OAuth scopes.	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
Alexander Strizhakov	4d22b100b7	move changelogs entries to unreleased section	4 years ago
Haelwenn	a17bfb5fab	Merge branch 'feature/1584-client-captcha-options' into 'develop' ... Creating trusted app from adminFE & mix task Closes #1584 See merge request pleroma/pleroma!2252	4 years ago
Haelwenn	d8142ee6fe	Merge branch 'fix/1694-transfer-task-fix' into 'develop' ... Fix for logger configuration Closes #1694 See merge request pleroma/pleroma!2396	4 years ago
Haelwenn	9c76d70a47	Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop' ... Added need_reboot endpoint to admin api Closes #1677 See merge request pleroma/pleroma!2373	4 years ago
Alexander Strizhakov	304ea09f4c	fix for logger configuration	4 years ago
rinpatch	badd888ccb	Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop' ... Enforcement of OAuth scopes check for authenticated API endpoints See merge request pleroma/pleroma!2349	4 years ago
rinpatch	28bcde5d98	Merge branch 'fix/1691-feed-render' into 'develop' ... Fix for use of `published` field from different entities Closes #1691 See merge request pleroma/pleroma!2395	4 years ago
rinpatch	0ddee13c83	Merge branch 'features/remove-user-source_data' into 'develop' ... User: remove source_data Closes #820 See merge request pleroma/pleroma!2339	4 years ago
rinpatch	942d7467ca	Merge branch 'develop' into features/remove-user-source_data	4 years ago
lain	f8c3ae7a62	ChatController: Handle pagination.	4 years ago
lain	e983f70884	ChatMessagesHandling: Strip HTML of incoming messages.	4 years ago
Alexander Strizhakov	4d330d9df1	fix for use of published from different entities	4 years ago