26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
1fba66178d
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
5 years ago
81b4243173
Remove subscription_notifications table if it existed
...
Followup to !1741
5 years ago
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
5 years ago
b4b147000c
Merge develop
5 years ago
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
5820dc40fc
litepub-0.1.jsonld: Add uploadMedia
5 years ago
646bf01608
Update AdminFE bundle
5 years ago
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
5 years ago
76c3e290fc
Merge develop
5 years ago
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
5 years ago
ac4a748fad
Disallow NULLs in deliveries
5 years ago
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
769fb778d4
Track object/create activity fetches
5 years ago
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
16e6be340d
Update frontend bundle to e75ac9dd
5 years ago
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
37dd3867bb
Log admin/moderator actions
5 years ago
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
05e7d0a438
Add an index on object likes
...
In !1538 favorites timeline was switched to use the joined object, but
no idex on likes in the joined object was added.
5 years ago
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
5 years ago
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
39c7bbe18f
Remove longfox emoji set
5 years ago
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
5 years ago
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
5 years ago
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
5 years ago
9bca70b10a
Merge develop
5 years ago
04f18a144b
Add `listMessage` to to the JSON-LD context
5 years ago
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
e7c39b7ac8
Feature/1072 muting notifications
5 years ago
eae991b06a
merge develop
5 years ago
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
5 years ago
936050257d
saving following_address for existing users
5 years ago
f8786fa6f2
adding following_address field to user
5 years ago
406efb3688
Add Russian translation
5 years ago
5104f65b69
Wrap error messages into gettext helpers
5 years ago
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
5 years ago
371d39e160
Merge develop
5 years ago
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
5 years ago
efefee8241
Split alters rather than work with indexes
5 years ago
4f42093220
Remove Uploaders.Swift
5 years ago
291d95dcc3
Fix migration
5 years ago
85c7916c94
[ #1033 ] Fix database migrations
5 years ago
kaniini