a182d400d7
Merge branch 'fix_for_migrate_to_db_test' into 'develop'
...
Fix for migrate to db test
See merge request pleroma/pleroma!2133
2020-01-24 00:25:38 +00:00
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
2020-01-23 17:18:11 +00:00
6cd2e851d9
parsing Swoosh modules
2020-01-23 18:21:29 +03:00
3c4a30c6db
Add NewUsersDigestEmail to config/description.exs
2020-01-23 18:53:11 +04:00
e8e57e398f
restart config id after truncate
2020-01-23 17:48:45 +03:00
4344c5d5b9
truncate config table on migrate to db task
2020-01-23 17:23:02 +03:00
8589632d09
fixed delete ScheduledActivity
2020-01-23 17:18:23 +03:00
2bad25cf14
fix for migrate to db test
2020-01-23 15:13:27 +03:00
34fc0ca053
Emoji reactions: Add sanity checks for the cache
2020-01-23 12:34:34 +01:00
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
2020-01-23 11:42:10 +03:00
5fc2fa8908
Merge branch 'develop' into issue/1383
2020-01-23 11:11:18 +03:00
ce7c887a27
removed try/rescue
2020-01-23 11:05:08 +03:00
6f77b77428
Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
2020-01-23 05:49:00 +00:00
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
2020-01-23 02:12:03 +00:00
73e6bbbe89
Merge branch 'develop' into 'develop'
...
Updated OpenBSD installation guide for version OpenBSD 6.6
See merge request pleroma/pleroma!2131
2020-01-23 02:05:22 +00:00
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
2020-01-22 17:33:10 -05:00
4c59e9477a
Merge branch 'feature/new-registrations-digest' of git.pleroma.social:pleroma/pleroma into feature/new-registrations-digest
2020-01-22 15:59:37 -06:00
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 15:59:24 -06:00
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
2020-01-22 15:05:39 -06:00
002146d297
Update changelog
2020-01-22 20:12:45 +01:00
85f45c7689
Document new EmojiReaction notifications
2020-01-22 20:11:18 +01:00
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
0b843f2567
Update CHANGELOG
2020-01-22 22:29:07 +04:00
b8b90d967a
Update documentation
2020-01-22 22:28:06 +04:00
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
2020-01-22 21:10:17 +03:00
6e6f1ead31
Merge branch 'no-error-404' into 'develop'
...
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
2020-01-22 17:55:49 +00:00
cf19bf3c7c
Merge branch 'develop' into issue/1383
2020-01-22 20:20:39 +03:00
7c0ac54437
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
2020-01-22 17:18:55 +00:00
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 21:18:27 +04:00
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
b6f5b326e7
Fix credo warnings
2020-01-22 20:59:58 +04:00
e761d76e4f
Apply suggestion to docs/configuration/cheatsheet.md
2020-01-22 16:58:50 +00:00
d43c9ab286
Apply suggestion to docs/configuration/cheatsheet.md
2020-01-22 16:58:43 +00:00
aa0f0d4edd
Disable NewUsersDigestEmail by default
2020-01-22 20:53:06 +04:00
df0b8f1d08
Add new users digest email
2020-01-22 20:31:42 +04:00
f3e074e949
little fixes
2020-01-22 18:22:54 +03:00
a9c6f119ac
docs update
2020-01-22 18:08:53 +03:00
15db18af69
Merge branch 'mastofe/bundle-2020-01-22' into 'develop'
...
Update MastoFE bundle to 2020-01-22
See merge request pleroma/pleroma!2127
2020-01-22 15:06:26 +00:00
bd3f3756fb
Update MastoFE bundle to 2020-01-22
2020-01-22 16:00:23 +01:00
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
2020-01-22 14:11:01 +00:00
043cd5aa54
Emoji reactions: Document changes
2020-01-22 13:58:02 +01:00
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
d5f8a88a37
support for updating env after settings deletion
2020-01-22 15:14:11 +03:00
32a643a159
Merge branch 'develop' into admin-be
2020-01-22 11:22:31 +03:00
7ee2f86d76
Revert "Update AdminFE build"
...
This reverts commit 6395ad942c
2020-01-22 08:21:35 +00:00
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
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
2020-01-21 22:44:04 +00:00
66c6f8f6ec
Merge branch 'update/adminfe-20200121-part2' into 'develop'
...
AdminFE update, again
See merge request pleroma/pleroma!2125
2020-01-21 21:15:32 +00:00
2860bee604
Last AdminFE update was accidentally built from master, not develop
2020-01-21 15:09:16 -06:00
6f26937647
Merge branch 'update/adminfe-20200121' into 'develop'
...
Update AdminFE build
See merge request pleroma/pleroma!2124
2020-01-21 19:49:02 +00:00
feld
Alexander Strizhakov
Egor Kislitsyn
Maksim Pechnikov
lain
Haelwenn
Farhan Khan
Mark Felder
Ivan Tashkinov
rinpatch
Haelwenn (lanodan) Monnier