2cfe1b9385
Merge branch 'develop' into feature/tag_feed
5 years ago
5fc2fa8908
Merge branch 'develop' into issue/1383
5 years ago
ce7c887a27
removed try/rescue
5 years ago
6f77b77428
Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
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
4c59e9477a
Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest
5 years ago
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
5 years ago
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
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
0b843f2567
Update CHANGELOG
5 years ago
b8b90d967a
Update documentation
5 years ago
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
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
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
7c0ac54437
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
5 years ago
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
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
b6f5b326e7
Fix credo warnings
5 years ago
e761d76e4f
Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
d43c9ab286
Apply suggestion to docs/configuration/cheatsheet.md
5 years ago
aa0f0d4edd
Disable NewUsersDigestEmail by default
5 years ago
df0b8f1d08
Add new users digest email
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
b8d5c09f48
Merge branch 'develop' into issue/1383
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
5ea8596448
Merge branch 'develop' into feature/tag_feed
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
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
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
Maksim Pechnikov