pleroma

Commit Graph

Author	SHA1	Message	Date
Egor Kislitsyn	c495e6d387	Add a test to ensure OAuth tokens are tied to Push subscriptions	4 years ago
lain	87e8d792bd	Merge branch 'test-fix' into 'develop' Compile fix in tests See merge request pleroma/pleroma!2239	4 years ago
Alexander Strizhakov	3eccdd15aa	compile fix	4 years ago
lain	e4804137b3	Document database default changes	4 years ago
lain	f71aa644b1	Add :unnamed option to default database configuration	4 years ago
rinpatch	035c2c1415	Merge branch 'fix/instance-gen-custom-static' into 'develop' instance.gen task: fix crash when using custom static directory Closes #1082 See merge request pleroma/pleroma!2237	4 years ago
rinpatch	5e4fe0e8f7	instance.gen task: fix crash when using custom static directory Closes #1082	4 years ago
Haelwenn	908b6ee49a	Merge branch 'status-visibility-count-stats' into 'develop' Status count by visibility scope (`GET /api/pleroma/admin/stats` ) See merge request pleroma/pleroma!2097	4 years ago
eugenijm	7ad5c51f23	Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope	4 years ago
lain	d240ce41b5	Merge branch 'theming_your_instance' into 'develop' DOCS Theming your instance See merge request pleroma/pleroma!2232	4 years ago
Ilja	c0146f4859	DOCS Theming your instance I added a new file to explain * where a custom theme can be created * where themes can be downloaded * where to add the theme on the server * how to make the theme available on the instance * how to set the theme as default on the instance	4 years ago
lain	81f29e7c6a	Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' Bugfix: return invalid when answer_data is nil Closes #1585 See merge request pleroma/pleroma!2236	4 years ago
Haelwenn	1e1156b645	Merge branch '1505-threads-federation' into 'develop' [#1505] Threads / replies federation Closes #1505 See merge request pleroma/pleroma!2129	4 years ago
Haelwenn (lanodan) Monnier	f9fe6a9e30	Captcha: return invalid when answer_data is nil	4 years ago
Haelwenn (lanodan) Monnier	ee57663d34	captcha_test.exs: Use the same testing logic in Kocaptcha and native	4 years ago
Ivan Tashkinov	0cf1d4fcd0	[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances.	4 years ago
feld	1961a680ec	Merge branch 'fix/missing-config-settings' into 'develop' Add missing invites_enabled and account_activation_required settings See merge request pleroma/pleroma!2234	4 years ago
Mark Felder	9fe60c3b9c	Add missing invites_enabled and account_activation_required settings	4 years ago
lain	c05cbc47f9	Better advice for vacuuming after restoring.	4 years ago
Ivan Tashkinov	8f0ca19b9c	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation # Conflicts: # CHANGELOG.md # config/config.exs	4 years ago
lain	114e7b764e	Merge branch 'patch-1' into 'develop' added why doing a vacuum after restoring a backup is so important See merge request pleroma/pleroma!2230	4 years ago
Igeljäger	1ed485ec1d	added why doing a vacuum after restoring a backup is so important	4 years ago
Haelwenn	292031f6dd	Merge branch 'migration-fixes-20' into 'develop' Migrations: Make them not fail for old databases See merge request pleroma/pleroma!2227	4 years ago
Haelwenn	499d9405d5	Merge branch 'fix/gin-fuzzy' into 'develop' Improve GIN full text search performance See merge request pleroma/pleroma!2228	4 years ago
Haelwenn	c5570e0493	Merge branch 'single_emoji_reaction' into 'develop' Single emoji reaction Closes #1578 See merge request pleroma/pleroma!2226	4 years ago
Mark Felder	b6bb73f43e	Apply database session parameter to improve GIN full text search	4 years ago
lain	2d5cf0f8cd	Migrations: Make them not fail for old databases	4 years ago
Ivan Tashkinov	0d14c3f410	[#1505 ] Typo fix.	4 years ago
lain	3eddd9caa6	Merge branch 'require-signature' into 'develop' Add an option to require fetches to be signed Closes #1444 See merge request pleroma/pleroma!2071	4 years ago
lain	c69b04c490	Merge branch 'features/remote-follow-userpage-redirect' into 'develop' remote_follow_controller.ex: Redirect to the user page on success Closes #1245 See merge request pleroma/pleroma!2123	4 years ago
lain	d536a00d42	Merge branch 'docs_updating' into 'develop' DOCS Add OTP to updating.md See merge request pleroma/pleroma!2108	4 years ago
Ivan Tashkinov	0c65a8c3d0	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation # Conflicts: # config/config.exs	4 years ago
lain	e0b2de6385	Merge branch 'feature/new-registrations-digest' into 'develop' New users digest email Closes #1514 See merge request pleroma/pleroma!2128	4 years ago
Ivan Tashkinov	3432294657	[#1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3	4 years ago
lain	cf4ecffcea	Merge branch 'tests-clear-config-tweaks' into 'develop' Tweaks to `clear_config` calls in tests See merge request pleroma/pleroma!2209	4 years ago
lain	3af6d3f8e2	Emoji Reactions: Add documentation	4 years ago
lain	314928333a	Pleroma API: Add endpoint to get reaction information on a single emoji	4 years ago
feld	3b78695c98	Merge branch 'fix/mrf-sample-doc' into 'develop' Update MRF docs, make sample code actually compile See merge request pleroma/pleroma!2210	4 years ago
feld	53a7680c16	Merge branch 'develop' into 'fix/mrf-sample-doc' # Conflicts: # docs/configuration/mrf.md	4 years ago
feld	3416948cdf	Merge branch 'fix/mrf-docs' into 'develop' Fix MRF documentation See merge request pleroma/pleroma!2187	4 years ago
feld	264d18be32	Merge branch 'chore/config-descriptions' into 'develop' Additional config description improvements See merge request pleroma/pleroma!2207	4 years ago
lain	cf8307e71c	Merge branch 'fix/status-view/expires_at' into 'develop' Fix `status.expires_at` type Closes #1573 See merge request pleroma/pleroma!2222	4 years ago
Ivan Tashkinov	226f4d5ef9	Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks # Conflicts: # test/web/admin_api/admin_api_controller_test.exs	4 years ago
Ivan Tashkinov	61d9f43e46	Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation	4 years ago
lain	3fa2ac68df	Merge branch 'chore/standardize-mrf-behavior' into 'develop' Standardize @behaviour usage in MRFs See merge request pleroma/pleroma!2212	4 years ago
lain	c07efd5b42	Merge branch 'need-reboot-flag' into 'develop' need_reboot flag for adminFE See merge request pleroma/pleroma!2188	4 years ago
Egor Kislitsyn	ca7ac068f0	Add a test	4 years ago
lain	fb6c2576dc	Merge branch 'chore/floki-update' into 'develop' Update floki to 0.25 See merge request pleroma/pleroma!2217	4 years ago
Egor Kislitsyn	2ef70b55f5	Fix `status.expires_at` type	4 years ago
feld	962eb8d4ac	Merge branch 'update/admin-fe-20200217' into 'develop' Update adminFE build See merge request pleroma/pleroma!2221	4 years ago

... 3 4 5 6 7 ...

8794 Commits (460e41585c2cd3f137c0f80173da60167fb318bf) All Branches Search

8794 Commits (460e41585c2cd3f137c0f80173da60167fb318bf)

All Branches