5714 commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rinpatch	72b88c82bc	Mastodon API: Fix embedded relationships not being rendered inside of statuses	2019-07-08 12:07:08 +03:00
rinpatch	3589b30ddc	Merge branch 'fix/1058-uploads-dir-consistency' into 'develop' ... tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir Closes #1058 See merge request pleroma/pleroma!1378	2019-07-05 18:55:27 +00:00
Haelwenn	c1c0091441	Merge branch 'issue/1043' into 'develop' ... [#1043] fix search accounts. See merge request pleroma/pleroma!1372	2019-07-05 04:22:09 +00:00
Maksim	6dadf5d6f4	[#1043] fix search accounts.	2019-07-05 04:22:08 +00:00
Haelwenn (lanodan) Monnier	977c2d0448	tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir ... Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058	2019-07-05 06:19:27 +02:00
rinpatch	497788a3cc	Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop' ... Expose `skip_thread_containment` in nodeinfo Closes #1030 See merge request pleroma/pleroma!1349	2019-07-03 18:35:57 +00:00
Eugenij	15eb1235ed	Expose skip_thread_containment in nodeinfo	2019-07-03 18:35:57 +00:00
feld	9b45feae9b	Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop' ... Fix occasional migration failures See merge request pleroma/pleroma!1373	2019-07-03 16:54:47 +00:00
Roman Chvanikov	efefee8241	Split alters rather than work with indexes	2019-07-03 14:56:02 +03:00
rinpatch	079266d406	Merge branch 'handle-search-timeout' into 'develop' ... Handle search timeouts for /api/v1/search and /api/v2/search Closes #994 See merge request pleroma/pleroma!1369	2019-07-03 10:19:51 +00:00
Eugenij	5184b0f41a	Use fallback values for search queries ... This is to make sure the entire request doesn't return a 500 error if user or status search times out.	2019-07-03 10:19:51 +00:00
Haelwenn	dcadf34471	Merge branch '1048-semver-format-compliance' into 'develop' ... Resolved violations of SemVer version format Closes #1036 and #1048 See merge request pleroma/pleroma!1371	2019-07-03 01:34:16 +00:00
Roman Chvanikov	291d95dcc3	Fix migration	2019-07-03 01:14:40 +03:00
Ivan Tashkinov	8c7d7cc936	[#1048] Fixed version parsing in pleroma_ctl. Closes #1036.	2019-07-02 18:47:53 +03:00
Ivan Tashkinov	a02f52d12a	[#1048] Resolved violations of SemVer version format. Refactoring.	2019-07-02 09:04:59 +03:00
kaniini	a565dbde4f	Merge branch 'admin-report-view-user-fallback' into 'develop' ... Handle deleted reported accounts in report admin API Closes #1046 See merge request pleroma/pleroma!1370	2019-07-02 01:27:00 +00:00
Eugenij	ab50c6b3ca	Add fallback value to the admin report view. ... This is to avoid 500 error when the reported user no longer exists in the database.	2019-07-02 01:27:00 +00:00
rinpatch	79c88a257f	Merge branch 'fix/changelog' into 'develop' ... Move changelog entries See merge request pleroma/pleroma!1368	2019-07-01 11:46:07 +00:00
Maxim Filippov	0b3561ae72	Move changelog entries	2019-07-01 14:04:24 +03:00
Haelwenn	3b05f834f4	Merge branch 'fix/docs-dry-run' into 'develop' ... OTP Release install docs: Remove --dry-run in cron certbot command See merge request pleroma/pleroma!1366	2019-07-01 04:52:42 +00:00
Haelwenn	ce827a1626	Merge branch 'ci-improvements' into 'develop' ... Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs See merge request pleroma/pleroma!1360	2019-07-01 04:51:56 +00:00
Haelwenn	47efe52c50	Merge branch 'chore/changelog-update' into 'develop' ... Update changelog and admin API docs with tags, display_name, avatar additions See merge request pleroma/pleroma!1367	2019-07-01 04:45:00 +00:00
feld	5f1dd4fe80	Merge branch 'issue/1033' into 'develop' ... [#1033] Fix database migrations See merge request pleroma/pleroma!1350	2019-07-01 01:08:07 +00:00
Maksim	85c7916c94	[#1033] Fix database migrations	2019-07-01 01:08:07 +00:00
Maxim Filippov	611f6665ac	Update changelog and admin API docs with tags, display_name, avatar additions	2019-07-01 03:36:42 +03:00
rinpatch	044eb039c2	OTP Release install docs: Remove --dry-run in cron certbot command	2019-06-30 13:06:10 +03:00
rinpatch	66380d36d5	Merge branch 'filter-user-statuses-by-hashtag' into 'develop' ... Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) Closes #974 See merge request pleroma/pleroma!1362	2019-06-30 09:08:46 +00:00
Eugenij	1f76740e10	Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)	2019-06-30 09:08:46 +00:00
rinpatch	e5df6487c8	Merge branch 'issues/1026' into 'develop' ... [#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text Closes #1026 See merge request pleroma/pleroma!1363	2019-06-30 07:28:35 +00:00
Maksim	acd20f166b	[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text	2019-06-30 07:28:35 +00:00
Haelwenn	4a1c36e18f	Merge branch 'fix/pin-unlisted' into 'develop' ... Fix not being able to pin unlisted posts Closes #1038 See merge request pleroma/pleroma!1364	2019-06-30 00:59:40 +00:00
rinpatch	4c60a562a7	Fix not being able to pin unlisted posts ... Closes #1038	2019-06-29 22:27:42 +03:00
rinpatch	bdc1592377	Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs ... This is needed because if we run with MIX_ENV=dev we will get a "+dev" suffix to the version in the docs, but if we run with MIX_ENV=prod the docs build will fail because ex_doc is dev-only dependency.	2019-06-29 14:28:26 +03:00
rinpatch	9b1e75bac8	Merge branch 'my-develop' into 'develop' ... Docker specific configuration information See merge request pleroma/pleroma!1359	2019-06-29 11:24:14 +00:00
deorsum	4c40ada7a5	Add a caveat for docker deployment in the config docs	2019-06-29 21:14:11 +10:00
rinpatch	a8c9522e04	Merge branch 'revert/tags-releases-develop' into 'develop' ... Revert "Build releases only on tags or develop" on develop See merge request pleroma/pleroma!1357	2019-06-29 10:39:52 +00:00
rinpatch	0f6e333d8b	Revert "Build releases only on tags or develop" ... This reverts commit 54d2873770.	2019-06-29 13:29:11 +03:00
rinpatch	f810acc7b0	Merge branch 'fix/no-untagged-builds-master' into 'develop' ... Build releases only on tags or develop See merge request pleroma/pleroma!1355	2019-06-29 09:41:31 +00:00
rinpatch	ee79c67081	Build releases only on tags or develop ... Needed so we could push documentation updates to master without triggering a rebuild	2019-06-29 12:29:12 +03:00
rinpatch	c82024adcb	Merge branch 'fix/release-docs-path-warning' into 'develop' ... Add a warning about service files assuming installation paths See merge request pleroma/pleroma!1353	2019-06-29 08:44:56 +00:00
rinpatch	eddcebf8ae	Add a warning about service files assuming installation paths	2019-06-29 11:35:42 +03:00
rinpatch	b6cfc8f98b	Merge branch 'patch-3' into 'develop' ... Move all upload contents despite upload folder itself. See merge request pleroma/pleroma!1352	2019-06-29 06:01:33 +00:00
rinpatch	b20b2d862a	Merge branch 'patch-2' into 'develop' ... Update migrating_from_source_otp_en.md See merge request pleroma/pleroma!1351	2019-06-29 06:01:30 +00:00
Yuji Nakao	ab6de9b478	Move all upload contents despite upload folder itself.	2019-06-29 04:24:44 +00:00
Yuji Nakao	b2548e65db	Update migrating_from_source_otp_en.md: Replace reload-daemon with daemon-reload.	2019-06-29 04:17:49 +00:00
kaniini	d1549a6375	Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop' ... Merge admin and mastodon user views for reports See merge request pleroma/pleroma!1346	2019-06-29 00:12:09 +00:00
kaniini	f375c2fd70	Merge branch 'feature/mrf-mediaproxy-warm' into 'develop' ... MRF: add mediaproxy warming policy See merge request pleroma/pleroma!1342	2019-06-28 23:50:23 +00:00
William Pitcock	c22f0bfb80	test: add tests for mediaproxy warming policy	2019-06-28 23:41:42 +00:00
William Pitcock	074ffee0b2	docs: add documentation for MediaProxyWarmingPolicy	2019-06-28 23:20:17 +00:00
William Pitcock	034986e1fd	MRF: add mediaproxy warming policy	2019-06-28 23:19:20 +00:00