sadposter
|
1eec8d3dee
|
frontend
|
2019-10-18 13:12:53 +01:00 |
|
sadposter
|
58f9ce0deb
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-10 10:28:16 +01:00 |
|
rinpatch
|
32808208be
|
Enable mix format for migrations
|
2019-10-08 15:16:39 +03:00 |
|
rinpatch
|
a502155274
|
Bump pleroma-fe bundle to 122323f35c
|
2019-10-07 17:42:33 +03:00 |
|
Ariadne Conill
|
19962d2022
|
clean up bundled litepub schema (closes #1303)
|
2019-10-07 11:33:58 +00:00 |
|
rinpatch
|
ee88afb2e2
|
Fix muted notification migration only working with a schema
Should also improve performance. I tested it on my local DB, but if
anyone has a backup of <=1.0 db they can test this on, please do
|
2019-10-06 18:06:04 +03:00 |
|
rinpatch
|
125f96e706
|
Fix the use of queries with a schema in a migration
|
2019-10-06 17:23:43 +03:00 |
|
rinpatch
|
fefbd31c6e
|
Move local keys out of user.info
|
2019-10-06 16:56:36 +03:00 |
|
eugenijm
|
8249924485
|
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
|
2019-10-05 20:12:00 +03:00 |
|
sadposter
|
8550e0ff0a
|
stickers
|
2019-10-04 12:04:31 +01:00 |
|
sadposter
|
59e6b48553
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-10-04 11:48:39 +01:00 |
|
sadposter
|
76c84720f7
|
stickers
|
2019-10-04 11:48:31 +01:00 |
|
Mark Felder
|
a562cb2c34
|
Update AdminFE bundle
|
2019-10-01 18:29:39 -05:00 |
|
Ariadne Conill
|
28be12b38e
|
update admin fe
|
2019-09-30 12:52:28 +00:00 |
|
kaniini
|
26f66fb70a
|
Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
|
2019-09-30 11:21:49 +00:00 |
|
rinpatch
|
1fba66178d
|
Merge branch 'develop' into cleanup/drop-subscription-table-if-exists
|
2019-09-30 00:26:49 +03:00 |
|
rinpatch
|
81b4243173
|
Remove subscription_notifications table if it existed
Followup to !1741
|
2019-09-29 23:52:40 +03:00 |
|
rinpatch
|
e9d1aa75d5
|
Revert subscription refactoring.
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10, reversing
changes made to c4fbb56984.
|
2019-09-29 18:43:27 +03:00 |
|
sadposter
|
1e11b97c1b
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-09-26 23:22:24 +01:00 |
|
Roman Chvanikov
|
b4b147000c
|
Merge develop
|
2019-09-26 10:38:54 +03:00 |
|
|
|
5fb72170a7
|
Revert "add _discoverable_ keyword into ActivityPub @context"
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
|
2019-09-26 02:57:41 +00:00 |
|
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
|
5820dc40fc
|
litepub-0.1.jsonld: Add uploadMedia
|
2019-09-24 19:00:31 +02: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 |
|
Roman Chvanikov
|
76c3e290fc
|
Merge develop
|
2019-09-16 20:30:42 +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 |
|
Roman Chvanikov
|
0bd2b85edb
|
Separate Subscription Notifications from regular Notifications
|
2019-09-13 18:25:27 +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 |
|
