3199 Commits (bdfa3a6fa87f95e93aa853ec4961645215f31221)

Author	SHA1	Message	Date
Alex S	bdfa3a6fa8	Merging with develop ... Conflicts: lib/pleroma/web/activity_pub/transmogrifier.ex lib/pleroma/user.ex	5 years ago
rinpatch	ce4825c1dc	Do not normalize objects in stream_out unless the activity type is ... Create Saves quite a bit of time with delete activities because they would always query the db	5 years ago
lain	b0951a8849	WebPush: Use Object.normalize, rewrite tests so they test reality.	5 years ago
rinpatch	0fd176b990	Merge branch 'fix/add-default-scope-mastoapi' into 'develop' ... Add default_scope to /api/v1/update_credentials See merge request pleroma/pleroma!1100	5 years ago
kaniini	292c69481b	Merge branch 'regression/rights-only-for-admin' into 'develop' ... Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators See merge request pleroma/pleroma!1102	5 years ago
rinpatch	61ca2f7a4e	Fix `rights` in TwitterAPI's user entity being present only for ... Admins/Moderators In !1093 I reused `maybe_with_role` for `rights` object, however I missed that `maybe_with_role` is called only for admins/moderators.	5 years ago
rinpatch	ce3789e39a	Add default_scope to /api/v1/update_credentials	5 years ago
rinpatch	c3e9fcf098	Fix bookmarks depending on embeded object and move checking if the ... status is bookmarked to SQL	5 years ago
kaniini	002ea343f8	Merge branch 'feature/bbcode' into 'develop' ... BBCode support (backend) See merge request pleroma/pleroma!1097	5 years ago
William Pitcock	501af917b5	add support for bbcode	5 years ago
lambda	4de5fef1f8	Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop' ... Feature/807 bookmark endpoint extension Closes #807 See merge request pleroma/pleroma!1059	5 years ago
kaniini	48f68fd133	Merge branch 'feature/mastoapi-new-config' into 'develop' ... Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API This patch: - Fixes `rights` in TwitterAPI ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs See merge request pleroma/pleroma!1093	5 years ago
Mark Felder	24c3e2db2c	Add mediaproxy whitelist capability	5 years ago
rinpatch	dfc8425659	Move settings to Source subentity	5 years ago
Alex S	a825056d4d	test fixes	5 years ago
Alex S	85953c0836	fixes for tests	5 years ago
Alex S	229ce6abbc	migration without using old field name ... removing old field from db, after bookmarks migration	5 years ago
Alex S	3c2ae80008	unused	5 years ago
Alex S	1258128f4f	favourites add bookmark display	5 years ago
Alex S	324c9c8ab5	migrate user.bookmarks to separate table	5 years ago
Alex S	73d01857e3	bookmarks in separate table	5 years ago
William Pitcock	0fd0ffcd76	activitypub: transmogrifier: send reject follow if following does not succeed	5 years ago
rinpatch	4baea6e6d9	Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API ... This patch: - Fixes `rights` in twitterapi ignoring `show_role` - Fixes exposing default scope of the user to anyone in Mastodon API - Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674) Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs	5 years ago
kaniini	030a7876b4	Merge branch 'security/fix-html-class-scrubbing' into 'develop' ... html: lock down allowed class attributes to only those related to microformats See merge request pleroma/pleroma!1090	5 years ago
William Pitcock	f5535e5743	html: lock down allowed class attributes to only those related to microformats	5 years ago
Sergey Suprunenko	9dd36e5bcb	Extend Mastodon API with public endpoint for getting Favorites timeline of any user (#789)	5 years ago
kaniini	10c40e13d2	Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop' ... Add `in_reply_to_account_acct` to MastoAPI status entity See merge request pleroma/pleroma!1086	5 years ago
kaniini	aa9d378985	Merge branch 'fix/normalize-activities' into 'develop' ... Normalize acitvities instead of objects inside them See merge request pleroma/pleroma!1085	5 years ago
Alex S	d35246c449	added healthcheck setting to instance config	5 years ago
rinpatch	f60d072bbb	Add `pleroma.in_reply_to_account_acct` to MastoAPI status entity	5 years ago
rinpatch	d21d921def	Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading	5 years ago
Egor	b9cdf6d3b9	Use `User.get_cached*` everywhere	5 years ago
Alexander Strizhakov	88f0be9693	Feature/826 healthcheck endpoint	5 years ago
kaniini	7fcbda702e	Merge branch 'rework-emoji-management' into 'develop' ... Remove finmoji and add a way to download emojis in packs Closes #817 and #821 See merge request pleroma/pleroma!1073	5 years ago
Ekaterina Vaartis	3cefdc62e0	Fix emoji.txt / custom_emoji.txt / shortcode_globs handling	5 years ago
Ekaterina Vaartis	ba19ba8a88	Formatting	5 years ago
Ivan Tashkinov	9256d2d4b4	[#923] Refactored OAuthController#authorize definitions, added test.	5 years ago
eugenijm	375fd21055	Set correct values in the MastoAPI reblog status view	5 years ago
Ekaterina Vaartis	8f93d4c423	Remove most finmoji mentions where appropriate	6 years ago
Ekaterina Vaartis	53a3e61016	Fix priv/static/instance/static to be just instance/static ... It was a misunderstanding	6 years ago
Ekaterina Vaartis	52ed287e87	Fix incorrect multiple emoji tag handling introduced in initial impl	6 years ago
Ekaterina Vaartis	aaaa428512	mix format	6 years ago
Ekaterina Vaartis	a141f0807b	Assume packs without emoji.txt only have emoji pictures, unhardcode ... unhardcode: remove hardcoded /instance/static and actually use the config option as it is used in other places. packs without emoji.txt: these are now assumed to have .png files that are all emojis, their names are used as shortcodes	6 years ago
Ekaterina Vaartis	1e44b5478d	Remove useless comment	6 years ago
Ekaterina Vaartis	c26724cc55	Remove finmoji and add a way to download emojis in packs ... These packs are stored in a git repo on pleroma gitlab	6 years ago
eugenijm	fa48532387	Handle `reblogs` on the first follow request in MastoAPI	6 years ago
kaniini	9da8b287f8	Merge branch 'feature/database-compaction' into 'develop' ... database compaction See merge request pleroma/pleroma!473	6 years ago
Alexander Strizhakov	ada384207b	typo fix ... docs for RelMe provider	6 years ago
lambda	218d96a26b	Merge branch '923_oauth_consumer_refactoring_ci' into 'develop' ... OAuth consumer params handling refactoring See merge request pleroma/pleroma!1047	6 years ago
rinpatch	f9865cf943	Stream out deletes, mistakingly removed when resolving merge conflicts	6 years ago