aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-25can be changed in runtimeAlexander Strizhakov
2020-01-25respect settings from database in mix tasksAlexander Strizhakov
2020-01-24added atom feedMaksim Pechnikov
2020-01-24Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-24Merge branch 'chore/changelog-for-dynamic-config' into 'develop'feld
Document dynamic_configuration breaking change See merge request pleroma/pleroma!2142
2020-01-24Document dynamic_configuration breaking changeMark Felder
2020-01-24Merge branch 'fix/better-descriptions-for-email-fields' into 'develop'feld
Better descriptions for email fields for admin-fe Closes admin-fe#67 See merge request pleroma/pleroma!2138
2020-01-24Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'rinpatch
Fix for non existing atom Closes #1532 See merge request pleroma/pleroma!2139
2020-01-24Merge branch 'emoji-reaction-sanity-check' into 'develop'rinpatch
Emoji reactions: Add sanity checks for the cache See merge request pleroma/pleroma!2132
2020-01-24Merge branch 'fix/removing-mdii-uploader-from-descriptions' into 'develop'rinpatch
Removing deleted MDII uploader from suggestions Closes admin-fe#64 See merge request pleroma/pleroma!2137
2020-01-24Merge branch 'emoji-reaction-api-change-2' into 'develop'rinpatch
Emoji reaction api change 2 See merge request pleroma/pleroma!2140
2020-01-24Emoji reactions: Update docs and changeloglain
2020-01-24Emoji reactions: Change api format once morelain
2020-01-24fix for non existing atomAlexander Strizhakov
2020-01-24better descriptions for email fields for admin-feAlexander Strizhakov
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-23restart config id after truncateAlexander Strizhakov
2020-01-23truncate config table on migrate to db taskAlexander Strizhakov
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 '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-22Update changeloglain
2020-01-22Document new EmojiReaction notificationslain
2020-01-22Notifications: Add emoji reaction notificationslain
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 'admin-be' into 'develop'feld
Config api for admin-fe Closes #1406 See merge request pleroma/pleroma!1976
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-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
2020-01-21Last AdminFE update was accidentally built from master, not developMark Felder
2020-01-21Merge branch 'update/adminfe-20200121' into 'develop'feld
Update AdminFE build See merge request pleroma/pleroma!2124
2020-01-21Update AdminFE buildMark Felder
2020-01-21Merge branch 'develop' into feature/tag_feedMaksim Pechnikov
2020-01-21Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma ↵Roman Chvanikov
into fix/attachments-cleanup