sadposter
f82d9e1359
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-25 13:33:10 +01:00
sadposter
31f932bdfb
eva
2019-09-25 13:33:05 +01:00
Haelwenn (lanodan) Monnier
646bf01608
Update AdminFE bundle
2019-09-23 21:13:39 +02:00
sadposter
c3de75b2a1
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-17 14:58:02 +01:00
rinpatch
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
2019-09-17 13:04:43 +03:00
sadposter
4714b739a7
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-16 12:14:48 +01:00
sadposter
63782e770b
add stickers
2019-09-16 12:14:42 +01:00
kaniini
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
2019-09-16 07:39:58 +00:00
sadposter
b4512ddb6f
thing
2019-09-14 00:20:48 +01:00
rinpatch
ac4a748fad
Disallow NULLs in deliveries
2019-09-13 19:28:35 +03:00
sadposter
f1e1ba71ce
update tos
2019-09-13 16:23:28 +01:00
sadposter
8046440a16
update fe
2019-09-13 16:18:38 +01:00
sadposter
cc5b65bd21
add lato
2019-09-13 15:27:51 +01:00
rinpatch
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
sadposter
94076a23e4
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-09-10 21:11:03 +01:00
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06 13:26:05 +03:00
rinpatch
16e6be340d
Update frontend bundle to e75ac9dd
2019-09-06 11:31:44 +03:00
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
sadposter
cc28184854
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-27 08:58:51 +01:00
Maxim Filippov
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
Ivan Tashkinov
c34126f89c
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-24 09:29:54 +03:00
rinpatch
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.
2019-08-23 03:17:20 +03:00
Ivan Tashkinov
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
2019-08-22 20:59:58 +03:00
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
sadposter
5b385962eb
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-13 09:05:44 +01:00
Mark Felder
24a731a9a6
Update AdminFE
...
Now permits server configuration. Consider this ALPHA.
2019-08-12 15:00:03 -05:00
sadposter
8abd779bcc
TOS
2019-08-12 14:55:20 +01:00
sadposter
6f8e4f5dcf
TOS
2019-08-12 00:51:04 +01:00
sadposter
59c9b90169
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-10 23:43:32 +01:00
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
sadposter
325372b1e1
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-08-07 08:59:31 +01:00
39c7bbe18f
Remove longfox emoji set
2019-08-04 04:32:45 +00:00
lain
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
2019-08-02 11:55:41 +02:00
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
Mike Verdone
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.
2019-07-24 13:14:52 +02:00
Roman Chvanikov
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
sadposter
32ce409514
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-16 11:21:31 +01:00
Egor Kislitsyn
04f18a144b
Add listMessage to to the JSON-LD context
2019-07-15 14:29:13 +07:00
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
sadposter
d4348eeb62
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2019-07-14 22:03:20 +01:00
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
Roman Chvanikov
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
Alex S
936050257d
saving following_address for existing users
2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
