Commit Graph

621 Commits (bdaa7e53940daa43b83e3baab836b701482e6d8f)

Author SHA1 Message Date
Haelwenn 92a8ff59aa Merge branch 'from/develop/tusooa/add-remove-emails' into 'develop'
3 years ago
Haelwenn 6b3842cf50 Merge branch 'remove/mastofe' into 'develop'
3 years ago
Tusooa Zhu 198250dcef
Allow users to remove their emails if instance does not need email to register
3 years ago
Haelwenn bc62a35282 Merge branch 'features/ingestion-no-nil' into 'develop'
3 years ago
Haelwenn 6633ec816f Merge branch 'admin_fe_dont_list_mrf_policies_any_more' into 'develop'
3 years ago
Haelwenn 84ec0fbeaa Merge branch 'show_frontends_also_when_no_static_frontends_folder_is_created_yet' into 'develop'
3 years ago
Ilja f9bafc17fb List available frontends also when no static/frontends folder is present yet
3 years ago
Haelwenn 773708cfe8 Merge branch 'builder-note' into 'develop'
3 years ago
Alex Gleason ba6049aa81
Builder.note/1: return {:ok, map(), keyword()} like other Builder functions
3 years ago
Alex Gleason a2eacfc525
CommonAPI.Utils.make_note_data/1 --> ActivityPub.Builder.note/1
3 years ago
Ilja 5049b4272e Selecting MRF policies didn't work as intended any more
3 years ago
Haelwenn (lanodan) Monnier 61d233921c
ObjectValidator.stringify_keys: filter out nil values
3 years ago
Haelwenn 7c1243178b Merge branch 'bugfix/change_password' into 'develop'
3 years ago
Haelwenn (lanodan) Monnier 197cdebca9
TwitterAPI: Make change_email require body params instead of query
3 years ago
Haelwenn (lanodan) Monnier 09dcb2b522
TwitterAPI: Make change_password require body params instead of query
3 years ago
Haelwenn (lanodan) Monnier c64eae40a2
ObjectAgePolicy: Fix pattern matching on published
3 years ago
Haelwenn 901204df22 Merge branch 'poll-notification' into 'develop'
3 years ago
Sean King 1841bd8383 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remove/mastofe
3 years ago
Ilja 03030b47c2
quarantine instances info
3 years ago
Ilja 47fc57bbcc
Change what nodeinfo returns without breaking backwards compatibility
3 years ago
Ilja 7fdc3cde06
Return maps in node_info
3 years ago
Ilja c0489f9fac
Fixed deprecation warning checks
3 years ago
Ilja b674ba658b
make linter happy
3 years ago
Ilja 3c5a497b19
Deprecate transparency_exclusions
3 years ago
Ilja dfeb3862da
config :mrf, :transparency_exclusions works with tumples now
3 years ago
Ilja e0c7d77197
Deprecate and rewrite settings for quarentine settings
3 years ago
Ilja 27fe7b0274
Make quarentine work with list of tuples instead of strings
3 years ago
Ilja dd947d9bc8
Add tests for setting `:instance, :quarantined_instances`
3 years ago
Ilja 4ba0beb60c
Make mrfSimple work with tuples
3 years ago
Ilja 647087d7fd
Deprectate strings for SimplePolicy
3 years ago
Alex Gleason 44ede0657f
Merge remote-tracking branch 'pleroma/develop' into staff-plug
3 years ago
Alex Gleason 62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
3 years ago
Alex Gleason 70f1496eb8
Poll notification: only notify local users
3 years ago
Alex Gleason 0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
3 years ago
Alex Gleason 0114754db2
MastodonAPI: Support poll notification
3 years ago
feld 3f58213646 Merge branch 'admin-api-users-sort' into 'develop'
3 years ago
Alex Gleason 1a2fe96d56
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-date
3 years ago
Alex Gleason 167e14416b
AdminAPI: add date to users
3 years ago
Alex Gleason deb3f91136
Merge remote-tracking branch 'pleroma/develop' into admin-api-users-sort
3 years ago
Alex Gleason 5e88796784
AdminAPI: sort user results by ID descending
3 years ago
Alex Gleason 1f093cb216
Moderators: reorganize :admin_api pipeline in Router
3 years ago
Alex Gleason 9bc1e79c56
Moderators: add UserIsStaffPlug
3 years ago
Haelwenn 173e977e28 Merge branch 'features/ingestion-page' into 'develop'
3 years ago
Haelwenn (lanodan) Monnier 6dc78f5f6f
AP C2S: Remove restrictions and make it go through pipeline
3 years ago
Sean King 9758f636b2 Delete MastoFE Controller Test
3 years ago
Sean King 5d279a22b1 Merge develop branch upstream
3 years ago
Alex Gleason 99cc26bb02
Merge remote-tracking branch 'pleroma/develop' into remote-deletions
3 years ago
Alex Gleason beb1c98ab5
Deletions: don't purge keys so Delete/Undo activities can be signed
3 years ago
Alex Gleason 43800d83f4
Deletions: allow deactivated users to be deleted
3 years ago
Alex Gleason a7929c4d89
Deletions: preserve account status fields during purge, fix checks
3 years ago