11108 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
lain	06e435c959	Merge branch 'update-frontend-2020-08-13' into 'develop' ... Update frontend See merge request pleroma/pleroma!2883	2020-08-13 14:07:01 +00:00
lain	5bcf15d553	Update frontend	2020-08-13 16:04:34 +02:00
lain	88ec5c2de5	Merge branch 'cmake' into 'develop' ... Build files: Add cmake See merge request pleroma/pleroma!2882	2020-08-13 12:28:10 +00:00
lain	a47406d577	Build files: Add cmake	2020-08-13 14:12:45 +02:00
lain	2bc2b321b6	Merge branch 'fix/users_ap_id_not_null' into 'develop' ... Ensure ap_id column in users table cannot be null See merge request pleroma/pleroma!2875	2020-08-13 11:01:03 +00:00
lain	aaf7bd89a7	Migrations: Fix Logger requirements.	2020-08-13 12:32:05 +02:00
lain	5be25b3e38	Merge branch '1152-deletion' into 'develop' ... User deletion issue exploration See merge request pleroma/pleroma!2879	2020-08-13 09:06:33 +00:00
feld	a94210c70b	Merge branch 'docs_improve_static_dir_documentation' into 'develop' ... Improve static_dir documentation See merge request pleroma/pleroma!2864	2020-08-12 16:39:19 +00:00
feld	3aa7969ff9	Update robots_txt.md	2020-08-12 16:19:34 +00:00
feld	dfc56de167	Merge branch 'feature/update-welcome-setting-in-description' into 'develop' ... Update :welcome settings in description.exs Closes #2024 See merge request pleroma/pleroma!2843	2020-08-12 16:18:40 +00:00
Mark Felder	b89fc1f227	Add warning to the migration	2020-08-12 11:13:24 -05:00
lain	05ff666f99	AdminApiControllerTest: Add test that deleted users get deactivated.	2020-08-12 16:31:00 +02:00
rinpatch	86c18e4165	Merge branch 'issue/2036-job-monitor' into 'develop' ... [#2036] fix job monitor See merge request pleroma/pleroma!2877	2020-08-12 03:30:01 +00:00
Maksim Pechnikov	76462efbfa	fix job monitor	2020-08-11 22:06:33 +03:00
Mark Felder	ff4e282aad	Ensure ap_id column in users table cannot be null	2020-08-11 10:27:07 -05:00
lain	c66f6bd0ad	Merge branch 'set-approval-pending-default-to-false' into 'develop' ... Set `users.approval_pending` default to `false` See merge request pleroma/pleroma!2874	2020-08-11 13:59:17 +00:00
Egor Kislitsyn	304ed35743	Set users.approval_pending default to false	2020-08-11 17:21:17 +04:00
lain	686002164a	Merge branch '204-fix' into 'develop' ... Fix 500 errors when returning :no_content, fixes #2029 Closes #2029 See merge request pleroma/pleroma!2856	2020-08-11 09:18:56 +00:00
lain	9a9121805c	Apply 1 suggestion(s) to 1 file(s)	2020-08-11 09:08:27 +00:00
feld	78484fe0ef	Merge branch 'admin-active-filter' into 'develop' ... Admin API: Filter out unapproved users when the `active` filter is on Closes #2037 See merge request pleroma/pleroma!2872	2020-08-10 17:16:38 +00:00
Egor Kislitsyn	249f21dcbb	Admin API: Filter out unapproved users when the active filter is on	2020-08-10 18:27:39 +04:00
lain	93fbf39954	Merge branch 'revert-a6d3bb5f' into 'develop' ... Revert "Merge branch 'issue/1023' into 'develop'" Closes #2033 See merge request pleroma/pleroma!2868	2020-08-10 13:59:38 +00:00
lain	353f3466d6	Merge branch 'remove-unreachable-code' into 'develop' ... Transmogrifier: Remove duplicate code. See merge request pleroma/pleroma!2871	2020-08-10 13:47:20 +00:00
lain	73af60d02f	Merge branch 'develop' into 'develop' ... docs: add cmake to other installation guides Closes #2039 See merge request pleroma/pleroma!2870	2020-08-10 13:47:02 +00:00
lain	517d42646a	Merge branch '2039-cmake' into 'develop' ... Docs: Add cmake dependency Closes #2039 See merge request pleroma/pleroma!2869	2020-08-10 13:46:52 +00:00
lain	11fc90744c	Transmogrifier: Remove duplicate code.	2020-08-10 15:31:36 +02:00
Alibek Omarov	a2f2ba3fbb	docs: add cmake to other installation guides	2020-08-10 16:24:45 +03:00
lain	4d76c0ec8b	Docs: Add cmake dependency	2020-08-10 15:12:45 +02:00
lain	5c4548d5e7	Revert "Merge branch 'issue/1023' into 'develop'" ... This reverts merge request !2763	2020-08-10 13:05:13 +00:00
Ilja	bd7bf6cd19	Apply 1 suggestion(s) to 1 file(s)	2020-08-10 11:29:54 +00:00
Ilja	a4a2d38640	Apply 1 suggestion(s) to 1 file(s)	2020-08-10 11:29:40 +00:00
rinpatch	00a4980c61	Merge branch 'fix/flaky-migration-episode-666' into 'develop' ... 20200802170532_fix_legacy_tags: Select only fields the migration needs See merge request pleroma/pleroma!2863	2020-08-10 09:17:08 +00:00
rinpatch	21dfcafeb1	Merge branch '2038-old-update-info' into 'develop' ... AccountController: Build the correct update activity. Closes #2038 See merge request pleroma/pleroma!2867	2020-08-10 09:04:16 +00:00
rinpatch	15fa3b6bd8	20200802170532_fix_legacy_tags: chunk the user query	2020-08-10 11:56:37 +03:00
rinpatch	a818587467	20200802170532_fix_legacy_tags: Select only fields the migration needs ... Selecting the full struct will break as soon as a new field is added.	2020-08-10 11:55:58 +03:00
lain	66122a11b5	AccountController: Build the correct update activity. ... Will fix federation issues.	2020-08-10 10:33:05 +02:00
lain	0149dd0146	Merge branch 'feat/floki-fast-html-2' into 'develop' ... Update to fast_html 2 and use it for Floki parsing See merge request pleroma/pleroma!2861	2020-08-09 11:18:00 +00:00
lain	7625e50950	Merge branch 'security-policy' into 'develop' ... Add security policy for Pleroma backend Closes #1848 See merge request pleroma/pleroma!2862	2020-08-09 11:06:54 +00:00
lain	d0fc48ea67	Merge branch 'develop' into 'feat/floki-fast-html-2' ... # Conflicts: # config/config.exs	2020-08-09 10:53:58 +00:00
lain	ad29a4f2cf	Merge branch 'ensure-expiration-mix-task' into 'develop' ... Add mix task to add expiration to all local statuses Closes #2020 See merge request pleroma/pleroma!2865	2020-08-08 15:16:55 +00:00
Egor Kislitsyn	e5557bf8ba	Add mix task to add expiration to all local statuses	2020-08-08 16:29:40 +04:00
Ilja	e0dee833f2	Improve static_dir documentation ... * It was still written for From Source installs. Now it's both OTP and From Source * I linked to the cheatsheet where it was about configuration * I moved the mix tasks of the robot.txt section to the CLI tasks and linked to it * i checked the code at https://git.pleroma.social/pleroma/pleroma/-/blob/develop/lib/mix/tasks/pleroma/robotstxt.ex and it doesn't seem to more than just this one command with this option * I also added the location of robot.txt and an example to dissallow everything, but allow the fediverse.network crawlers * The Thumbnail section still linked to distsn.org which doesn't exist any more. I changed it to a general statemant that it can be used by external applications. (I don't know any that actually use it.) * Both the logo and TOS need an extra `static` folder. I've seen confusion about that in #pleroma so I added an Important note.	2020-08-08 12:21:44 +02:00
lain	47698fc322	Merge branch 'fix/ldap-auth-issues' into 'develop' ... Fix LDAP auth issues Closes #1646 See merge request pleroma/pleroma!2852	2020-08-07 20:59:44 +00:00
Mark Felder	54e2af8293	Merge branch 'develop' into fix/ldap-auth-issues	2020-08-07 14:55:22 -05:00
Mark Felder	474147a67a	Make a new function instead of overloading register_changeset/3	2020-08-07 14:54:14 -05:00
rinpatch	881fdb3a97	Add security policy for Pleroma backend ... Closes #1848	2020-08-07 21:27:15 +03:00
Angelina Filippova	f21b6ebd5d	Merge branch 'feature/update-welcome-setting-in-description' of git.pleroma.social:pleroma/pleroma into feature/update-welcome-setting-in-description	2020-08-07 21:05:44 +03:00
Angelina Filippova	8e1f7a3eff	Add new image type to settings whose values are image urls	2020-08-07 21:04:13 +03:00
Alex Gleason	673e8e3ac1	Force 204 responses to be empty, fixes #2029	2020-08-07 13:02:39 -05:00
rinpatch	39ca4a23c6	Merge branch 'authenticator-docs' into 'develop' ... Docs: Remove wrong / confusing auth docs. Closes #2028 See merge request pleroma/pleroma!2860	2020-08-07 17:51:48 +00:00