aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-24removing deleted MDII uploader from suggestionsAlexander Strizhakov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-24Merge branch 'fix_for_migrate_to_db_test' into 'develop'feld
Fix for migrate to db test See merge request pleroma/pleroma!2133
2020-01-23Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop'feld
Truncate config table on migrate to db task and fix for parsing Swoosh adapters Closes #1529 See merge request pleroma/pleroma!2136
2020-01-23parsing Swoosh modulesAlexander Strizhakov
2020-01-23Add NewUsersDigestEmail to config/description.exsEgor Kislitsyn
2020-01-23restart config id after truncateAlexander Strizhakov
2020-01-23truncate config table on migrate to db taskAlexander Strizhakov
2020-01-23fixed delete ScheduledActivityMaksim Pechnikov
2020-01-23fix for migrate to db testAlexander Strizhakov
2020-01-23Emoji reactions: Add sanity checks for the cachelain
2020-01-23Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-23Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-23removed try/rescueMaksim Pechnikov
2020-01-23Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.exMaksim
2020-01-23Merge branch 'emoji-notifications' into 'develop'Haelwenn
Emoji notifications See merge request pleroma/pleroma!2130
2020-01-23Merge branch 'develop' into 'develop'Haelwenn
Updated OpenBSD installation guide for version OpenBSD 6.6 See merge request pleroma/pleroma!2131
2020-01-22Updated OpenBSD installation guide for version OpenBSD 6.6Farhan Khan
* initdb command now requires explicit -U and -D flags * acme-client now requires version v02 API endpoint * Added step to add admin user, per other installation guides * Corrected setup_db.psql path
2020-01-22Merge branch 'feature/new-registrations-digest' of ↵Mark Felder
git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest
2020-01-22Merge branch 'develop' into feature/new-registrations-digestMark Felder
2020-01-22Merge branch 'develop' into features/remote-follow-userpage-redirectMark Felder
2020-01-22Update changeloglain
2020-01-22Document new EmojiReaction notificationslain
2020-01-22Notifications: Add emoji reaction notificationslain
2020-01-22Update CHANGELOGEgor Kislitsyn
2020-01-22Update documentationEgor Kislitsyn
2020-01-22[#1505] Added Mastodon-compatible `replies` collection to Note federated ↵Ivan Tashkinov
representation.
2020-01-22Merge branch 'no-error-404' into 'develop'rinpatch
Log at debug level for object deletion, not error. See merge request pleroma/pleroma!2066
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-22Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eexminibikini
2020-01-22Merge branch 'develop' into feature/new-registrations-digestEgor Kislitsyn
2020-01-22Merge branch 'admin-be' into 'develop'feld
Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976
2020-01-22Fix credo warningsEgor Kislitsyn
2020-01-22Apply suggestion to docs/configuration/cheatsheet.mdMaksim
2020-01-22Apply suggestion to docs/configuration/cheatsheet.mdMaksim
2020-01-22Disable NewUsersDigestEmail by defaultEgor Kislitsyn
2020-01-22Add new users digest emailEgor Kislitsyn
2020-01-22little fixesAlexander Strizhakov
2020-01-22docs updateAlexander Strizhakov
2020-01-22Merge branch 'mastofe/bundle-2020-01-22' into 'develop'rinpatch
Update MastoFE bundle to 2020-01-22 See merge request pleroma/pleroma!2127
2020-01-22Update MastoFE bundle to 2020-01-22Haelwenn (lanodan) Monnier
2020-01-22Merge branch 'emoji-reaction-extensions-2' into 'develop'rinpatch
Emoji Reactions: In the API, sort them by first emoji insertion date See merge request pleroma/pleroma!2126
2020-01-22Emoji reactions: Document changeslain
2020-01-22Emoji reactions: Change cache and reply formatlain
2020-01-22support for updating env after settings deletionAlexander Strizhakov
2020-01-22Merge branch 'develop' into admin-beAlexander Strizhakov
2020-01-22Revert "Update AdminFE build"Alexander Strizhakov
This reverts commit 6395ad942c7087e97a8dcf2e9002005ed7b4c383
2020-01-22Merge branch 'develop' into issue/1383Maksim Pechnikov
2020-01-21Merge branch 'fix/attachments-cleanup' into 'develop'feld
Delete attachments in queue with infinite timeout and ensure object.data.url is an array See merge request pleroma/pleroma!2103
2020-01-21Merge branch 'update/adminfe-20200121-part2' into 'develop'feld
AdminFE update, again See merge request pleroma/pleroma!2125