feld
|
008499f65a
|
Merge branch 'develop' into 'fix/2412-filters'
# Conflicts:
# CHANGELOG.md
|
4 years ago |
Alexander Strizhakov
|
2cb6dc5a3a
|
list timeline filtration by params
|
4 years ago |
Alexander Strizhakov
|
875fbaae35
|
support for expires_in/expires_at in filters
|
4 years ago |
Lain Soykaf
|
39f3683a06
|
Pbkdf2: Use it everywhere.
|
4 years ago |
lain
|
9106048c61
|
Password: Replace Pbkdf2 with Password.
|
4 years ago |
Haelwenn (lanodan) Monnier
|
c4439c630f
|
Bump Copyright to 2021
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>;'
|
4 years ago |
lain
|
e1e7e4d379
|
Object: Rework how Object.normalize works
Now it defaults to not fetching, and the option is named.
|
4 years ago |
Haelwenn
|
3966add048
|
Revert "Merge branch 'features/hashtag-column' into 'develop'"
This reverts merge request !2824
|
4 years ago |
Haelwenn (lanodan) Monnier
|
acb03d591b
|
Insert text representation of hashtags into object["hashtags"]
Includes a new mix task: pleroma.database fill_old_hashtags
|
4 years ago |
Alexander Strizhakov
|
e2bf6b1f7e
|
fix for forwarded reports
|
4 years ago |
Mark Felder
|
8bacdc3680
|
Change user.discoverable field to user.is_discoverable
|
4 years ago |
stwf
|
41939e3175
|
User search respect discoverable flag
|
4 years ago |
Alexander Strizhakov
|
9bf1065a06
|
schedule activity expiration in Oban
|
4 years ago |
Alex Gleason
|
f9301044ed
|
Add ReportNote test
|
4 years ago |
Alex Gleason
|
77b48cb4ce
|
Factory: Add report_activity_factory
|
4 years ago |
Sergey Suprunenko
|
4a8c26654e
|
Restrict statuses that contain user's irreversible filters
|
4 years ago |
Haelwenn (lanodan) Monnier
|
244655e884
|
MastoAPI: Show source field when deleting
|
4 years ago |
rinpatch
|
4ec2fb967e
|
Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
|
4 years ago |
Alexander Strizhakov
|
9a4fde9766
|
Mogrify args as custom tuples
|
4 years ago |
Haelwenn (lanodan) Monnier
|
e1b07402ab
|
User: Add raw_bio, storing unformatted bio
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
|
4 years ago |
lain
|
3bec0d2e50
|
Factory: Set users to be ap_enabled by default.
|
4 years ago |
Alex Gleason
|
b46811a074
|
Upgrade Comeonin to v5
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
|
4 years ago |
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
4 years ago |
lain
|
335aabc39c
|
Transmogrifier tests: Extract like tests.
|
4 years ago |
Alexander Strizhakov
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
5 years ago |
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
5 years ago |
Alexander Strizhakov
|
29155137fd
|
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
|
5 years ago |
Alexander Strizhakov
|
1630ecaa20
|
Merge branch 'develop' into admin-be
|
5 years ago |
Alexander
|
5cacb988b9
|
partially settings update
|
5 years ago |
Alex S
|
2753285b77
|
config editing through database
|
5 years ago |
Ivan Tashkinov
|
7973cbdb9f
|
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
|
5 years ago |
Maksim Pechnikov
|
95e6a2acd9
|
Merge branch 'develop' into issue/1342
|
5 years ago |
Maksim Pechnikov
|
3fe7a1fd35
|
Merge branch 'develop' into issue/1342
|
5 years ago |
Ivan Tashkinov
|
30caf3e51e
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
|
5 years ago |
Maksim Pechnikov
|
a52da55eb9
|
added User.NotificationSetting struct
|
5 years ago |
Ivan Tashkinov
|
1636cc5b7e
|
Removed users.info and remaining usages.
|
5 years ago |
Ivan Tashkinov
|
de892d2fe1
|
[#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
|
5 years ago |
Egor Kislitsyn
|
4c1dd55c48
|
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
|
5 years ago |
Maksim Pechnikov
|
243719a965
|
Merge branch 'develop' into feature/masto_api_markers
|
5 years ago |
Egor Kislitsyn
|
4ea1a61b00
|
Merge branch 'develop' into refactor/following-relationships
|
5 years ago |
Ariadne Conill
|
4f82e42e4e
|
websub: remove entirely
|
5 years ago |
Maksim Pechnikov
|
66b5d0ff55
|
add Markers /api/v1/markers
|
5 years ago |
Egor Kislitsyn
|
059005ff82
|
Replace `user.following` with Pleroma.FollowingRelationship
|
5 years ago |
Ivan Tashkinov
|
64095961fe
|
[#1234] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
|
5 years ago |
Ariadne Conill
|
c3d09921e4
|
test: factory: implement support for generating mock audio and listen objects
|
5 years ago |
Ivan Tashkinov
|
e6f43a831b
|
[#1234] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
|
5 years ago |
Maksim Pechnikov
|
00abe099cd
|
added tests for ActivityPub.like\unlike
|
5 years ago |
lain
|
cc6c0b4ba6
|
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
|
5 years ago |
lain
|
29807ef6a5
|
Merge branch 'feature/digest-email' into 'develop'
Feature/digest email
See merge request pleroma/pleroma!1078
|
5 years ago |
Sergey Suprunenko
|
e8ad116c2a
|
Do not add the "next" key to likes.json if there is no more items
|
5 years ago |