aboutsummaryrefslogtreecommitdiff
path: root/priv
AgeCommit message (Collapse)Author
2019-09-16Merge developRoman Chvanikov
2019-09-16Merge branch 'feature/delivery-tracking' into 'develop'kaniini
Track signed fetches of objects and use them for delete federation See merge request pleroma/pleroma!1661
2019-09-13Disallow NULLs in deliveriesrinpatch
2019-09-13Separate Subscription Notifications from regular NotificationsRoman Chvanikov
2019-09-12Track object/create activity fetchesrinpatch
2019-09-06[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
1149-oban-job-queue # Conflicts: # test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06Update frontend bundle to e75ac9ddrinpatch
2019-08-31[#1149] Added Oban job for "activity_expiration". Merged remote-tracking ↵Ivan Tashkinov
branch 'remotes/upstream/develop' into 1149-oban-job-queue # Conflicts: # config/config.exs
2019-08-25Log admin/moderator actionsMaxim Filippov
2019-08-24Merge remote-tracking branch 'origin/develop' into ↵lain
sixohsix/pleroma-post_expiration
2019-08-24Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-08-23Add an index on object likesrinpatch
In !1538 favorites timeline was switched to use the joined object, but no idex on likes in the joined object was added.
2019-08-22[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
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-14Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-08-14Merge remote-tracking branch 'origin/develop' into pleroma-conversationslain
2019-08-12Update AdminFEMark Felder
Now permits server configuration. Consider this ALPHA.
2019-08-09Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queueIvan Tashkinov
2019-08-08Merge branch 'feature/digest-email' into 'develop'lain
Feature/digest email See merge request pleroma/pleroma!1078
2019-08-08Merge remote-tracking branch 'origin/develop' into pleroma-conversationslain
2019-08-04Remove longfox emoji setHakaba Hitoyo
2019-08-02Conversations: Add recipient list to conversation participation.lain
This enables to address the same group of people every time.
2019-08-01[#1149] Replaced RetryQueue with oban-based retries.Ivan Tashkinov
2019-07-24Add activity expirations tableMike Verdone
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-20fr/LC_MESSAGES/errors.po: Create translation fileHaelwenn (lanodan) Monnier
2019-07-16Merge developRoman Chvanikov
2019-07-15Add `listMessage` to to the JSON-LD contextEgor Kislitsyn
2019-07-15Merge remote-tracking branch 'pleroma/develop' into feature/addressable-listsEgor Kislitsyn
2019-07-14Merge branch 'develop' into feature/digest-emailRoman Chvanikov
2019-07-14Feature/1072 muting notificationsAlexander Strizhakov
2019-07-12merge developRoman Chvanikov
2019-07-11Merge branch 'develop' into feature/addressable-listsEgor Kislitsyn
2019-07-10saving following_address for existing usersAlex S
2019-07-10adding following_address field to userAlex S
2019-07-10Add Russian translationEgor Kislitsyn
2019-07-10Wrap error messages into gettext helpersEgor Kislitsyn
2019-07-10add listener port and ip option for 'pleroma.instance gen' and enable its testSachin Joshi
2019-07-09Merge developRoman Chvanikov
2019-07-09Merge branch 'remove-swift' into 'develop'kaniini
Remove Uploaders.Swift and `httpoison` dependency Closes #1051 See merge request pleroma/pleroma!1374
2019-07-03Split alters rather than work with indexesRoman Chvanikov
2019-07-03Remove Uploaders.SwiftEgor Kislitsyn
2019-07-03Fix migrationRoman Chvanikov
2019-07-01[#1033] Fix database migrationsMaksim
2019-06-29Resolve conflictsRoman Chvanikov
2019-06-28Update frontend.lain
2019-06-26Merge branch 'update-mastofe/glitch-soc-2019-06-26' into 'develop'rinpatch
Update mastofe to bundle-2019-06-26 See merge request pleroma/pleroma!1341
2019-06-26Update mastofe to bundle-2019-06-26Haelwenn (lanodan) Monnier
2019-06-23Update adminFE to latest buildMark Felder
2019-06-23Merge branch 'admin-config' into 'develop'kaniini
Admin config See merge request pleroma/pleroma!1328
2019-06-23support for config groupsAlex S
2019-06-22Support RUM indexes in the config generatorrinpatch