pleroma

Commit Graph

Author	SHA1	Message	Date
Haelwenn (lanodan) Monnier	83efaa3af6	[MastodonAPI] Add streaming of hashtags	5 years ago
William Pitcock	5ffaa2bf69	Revert "enable scope options and such" This reverts commit `e5642d7566`.	5 years ago
William Pitcock	e5642d7566	enable scope options and such	5 years ago
William Pitcock	5dd6542db5	formatting	5 years ago
William Pitcock	1089d3658e	user: fix up notification last calculation [NOT related to upstream]	5 years ago
lambda	46c7c2380c	Merge branch 'feature/relay' into 'develop' message relay Closes #144 See merge request pleroma/pleroma!264	5 years ago
lambda	440b459cd1	Merge branch 'bugfix/announce-timeline-flooding' into 'develop' activitypub: filter destination list for announce activities differently than normal (closes #164) Closes #164 See merge request pleroma/pleroma!227	5 years ago
kaniini	63094cfd3e	Merge branch 'feature/emoji-in-local-users' into 'develop' Add emoji to local user profiles. Closes #202 See merge request pleroma/pleroma!271	5 years ago
William Pitcock	86dca39640	tests: fix formatting	5 years ago
kaniini	927be2c62b	Merge branch 'bugfix/formatting' into 'develop' fix formatting See merge request pleroma/pleroma!301	5 years ago
William Pitcock	bc3c30430e	fix formatting	5 years ago
kaniini	e394e5943d	Merge branch 'tests/notification-smoketests' into 'develop' tests: add notification smoketests (ref #265) See merge request pleroma/pleroma!300	5 years ago
William Pitcock	504a25f812	tests: add notification smoketests (ref #265 )	5 years ago
kaniini	1ad5cbed51	Merge branch 'bugfix/common-api-visibility-orphan' into 'develop' common api: properly handle replying to orphaned threads See merge request pleroma/pleroma!299	5 years ago
William Pitcock	741c6ad671	common api: handle replying to orphaned threads	5 years ago
kaniini	c9e4c45e0e	Merge branch 'login-with-email' into 'develop' When logging in, try treating the login as an email Closes #245 See merge request pleroma/pleroma!295	5 years ago
kaniini	0f5bff8c66	Merge branch 'develop' into 'feature/relay' # Conflicts: # lib/pleroma/web/activity_pub/utils.ex	5 years ago
kaniini	3448b434f5	Merge branch 'update-pleroma-frontend' into 'develop' update pleroma frontend See merge request pleroma/pleroma!298	5 years ago
kaniini	7faed99450	Merge branch 'improve-example-caddyfile' into 'develop' Improve example Caddyfile See merge request pleroma/pleroma!296	5 years ago
kaniini	d802903c15	Merge branch 'remove-unused-settings' into 'develop' Remove unused settings See merge request pleroma/pleroma!297	5 years ago
hakabahitoyo	ce8c7e77a1	update pleroma frontend	5 years ago
hakabahitoyo	946a0769c4	remove unused settings from /api/statusnet/config	5 years ago
hakabahitoyo	89e2cb0828	remove unused settings	5 years ago
shibayashi	bff5ed154f	Improve example Caddyfile	5 years ago
Ekaterina Vaartis	540cce5d10	When logging in, try treating the login as an email Closes #245	5 years ago
kaniini	ffa552f1a4	Merge branch 'feature/twitterapi-object-description' into 'develop' twitter api: provide object descriptions as attachment description field See merge request pleroma/pleroma!293	5 years ago
William Pitcock	aab2bdddf4	twitter api: provide object descriptions as attachment description field	5 years ago
kaniini	66bc37925e	Merge branch 'update/pleroma-fe-20180824' into 'develop' update pleroma frontend See merge request pleroma/pleroma!292	5 years ago
William Pitcock	47661ce44b	update pleroma frontend	5 years ago
kaniini	ae0e41fd8b	Merge branch 'feature/tls-sni-support' into 'develop' http: fix TLS server name indication Closes #261 See merge request pleroma/pleroma!291	5 years ago
William Pitcock	290798b821	http: fix TLS server name indication by default, hackney only sent TLS server name indication if TLS was locked to TLS 1.2. since there are many instances out there not speaking TLS 1.2, it is not acceptable to lock SNI to TLS 1.2. closes #261	5 years ago
kaniini	be7a6db1f5	Merge branch 'bugfix/formatter-single-char-nicks' into 'develop' formatter: fix single char local nicknames Closes #163 See merge request pleroma/pleroma!290	5 years ago
William Pitcock	a8bd120ea6	tests: formatting	5 years ago
kaniini	9ded0ee1a5	Merge branch 'config/fe-collapse-subject' into 'develop' fe config: add collapse_message_with_subject fe option See merge request pleroma/pleroma!289	5 years ago
William Pitcock	3e10d13909	formatter: adjust regexp captures to match local users with single character nicknames (closes #163 )	5 years ago
William Pitcock	14d1187702	test: add testcase for formatter issue #163	5 years ago
William Pitcock	09cb402203	fe config: add collapse_message_with_subject fe option	5 years ago
kaniini	cac0bd6d51	Revert "Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop'" This reverts merge request !288	5 years ago
kaniini	265fba7e01	Merge branch 'add-frontend-config-collapseMessageWithSubject' into 'develop' add collapseMessageWithSubject in config See merge request pleroma/pleroma!288	5 years ago
hakabahitoyo	661a985cb9	add collapseMessageWithSubject in config	5 years ago
kaniini	8b9fe0c7a1	Merge branch 'fix/suggestions-api-error-handling' into 'develop' Better error handling in /api/v1/suggestions See merge request pleroma/pleroma!287	5 years ago
Haelwenn	ab85fef076	Merge branch 'develop' into 'develop' Add an OpenRC service See merge request pleroma/pleroma!285	5 years ago
vaartis	9c5ca9e15e	Add an OpenRC service	5 years ago
hakabahitoyo	bf9f68b681	debug	5 years ago
kaniini	e416469a40	Merge branch 'security/activitypub-reject-bogus-ids' into 'develop' security: activitypub: reject activities with bogus ids See merge request pleroma/pleroma!286	5 years ago
William Pitcock	a909fe45a6	formatting	5 years ago
William Pitcock	bc36d40bee	tests: add a testcase for verifying that objects without a valid ID are always rejected	5 years ago
William Pitcock	52b44184b4	transmogrifier: reject activities lacking a valid ID	5 years ago
Henry Jameson	9b046d2a84	fixed notifications API completely breaking if there's a like for missing (deleted) post.	5 years ago
Haelwenn (lanodan) Monnier	643f373514	Run mix format	5 years ago

... 4 5 6 7 8 ...

2249 Commits (2c29329d39ded29975336902c5526a5389508536) All Branches Search

2249 Commits (2c29329d39ded29975336902c5526a5389508536)

All Branches