8219 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Haelwenn	a7287e2e3a	Merge branch 'docs_backup_restore' into 'develop' ... DOCS Backup/Restore/Migrate your instance See merge request pleroma/pleroma!2107	2020-02-10 23:53:26 +00:00
Ilja	a9e946b99a	DOCS Backup/Restore/Migrate your instance ... * Added "Migrate" to the title because these steps can also be used to migrate the instance to another server * Added an optional step to reinstall pleroma (esp. for migrating servers) * Currently the steps threw an error 'could not execute query: ERROR: function "activity_visibility already exists with the same argument types' * I added a new step to drop and recreate an empty pleroma-database * I played around with the `-c` and `-C` options of pg_restore, but dropping and recreating seemd to be the only way I got it working * This was tested on Debian Stretch, psql (PostgreSQL) 9.6.15	2020-02-10 23:53:26 +00:00
rinpatch	32a7b4dadd	Merge branch 'fix/compilation-error-docs' into 'develop' ... Fix a compilation error under certain circumstances See merge request pleroma/pleroma!2193	2020-02-10 18:25:12 +00:00
rinpatch	c55301e760	Fix a compilation error under certain circumstances ... I've noticed that sometimes when switching from develop to stable and back, develop fails to compile and rm -r ing the _build and deps dirs doesn't help at all. This is due to Admin API controller needing to generate JSON description of the config at compile time. Evaluating `config/description.exs` calls `Generator.list_modules_in_dir/2`, which in turn predicts the module names of files in the directory and tries to convert the predicted name to *existing* atoms. Sometimes the compiler will call that function before compiling the modules in the said directory, so the conversion will of course fail. This fixes it by removing the requirement of the atoms being existent. The function is not subjected to any untrusted user input so this should be safe. An ideal fix would be to block the compilation of docs before all modules are compiled and then get a list of compiled elixir modules under the namespace we want instead of directory hacks, but I have not been able to figure out how to do that.	2020-02-10 18:41:02 +03:00
rinpatch	544bdbfb90	Merge branch 'fix/email-task-otp' into 'develop' ... Fix email mix task on OTP releases Closes #1548 See merge request pleroma/pleroma!2191	2020-02-09 12:05:32 +00:00
rinpatch	8fda6303ba	Fix email mix task on OTP releases ... Closes pleroma#1548	2020-02-09 03:27:29 +03:00
lain	964b4d82a0	Merge branch 'fix/upload-limit-otp' into 'develop' ... Actually fix upload limit on OTP releases Closes #1109 See merge request pleroma/pleroma!2185	2020-02-08 14:02:36 +00:00
rinpatch	15ea75cd2a	Actually fix upload limit on OTP releases ... Closes #1109	2020-02-07 20:14:06 +03:00
Haelwenn	1262357ddb	Merge branch 'cancel-follow-request' into 'develop' ... Add support for cancellation of a follow request Closes #1522 See merge request pleroma/pleroma!2175	2020-02-07 16:10:43 +00:00
rinpatch	8d01aaa702	Merge branch 'questions-timezone' into 'develop' ... Questions: Add timezone to `closed` property Closes #1552 See merge request pleroma/pleroma!2184	2020-02-07 16:04:40 +00:00
Lain Soykaf	d85bcc8627	Questions: Add timezone to closed property	2020-02-07 16:57:46 +01:00
rinpatch	f57cea17bc	deps: update plug to 1.9 ... Includes functionality needed to fix upload limit not being changed at runtime: 087cd64d86	2020-02-07 18:38:36 +03:00
Egor Kislitsyn	bc2e98b200	Add User.get_follow_state/2	2020-02-07 16:17:34 +04:00
rinpatch	f13b7878b4	Merge branch 'rename_emoji_reactios' into 'develop' ... EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181	2020-02-07 10:35:37 +00:00
rinpatch	1b51390e4c	Merge branch 'docs-fix' into 'develop' ... Fix for config.md See merge request pleroma/pleroma!2182	2020-02-07 10:10:34 +00:00
Alexander Strizhakov	01da001da1	fix	2020-02-07 10:48:10 +03:00
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	2020-02-06 18:09:57 +01:00
rinpatch	5b1ef335de	Merge branch 'update/fe-bundle-20200206' into 'develop' ... Update FE bundle See merge request pleroma/pleroma!2180	2020-02-06 17:00:46 +00:00
Mark Felder	fed9b0d1e0	Update FE bundle	2020-02-06 10:59:41 -06:00
feld	df0b00b32d	Merge branch 'mastoapi-non-html-strings' into 'develop' ... mastodon API: do not sanitize html in non-html fields See merge request pleroma/pleroma!2167	2020-02-06 16:08:23 +00:00
feld	e12bf05f23	Merge branch 'fix/dymamic-docs' into 'develop' ... Simplify in-database config docs See merge request pleroma/pleroma!2178	2020-02-06 16:03:29 +00:00
feld	5499f172b2	Merge branch 'config-changes' into 'develop' ... Config changes Closes #1547 See merge request pleroma/pleroma!2174	2020-02-06 16:02:46 +00:00
Egor Kislitsyn	2cc4fbab96	Update CHANGELOG	2020-02-06 18:03:53 +04:00
Egor Kislitsyn	8b9742ecf5	Cancellation of a follow request for a remote user	2020-02-06 18:02:33 +04:00
rinpatch	6769ecd948	Merge branch 'develop' into fix/dymamic-docs	2020-02-06 15:04:21 +03:00
rinpatch	6722dade42	Simplify in-database config docs ... Large part of it was no longer true (i.e none of the changes need recompilation anymore and you can't brick an instance by changing them, it's not necessary to manually truncate the db manually anymore)	2020-02-06 15:00:33 +03:00
Alexander Strizhakov	7a2e153a8d	description change	2020-02-06 13:15:23 +03:00
Alexander Strizhakov	bdf0a87be9	dropdown type	2020-02-06 12:50:37 +03:00
Alexander Strizhakov	c85aa6e87f	removing confusing error	2020-02-06 12:50:36 +03:00
rinpatch	15cb1f6804	Merge branch 'fix/unpinnable-polls' into 'develop' ... fix not being able to pin polls See merge request pleroma/pleroma!2172	2020-02-05 21:04:16 +00:00
rinpatch	72d767998c	Merge branch 'removing-admin-api-endpoint' into 'develop' ... Removing migrate_from_db endpoint from admin api See merge request pleroma/pleroma!2177	2020-02-05 21:03:56 +00:00
feld	b21e59da5f	Merge branch 'remove-linker-scheme-option' into 'develop' ... Remove AutoLinker `scheme` option from the config See merge request pleroma/pleroma!2176	2020-02-05 20:32:45 +00:00
Alexander Strizhakov	2a3e06eb70	Apply suggestion to CHANGELOG.md	2020-02-05 18:28:05 +00:00
Alexander Strizhakov	5db6ac8ee4	removing migrate_from_db endpoint from admin api	2020-02-05 20:36:21 +03:00
Egor Kislitsyn	3909b5b7b3	Remove AutoLinker scheme option from the config	2020-02-05 21:13:56 +04:00
rinpatch	49e80a1537	Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' ... Restarting pleroma from outside application See merge request pleroma/pleroma!2144	2020-02-05 16:59:21 +00:00
Egor Kislitsyn	8c71f7e11a	Add support for cancellation of a follow request	2020-02-05 20:22:15 +04:00
lain	a56db78935	Merge branch 'feature/make_attachments_cleanup_optional' into 'develop' ... Make attachments cleanup optional See merge request pleroma/pleroma!2170	2020-02-04 15:29:26 +00:00
Lain Soykaf	90b862e7ab	Add cheatsheet entry	2020-02-04 16:22:13 +01:00
rinpatch	50f5a92021	fix not being able to pin polls	2020-02-02 14:55:06 +03:00
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	2020-02-02 14:46:32 +03:00
Roman Chvanikov	8057157ee3	Make attachments cleanup optional	2020-01-31 01:20:37 +03:00
rinpatch	c27d1d65bf	Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' ... Disable rate limiter for socket/localhost Closes #1380 See merge request pleroma/pleroma!2064	2020-01-30 19:24:04 +00:00
rinpatch	5b62acf6e9	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	2020-01-30 22:16:55 +03:00
lain	774cba84f5	Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop' ... Re-enable rate limiter and enable remote ip See merge request pleroma/pleroma!2164	2020-01-30 18:47:44 +00:00
lain	01537cc1d6	Apply suggestion to docs/configuration/cheatsheet.md	2020-01-30 18:28:28 +00:00
lain	e52e78a937	Merge branch 'emoji-reaction-fixie-fixes-uwu' into 'develop' ... Emoji Reactions: Actually use the validation. See merge request pleroma/pleroma!2166	2020-01-30 18:27:13 +00:00
lain	01fb4dbeae	Emoji Reactions: Add fixtures	2020-01-30 16:26:45 +01:00
lain	a0d9d42eaa	Emoji Reactions: Actually use the validation.	2020-01-30 16:07:37 +01:00
feld	e2f2602fdc	Merge branch 'emoji-api-errors' into 'develop' ... Emoji api error if emoji dir is not writable Closes admin-fe#62 See merge request pleroma/pleroma!2161	2020-01-30 14:13:40 +00:00