lain
|
d378550d2d
|
Emoji Reactions: Document changes
|
2020-01-29 11:40:57 +01:00 |
|
lain
|
12b6fcdb8c
|
Merge branch 'features/task-test-email' into 'develop'
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
|
2020-01-28 16:42:57 +00:00 |
|
Haelwenn (lanodan) Monnier
|
4eb935be78
|
Create pleroma.email mix task
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
|
2020-01-28 16:49:38 +01:00 |
|
Maksim Pechnikov
|
bcffa662dc
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-27 21:13:13 +03:00 |
|
|
|
dabd535e43
|
Remove user recommendation by third party engine
|
2020-01-27 13:21:50 +00:00 |
|
Maksim Pechnikov
|
055edd3d72
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-24 21:46:57 +03:00 |
|
Mark Felder
|
a43b73bba9
|
Document dynamic_configuration breaking change
|
2020-01-24 08:04:25 -06:00 |
|
lain
|
9a994878f1
|
Emoji reactions: Update docs and changelog
|
2020-01-24 10:53:01 +01:00 |
|
Maksim Pechnikov
|
293281fcbd
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-24 08:58:07 +03:00 |
|
Alexander Strizhakov
|
4344c5d5b9
|
truncate config table on migrate to db task
|
2020-01-23 17:23:02 +03:00 |
|
Maksim Pechnikov
|
2cfe1b9385
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-23 11:42:10 +03:00 |
|
lain
|
002146d297
|
Update changelog
|
2020-01-22 20:12:45 +01:00 |
|
lain
|
043cd5aa54
|
Emoji reactions: Document changes
|
2020-01-22 13:58:02 +01:00 |
|
Maksim Pechnikov
|
5ea8596448
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-21 20:56:49 +03:00 |
|
Maksim Pechnikov
|
41e2332007
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-21 09:23:35 +03:00 |
|
lain
|
7d8b709d29
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
|
2020-01-20 18:10:55 +01:00 |
|
lain
|
7518f3877f
|
Update changelog
|
2020-01-20 16:31:12 +01:00 |
|
lain
|
4c5b5f14dc
|
StatusView: Add emoji_reactions
|
2020-01-20 16:24:20 +01:00 |
|
rinpatch
|
dc0498ab2b
|
Check for unapplied migrations on startup
Closes #1328
|
2020-01-20 12:20:26 +03:00 |
|
Maksim Pechnikov
|
a5db044e57
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-15 19:11:13 +03:00 |
|
Ivan Tashkinov
|
5304c8cd21
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
|
2020-01-15 18:12:08 +03:00 |
|
lain
|
aa9fe3a712
|
Merge branch 'develop' into 'feature/tag_feed'
# Conflicts:
# CHANGELOG.md
|
2020-01-15 14:29:56 +00:00 |
|
Egor Kislitsyn
|
3849053c6a
|
Merge branch 'develop' into notifications-from-account
|
2020-01-15 16:49:45 +04:00 |
|
Maksim Pechnikov
|
c9f45edeac
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-14 21:29:14 +03:00 |
|
Roman Chvanikov
|
88f0eed0f2
|
Delete attachments when status is deleted
|
2020-01-12 18:48:58 +00:00 |
|
|
|
8b4d81609d
|
Merge branch 'updated-at-on-conversation-read' into 'develop'
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
|
2020-01-12 18:37:52 +00:00 |
|
|
|
0c9c62509d
|
Remove MDII uploader
|
2020-01-11 17:19:54 +00:00 |
|
Ivan Tashkinov
|
6c94b7498b
|
[#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
|
2020-01-10 10:52:21 +03:00 |
|
lain
|
180f257ced
|
Update CHANGELOG.md
|
2020-01-06 14:10:07 +00:00 |
|
eugenijm
|
0b6d1292d2
|
Fix mark-as-read (POST /api/v1/conversations/:id/read) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
|
2020-01-05 17:38:51 +03:00 |
|
Maksim Pechnikov
|
b53573a837
|
add tag feeds
|
2019-12-18 09:19:37 +03:00 |
|
Egor Kislitsyn
|
6c39fa20b1
|
Add support for account_id param to filter notifications by the account
|
2019-12-17 17:00:46 +07:00 |
|
Egor Kislitsyn
|
7528322f83
|
Merge branch 'develop' into feature/custom-runtime-modules
|
2019-12-13 01:51:52 +07:00 |
|
Egor Kislitsyn
|
e536796984
|
Add native captcha and enable it by default.
|
2019-12-12 17:39:39 +07:00 |
|
Maxim Filippov
|
3ecf131511
|
Merge branch 'develop' into feature/report-notes
|
2019-12-12 02:16:23 +03:00 |
|
Mark Felder
|
0867064441
|
Document the favorites timeline order change
|
2019-12-11 15:03:54 -06:00 |
|
Egor Kislitsyn
|
1a6e30d32e
|
Update CHANGELOG
|
2019-12-11 22:32:53 +07:00 |
|
minibikini
|
43d9c06a2a
|
Merge branch 'develop' into 'feature/custom-runtime-modules'
# Conflicts:
# CHANGELOG.md
|
2019-12-10 13:38:25 +00:00 |
|
lain
|
1ae976ac51
|
Merge branch 'develop' into '1427-oauth-admin-scopes'
# Conflicts:
# CHANGELOG.md
|
2019-12-10 13:34:54 +00:00 |
|
|
|
701815e64c
|
[ActivityPub] Configurable ActivityPub actor type
|
2019-12-10 13:19:26 +00:00 |
|
Ivan Tashkinov
|
835ac2157c
|
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
# Conflicts:
# CHANGELOG.md
|
2019-12-10 08:55:14 +03:00 |
|
rinpatch
|
632dab5d30
|
Merge branch 'user-timelines-changelog' into 'develop'
Changelog: Update with user timeline change info.
See merge request pleroma/pleroma!2049
|
2019-12-09 17:50:00 +00:00 |
|
Egor Kislitsyn
|
c098dec473
|
Merge branch 'develop' into feature/custom-runtime-modules
|
2019-12-10 00:16:43 +07:00 |
|
lain
|
e4ea0e20b3
|
Merge branch 'issue/1342' into 'develop'
[#1342] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
|
2019-12-09 14:30:35 +00:00 |
|
lain
|
a5e28bf214
|
Merge branch 'develop' into 'fix/oauth-compile-time'
# Conflicts:
# CHANGELOG.md
|
2019-12-09 13:52:01 +00:00 |
|
lain
|
eb7f412b26
|
Changelog: Update with user timeline change info.
|
2019-12-09 14:43:57 +01:00 |
|
Maksim Pechnikov
|
dfae1d705f
|
update changelog
|
2019-12-08 21:46:20 +03:00 |
|
rinpatch
|
d6c89068f3
|
HTML: Compile Scrubbers on boot
This makes it possible to configure their behavior on OTP releases.
|
2019-12-08 20:35:41 +03:00 |
|
rinpatch
|
bd3aa8500c
|
OAuth token cleanup: Get rid of compile-time configuration
|
2019-12-08 20:03:33 +03:00 |
|
rinpatch
|
6cb31edd76
|
Merge branch 'feature/1455-chat-character-limit' into 'develop'
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
|
2019-12-06 15:36:30 +00:00 |
|
