Commit Graph

8264 Commits (24c526a0b18b822ae339a481934bfa66b13bba54)
 

Author SHA1 Message Date
rinpatch ecff8e92ff Merge branch 'emoji-reaction-api-change-2' into 'develop'
5 years ago
lain 9a994878f1 Emoji reactions: Update docs and changelog
5 years ago
lain 347f3ed2c6 Emoji reactions: Change api format once more
5 years ago
Alexander Strizhakov 6a0f0ac4a2
fix for non existing atom
5 years ago
Alexander Strizhakov e9d8a84790
better descriptions for email fields for admin-fe
5 years ago
Alexander Strizhakov b0ae69d996
removing deleted MDII uploader from suggestions
5 years ago
Maksim Pechnikov 293281fcbd Merge branch 'develop' into feature/tag_feed
5 years ago
feld a182d400d7 Merge branch 'fix_for_migrate_to_db_test' into 'develop'
5 years ago
feld 362295358a Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop'
5 years ago
Alexander Strizhakov 6cd2e851d9
parsing Swoosh modules
5 years ago
Alexander Strizhakov e8e57e398f
restart config id after truncate
5 years ago
Alexander Strizhakov 4344c5d5b9
truncate config table on migrate to db task
5 years ago
Maksim Pechnikov 8589632d09 fixed delete ScheduledActivity
5 years ago
Alexander Strizhakov 2bad25cf14
fix for migrate to db test
5 years ago
lain 34fc0ca053 Emoji reactions: Add sanity checks for the cache
5 years ago
Maksim Pechnikov 2cfe1b9385 Merge branch 'develop' into feature/tag_feed
5 years ago
Maksim Pechnikov 5fc2fa8908 Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov ce7c887a27 removed try/rescue
5 years ago
Maksim 6f77b77428 Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
5 years ago
Haelwenn dddebee047 Merge branch 'emoji-notifications' into 'develop'
5 years ago
Haelwenn 73e6bbbe89 Merge branch 'develop' into 'develop'
5 years ago
Farhan Khan 89eeadc2a8
Updated OpenBSD installation guide for version OpenBSD 6.6
5 years ago
lain 002146d297 Update changelog
5 years ago
lain 85f45c7689 Document new EmojiReaction notifications
5 years ago
lain 615b72238e Notifications: Add emoji reaction notifications
5 years ago
rinpatch 6e6f1ead31 Merge branch 'no-error-404' into 'develop'
5 years ago
Maksim Pechnikov cf19bf3c7c Merge branch 'develop' into issue/1383
5 years ago
feld be27777156 Merge branch 'admin-be' into 'develop'
5 years ago
Maksim e761d76e4f Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
Maksim d43c9ab286 Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
Alexander Strizhakov f3e074e949
little fixes
5 years ago
Alexander Strizhakov a9c6f119ac
docs update
5 years ago
rinpatch 15db18af69 Merge branch 'mastofe/bundle-2020-01-22' into 'develop'
5 years ago
Haelwenn (lanodan) Monnier bd3f3756fb
Update MastoFE bundle to 2020-01-22
5 years ago
rinpatch 34aa0c542b Merge branch 'emoji-reaction-extensions-2' into 'develop'
5 years ago
lain 043cd5aa54 Emoji reactions: Document changes
5 years ago
lain dd3fc50ea4 Emoji reactions: Change cache and reply format
5 years ago
Alexander Strizhakov d5f8a88a37
support for updating env after settings deletion
5 years ago
Alexander Strizhakov 32a643a159
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov 7ee2f86d76 Revert "Update AdminFE build"
5 years ago
Maksim Pechnikov b8d5c09f48 Merge branch 'develop' into issue/1383
5 years ago
feld 71bffbf0b7 Merge branch 'fix/attachments-cleanup' into 'develop'
5 years ago
feld 66c6f8f6ec Merge branch 'update/adminfe-20200121-part2' into 'develop'
5 years ago
Mark Felder 2860bee604 Last AdminFE update was accidentally built from master, not develop
5 years ago
feld 6f26937647 Merge branch 'update/adminfe-20200121' into 'develop'
5 years ago
Mark Felder bc2ebdcfd6 Update AdminFE build
5 years ago
Maksim Pechnikov 5ea8596448 Merge branch 'develop' into feature/tag_feed
5 years ago
Roman Chvanikov 92c8825515 Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma into fix/attachments-cleanup
5 years ago
Roman Chvanikov 795a5fe441 Add delete_attachments queue to config
5 years ago
Roman Chvanikov 22e94bb2c7 Merge branch 'develop' into fix/attachments-cleanup
5 years ago