Commit Graph

1506 Commits (1197ec10a83c2e61251abe383bea2bcc690d9c09)
 

Author SHA1 Message Date
lain 1e83727fdd Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
lain 9810153aeb Streamer: Don't send out stream events for blocked users.
6 years ago
lain 96add86b50 Unify wss uri generation.
6 years ago
lambda c8ba7501b7 Merge branch 'feld-test.secret' into 'develop'
6 years ago
lain c464355d1a Idempotency: Use special cache, keep for 6 hours.
6 years ago
Mark Felder 7a884d70d8 Group def renders here as well
6 years ago
Mark Felder 31ea9cbcd8 Group def renders together to fix warning
6 years ago
Mark Felder 955bd643ff Merge branch 'feld-test.secret' into feld-warnings
6 years ago
Mark Felder 737c42920a Speling
6 years ago
Mark Felder 14c0c6d16b Fix formatting
6 years ago
Mark Felder 2a402fb395 Group response declarations together
6 years ago
Mark Felder a24eed0f57 That last change was stupid. Multiline comments in Elixir don't really exist.
6 years ago
Mark Felder 79d41aa12e Dirty hack to remove the warning
6 years ago
Mark Felder aaacebd906 Fix unused variables, imports, and aliases
6 years ago
Mark Felder 42f1a098aa Fix build. Too eager with the fixing of unused variables.
6 years ago
Mark Felder 636f0fa402 Clean up unused aliases and imports
6 years ago
lain 762f6edc29 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
Mark Felder 943820ae29 More unused variables
6 years ago
lain 12f0ad1392 update frontend
6 years ago
Mark Felder 5855ffd322 Merge branch 'feld-test.secret' into feld-warnings
6 years ago
Mark Felder d30907e573 Make it possible to use custom database connection parameters
6 years ago
Mark Felder ab4aa5720a Fix a bunch of unused variable warnings
6 years ago
lambda 11a1241d41 Merge branch 'feature/nodeinfo' into 'develop'
6 years ago
lain 90c4bed0af Don't expire idempotency cache for five minutes.
6 years ago
lain fcd3eca167 MastodonAPI: Support idempotency key.
6 years ago
Francis Dinh 8b4ee0ea51 Fix formatting
6 years ago
Dashie c3f9e24c70
Use a variable for stats to avoid double call
6 years ago
Dashie 724f096ac7
Add metadata.nodeName
6 years ago
Dashie 804497542d
Return the right content-type for the schema call
6 years ago
Dashie e448734952
Explicit error message
6 years ago
Dashie fd0bf3aa71
Simplify version and fix typo
6 years ago
Dashie b8789cc8b6
Add localPosts count, also set to 0 if null
6 years ago
Dashie abeb009acc
Change path of nodeinfo to use .json format
6 years ago
Dashie 65168393d8
Format files
6 years ago
Dashie 67dadd954e
Add first try at nodeinfo
6 years ago
lain 5b6d6d7f2d update frontend
6 years ago
lain bc215f5684 Fix format.
6 years ago
lambda b7584edcea Merge branch 'patch-bio' into 'develop'
6 years ago
William Pitcock a3d1d4894f ActivityPub core: fix handling of unlisted statuses by leveraging a similar strategy as for blocks
6 years ago
lain 4d55d7c95e Insert object after being rewritten.
6 years ago
lambda a7a40bb8f1 Merge branch 'fix/blocked-user-boosts' into 'develop'
6 years ago
Wim Vanderbauwhede 6908f29e0a Added a test (written by @andrewzah) for the MR
6 years ago
Wim Vanderbauwhede 634c0c52a1 Merge remote-tracking branch 'upstream/develop' into patch-bio
6 years ago
lambda 39c80a3667 Merge branch 'bugfix/mrf-simple-media-stripping' into 'develop'
6 years ago
lain 6eb274f278 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
6 years ago
lain 3bad2b827a Resurrect instance specific panel.
6 years ago
William Pitcock 90bbd94614 ActivityPub MRF SimplePolicy: fix media stripping
7 years ago
eal 845bd56c9c Merge branch 'patch-1' into 'develop'
7 years ago
lain a7eb148d61 Optionally deactivate public timelines.
7 years ago
lain 279b1d19f0 Align local bio limits to remote limit.
7 years ago