8265 Commits (6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a)

 

All Branches   

Search

Author	SHA1	Message	Date
Egor Kislitsyn	6875ccb6bf	Merge branch 'develop' into feature/new-registrations-digest	5 years ago
lain	5ebffd5224	Merge branch 'docs/kyclos' into 'develop' ... clients.md: Add Kyclos See merge request pleroma/pleroma!2196	5 years ago
Haelwenn (lanodan) Monnier	209e4d8432	clients.md: Add Kyclos	5 years ago
rinpatch	94e5ca1105	Merge branch 'issue/1383' into 'develop' ... [#1383] Switch periodic jobs from quantum to oban See merge request pleroma/pleroma!2015	5 years ago
Haelwenn	a7287e2e3a	Merge branch 'docs_backup_restore' into 'develop' ... DOCS Backup/Restore/Migrate your instance See merge request pleroma/pleroma!2107	5 years ago
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	5 years ago
rinpatch	32a7b4dadd	Merge branch 'fix/compilation-error-docs' into 'develop' ... Fix a compilation error under certain circumstances See merge request pleroma/pleroma!2193	5 years ago
Maksim Pechnikov	6813c0302c	Merge branch 'develop' into issue/1383	5 years ago
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.	5 years ago
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	5 years ago
rinpatch	8fda6303ba	Fix email mix task on OTP releases ... Closes pleroma#1548	5 years ago
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	5 years ago
rinpatch	15ea75cd2a	Actually fix upload limit on OTP releases ... Closes #1109	5 years ago
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	5 years ago
rinpatch	8d01aaa702	Merge branch 'questions-timezone' into 'develop' ... Questions: Add timezone to `closed` property Closes #1552 See merge request pleroma/pleroma!2184	5 years ago
Lain Soykaf	d85bcc8627	Questions: Add timezone to `closed` property	5 years ago
rinpatch	f57cea17bc	deps: update plug to 1.9 ... Includes functionality needed to fix upload limit not being changed at runtime: 087cd64d86	5 years ago
Egor Kislitsyn	bc2e98b200	Add User.get_follow_state/2	5 years ago
rinpatch	f13b7878b4	Merge branch 'rename_emoji_reactios' into 'develop' ... EmojiReactions: Rename to EmojiReacts See merge request pleroma/pleroma!2181	5 years ago
rinpatch	1b51390e4c	Merge branch 'docs-fix' into 'develop' ... Fix for config.md See merge request pleroma/pleroma!2182	5 years ago
Alexander Strizhakov	01da001da1	fix	5 years ago
Lain Soykaf	8a79f20c21	EmojiReactions: Rename to EmojiReacts	5 years ago
rinpatch	5b1ef335de	Merge branch 'update/fe-bundle-20200206' into 'develop' ... Update FE bundle See merge request pleroma/pleroma!2180	5 years ago
Mark Felder	fed9b0d1e0	Update FE bundle	5 years ago
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	5 years ago
feld	e12bf05f23	Merge branch 'fix/dymamic-docs' into 'develop' ... Simplify in-database config docs See merge request pleroma/pleroma!2178	5 years ago
feld	5499f172b2	Merge branch 'config-changes' into 'develop' ... Config changes Closes #1547 See merge request pleroma/pleroma!2174	5 years ago
Egor Kislitsyn	2cc4fbab96	Update CHANGELOG	5 years ago
Egor Kislitsyn	8b9742ecf5	Cancellation of a follow request for a remote user	5 years ago
rinpatch	6769ecd948	Merge branch 'develop' into fix/dymamic-docs	5 years ago
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)	5 years ago
Alexander Strizhakov	7a2e153a8d	description change	5 years ago
Alexander Strizhakov	bdf0a87be9	dropdown type	5 years ago
Alexander Strizhakov	c85aa6e87f	removing confusing error	5 years ago
rinpatch	15cb1f6804	Merge branch 'fix/unpinnable-polls' into 'develop' ... fix not being able to pin polls See merge request pleroma/pleroma!2172	5 years ago
rinpatch	72d767998c	Merge branch 'removing-admin-api-endpoint' into 'develop' ... Removing migrate_from_db endpoint from admin api See merge request pleroma/pleroma!2177	5 years ago
feld	b21e59da5f	Merge branch 'remove-linker-scheme-option' into 'develop' ... Remove AutoLinker `scheme` option from the config See merge request pleroma/pleroma!2176	5 years ago
Alexander Strizhakov	2a3e06eb70	Apply suggestion to CHANGELOG.md	5 years ago
Alexander Strizhakov	5db6ac8ee4	removing migrate_from_db endpoint from admin api	5 years ago
Egor Kislitsyn	3909b5b7b3	Remove AutoLinker `scheme` option from the config	5 years ago
rinpatch	49e80a1537	Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' ... Restarting pleroma from outside application See merge request pleroma/pleroma!2144	5 years ago
Egor Kislitsyn	8c71f7e11a	Add support for cancellation of a follow request	5 years ago
lain	a56db78935	Merge branch 'feature/make_attachments_cleanup_optional' into 'develop' ... Make attachments cleanup optional See merge request pleroma/pleroma!2170	5 years ago
Lain Soykaf	90b862e7ab	Add cheatsheet entry	5 years ago
Maksim Pechnikov	2c40c8b4a2	Merge branch 'develop' into issue/1383	5 years ago
rinpatch	50f5a92021	fix not being able to pin polls	5 years ago
rinpatch	983a87175e	mastodon API: do not sanitize html in non-html fields	5 years ago
Roman Chvanikov	8057157ee3	Make attachments cleanup optional	5 years ago
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	5 years ago
rinpatch	5b62acf6e9	Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost	5 years ago