9be6caf125
argon2 password hashing ( #406 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #406
2022-12-30 02:46:58 +00:00
c2054f82ab
allow users with admin:metrics to read app metrics
ci/woodpecker/push/woodpecker Pipeline is pending
2022-12-16 03:32:51 +00:00
d55de5debf
Remerge of hashtag following ( #341 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
this time with less idiot
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #341
2022-12-05 12:58:48 +00:00
ec6bf8c3f7
revert 4a94c9a31e
...
ci/woodpecker/push/woodpecker Pipeline is pending
revert Add ability to follow hashtags (#336 )
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #336
2022-12-04 20:04:09 +00:00
4a94c9a31e
Add ability to follow hashtags ( #336 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #336
2022-12-04 17:36:59 +00:00
6b882a2c0b
Purge Rejected Follow requests in daily task ( #334 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #334
2022-12-03 23:17:43 +00:00
8d6cc6cb65
Resolve follow activity from accept/reject without ID ( #328 )
...
ci/woodpecker/push/woodpecker Pipeline is pending
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #328
2022-12-02 11:12:37 +00:00
db60640c5b
Fixing up deletes a bit ( #327 )
...
ci/woodpecker/push/woodpecker Pipeline failed
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #327
2022-12-01 15:00:53 +00:00
b7e8ce2350
Scrape instance nodeinfo ( #251 )
...
ci/woodpecker/push/woodpecker Pipeline is pending
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #251
2022-11-06 22:49:39 +00:00
c6e63aaf6b
Backend settings sync ( #226 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #226
2022-10-06 16:22:15 +00:00
b4261b0335
Use set of pregenerated RSA keys
...
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
Randomness is a huge resource sink, so let's just use
a some that we made earlier
2022-09-11 20:14:58 +01:00
0b14f02ed2
User: generate private keys on user creation
...
This fixes a race condition bug where keys could be regenerated
post-federation, causing activities and HTTP signatures from an user to
be dropped due to key differences.
2022-09-11 19:54:37 +01:00
2641dcdd15
Post editing ( #202 )
...
ci/woodpecker/push/woodpecker Pipeline was successful
Rebased from #103
Co-authored-by: Tusooa Zhu <tusooa@kazv.moe>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: #202
2022-09-06 19:24:02 +00:00
54ed8760ff
Merge branch 'from/upstream-develop/tusooa/server-announcements' into 'develop' ( #85 )
...
ci/woodpecker/push/docs Pipeline is pending
ci/woodpecker/push/release Pipeline is pending
ci/woodpecker/push/test Pipeline is pending
Reviewed-on: #85
2022-07-18 13:08:36 +00:00
Haelwenn
901204df22
Merge branch 'poll-notification' into 'develop'
...
MastodonAPI: Support poll notification
See merge request pleroma/pleroma!3484
2021-08-09 10:02:37 +00:00
Ilja
dd947d9bc8
Add tests for setting :instance, :quarantined_instances
...
No test was done for quarantined instances yet. I added a factory for followers_only notes and checked
* That no followers only post is send when the target server is quarantined
* That a followers only post is send when the target server is not quarantined
2021-08-06 07:59:52 +02:00
Alex Gleason
62bf6d67e3
Merge remote-tracking branch 'pleroma/develop' into poll-notification-fixes
2021-07-18 11:49:22 -05:00
Alex Gleason
0b1c05ca1e
Poll notification: trigger PollWorker through common_pipeline
2021-07-18 11:10:23 -05:00
Alex Gleason
0114754db2
MastodonAPI: Support poll notification
2021-07-17 22:19:38 -05:00
Haelwenn (lanodan) Monnier
5c3a0dd26e
factory: Fix article_factory
2021-06-03 19:11:16 +02:00
Alexander Strizhakov
8857242c95
removeing corresponding add activity
2021-03-25 13:03:41 +03:00
Alexander Strizhakov
3adb43cc20
refetch user on incoming add/remove activity
...
if featured_address is nil
2021-03-25 13:03:41 +03:00
Alexander Strizhakov
3ec1dbd922
Let pins federate
...
- save object ids on pin, instead of activity ids
- pins federation
- removed pinned_activities field from the users table
- activityPub endpoint for user pins
- pulling remote users pins
2021-03-25 13:03:40 +03:00
008499f65a
Merge branch 'develop' into 'fix/2412-filters'
...
# Conflicts:
# CHANGELOG.md
2021-02-03 14:23:23 +00:00
Alexander Strizhakov
2cb6dc5a3a
list timeline filtration by params
2021-02-01 14:11:12 +03:00
Alexander Strizhakov
875fbaae35
support for expires_in/expires_at in filters
2021-01-26 08:27:45 +03:00
Lain Soykaf
39f3683a06
Pbkdf2: Use it everywhere.
2021-01-14 15:06:16 +01:00
lain
9106048c61
Password: Replace Pbkdf2 with Password.
2021-01-13 15:11:11 +01:00
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/ >;'
2021-01-13 07:49:50 +01:00
lain
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
Haelwenn
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
Alexander Strizhakov
e2bf6b1f7e
fix for forwarded reports
2020-11-19 09:53:13 +03:00
Mark Felder
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
stwf
41939e3175
User search respect discoverable flag
2020-09-17 12:15:50 -04:00
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
Alex Gleason
f9301044ed
Add ReportNote test
2020-08-02 17:45:15 -05:00
Alex Gleason
77b48cb4ce
Factory: Add report_activity_factory
2020-08-02 16:36:55 -05:00
Sergey Suprunenko
4a8c26654e
Restrict statuses that contain user's irreversible filters
2020-07-06 09:28:21 +03:00
Haelwenn (lanodan) Monnier
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
rinpatch
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
Haelwenn (lanodan) Monnier
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
lain
3bec0d2e50
Factory: Set users to be ap_enabled by default.
2020-05-25 12:59:42 +02:00
Alex Gleason
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
Maksim
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
lain
335aabc39c
Transmogrifier tests: Extract like tests.
2020-05-04 14:45:28 +02:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
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\/>'
2020-03-02 06:08:45 +01:00
Alexander Strizhakov
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00