6a0f0ac4a2
fix for non existing atom
5 years ago
a182d400d7
Merge branch 'fix_for_migrate_to_db_test' into 'develop'
...
Fix for migrate to db test
See merge request pleroma/pleroma!2133
5 years ago
362295358a
Merge branch 'truncate_config_table_on_migrate_to_db' into 'develop'
...
Truncate config table on migrate to db task and fix for parsing Swoosh adapters
Closes #1529
See merge request pleroma/pleroma!2136
5 years ago
6cd2e851d9
parsing Swoosh modules
5 years ago
e8e57e398f
restart config id after truncate
5 years ago
4344c5d5b9
truncate config table on migrate to db task
5 years ago
2bad25cf14
fix for migrate to db test
5 years ago
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
5 years ago
73e6bbbe89
Merge branch 'develop' into 'develop'
...
Updated OpenBSD installation guide for version OpenBSD 6.6
See merge request pleroma/pleroma!2131
5 years ago
89eeadc2a8
Updated OpenBSD installation guide for version OpenBSD 6.6
...
* 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
5 years ago
002146d297
Update changelog
5 years ago
85f45c7689
Document new EmojiReaction notifications
5 years ago
615b72238e
Notifications: Add emoji reaction notifications
5 years ago
6e6f1ead31
Merge branch 'no-error-404' into 'develop'
...
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
5 years ago
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
5 years ago
f3e074e949
little fixes
5 years ago
a9c6f119ac
docs update
5 years ago
15db18af69
Merge branch 'mastofe/bundle-2020-01-22' into 'develop'
...
Update MastoFE bundle to 2020-01-22
See merge request pleroma/pleroma!2127
5 years ago
bd3f3756fb
Update MastoFE bundle to 2020-01-22
5 years ago
34aa0c542b
Merge branch 'emoji-reaction-extensions-2' into 'develop'
...
Emoji Reactions: In the API, sort them by first emoji insertion date
See merge request pleroma/pleroma!2126
5 years ago
043cd5aa54
Emoji reactions: Document changes
5 years ago
dd3fc50ea4
Emoji reactions: Change cache and reply format
5 years ago
d5f8a88a37
support for updating env after settings deletion
5 years ago
32a643a159
Merge branch 'develop' into admin-be
5 years ago
7ee2f86d76
Revert "Update AdminFE build"
...
This reverts commit 6395ad942c
5 years ago
71bffbf0b7
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Delete attachments in queue with infinite timeout and ensure object.data.url is an array
See merge request pleroma/pleroma!2103
5 years ago
66c6f8f6ec
Merge branch 'update/adminfe-20200121-part2' into 'develop'
...
AdminFE update, again
See merge request pleroma/pleroma!2125
5 years ago
2860bee604
Last AdminFE update was accidentally built from master, not develop
5 years ago
6f26937647
Merge branch 'update/adminfe-20200121' into 'develop'
...
Update AdminFE build
See merge request pleroma/pleroma!2124
5 years ago
bc2ebdcfd6
Update AdminFE build
5 years ago
92c8825515
Merge branch 'fix/attachments-cleanup' of git.pleroma.social:pleroma/pleroma into fix/attachments-cleanup
5 years ago
795a5fe441
Add delete_attachments queue to config
5 years ago
22e94bb2c7
Merge branch 'develop' into fix/attachments-cleanup
5 years ago
f01ab6cd29
some refactor and tests
5 years ago
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
5 years ago
fa47a71990
Merge branch 'issue/1484' into 'develop'
...
[#1484 ] excludes posts of blocked users from search results
Closes #1484
See merge request pleroma/pleroma!2122
5 years ago
503d966e9f
Merge branch 'develop' into admin-be
5 years ago
dcae5914d1
fix for db key
5 years ago
6e88a7e591
exclude blocked user posts from search results
5 years ago
390bf9b097
Merge branch 'develop' into fix/attachments-cleanup
5 years ago
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
5 years ago
ab36459464
Merge branch '1521-admin-report-test-fix' into 'develop'
...
[#1521 ] AdminApiControllerTest fix: fixed create report test (OAuth)
Closes #1521
See merge request pleroma/pleroma!2121
5 years ago
ca3b4de2c9
[ #1521 ] AdminApiControllerTest: fixed create report test (OAuth).
5 years ago
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
5 years ago
7518f3877f
Update changelog
5 years ago
8023fa48db
merge fix
5 years ago
4c5b5f14dc
StatusView: Add `emoji_reactions`
5 years ago
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
5 years ago
2199d63ddc
StatusControllerTest: Fix typo
5 years ago
42ea480e95
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
...
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
5 years ago
Alexander Strizhakov