Lain Soykaf
|
8a79f20c21
|
EmojiReactions: Rename to EmojiReacts
|
2020-02-06 18:09:57 +01:00 |
|
|
|
df0b00b32d
|
Merge branch 'mastoapi-non-html-strings' into 'develop'
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
|
2020-02-06 16:08:23 +00:00 |
|
Egor Kislitsyn
|
8b9742ecf5
|
Cancellation of a follow request for a remote user
|
2020-02-06 18:02:33 +04:00 |
|
Alexander Strizhakov
|
c85aa6e87f
|
removing confusing error
|
2020-02-06 12:50:36 +03:00 |
|
rinpatch
|
15cb1f6804
|
Merge branch 'fix/unpinnable-polls' into 'develop'
fix not being able to pin polls
See merge request pleroma/pleroma!2172
|
2020-02-05 21:04:16 +00:00 |
|
Alexander Strizhakov
|
5db6ac8ee4
|
removing migrate_from_db endpoint from admin api
|
2020-02-05 20:36:21 +03:00 |
|
rinpatch
|
49e80a1537
|
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
|
2020-02-05 16:59:21 +00:00 |
|
Egor Kislitsyn
|
8c71f7e11a
|
Add support for cancellation of a follow request
|
2020-02-05 20:22:15 +04:00 |
|
Ivan Tashkinov
|
e84fee5b86
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
|
2020-02-05 07:56:36 +03:00 |
|
Maksim Pechnikov
|
2c40c8b4a2
|
Merge branch 'develop' into issue/1383
|
2020-02-03 21:42:36 +03:00 |
|
rinpatch
|
50f5a92021
|
fix not being able to pin polls
|
2020-02-02 14:55:06 +03:00 |
|
rinpatch
|
983a87175e
|
mastodon API: do not sanitize html in non-html fields
|
2020-02-02 14:46:32 +03:00 |
|
Roman Chvanikov
|
8057157ee3
|
Make attachments cleanup optional
|
2020-01-31 01:20:37 +03:00 |
|
rinpatch
|
c27d1d65bf
|
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
|
2020-01-30 19:24:04 +00:00 |
|
rinpatch
|
5b62acf6e9
|
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
|
2020-01-30 22:16:55 +03:00 |
|
lain
|
01fb4dbeae
|
Emoji Reactions: Add fixtures
|
2020-01-30 16:26:45 +01:00 |
|
lain
|
a0d9d42eaa
|
Emoji Reactions: Actually use the validation.
|
2020-01-30 16:07:37 +01:00 |
|
|
|
e2f2602fdc
|
Merge branch 'emoji-api-errors' into 'develop'
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
|
2020-01-30 14:13:40 +00:00 |
|
rinpatch
|
263abe3ba5
|
Merge branch 'emoji-reactions-reacted' into 'develop'
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
|
2020-01-30 13:16:04 +00:00 |
|
Haelwenn
|
946de2299c
|
Merge branch 'fix-streaming-reblog' into 'develop'
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
|
2020-01-29 20:21:32 +00:00 |
|
Alexander Strizhakov
|
e7fee0d6fa
|
emoji api error on not writable dir
|
2020-01-29 15:31:34 +03:00 |
|
lain
|
7a60cd91ff
|
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
|
2020-01-29 11:52:24 +01:00 |
|
lain
|
e2e9299b8e
|
Streamer Tests: code readability improvements
|
2020-01-29 11:50:49 +01:00 |
|
lain
|
b3a877d6c9
|
Emoji Reactions: Correctly handle deleted users
|
2020-01-29 11:43:36 +01:00 |
|
lain
|
a802e07241
|
Emoji Reactions: Add reacted field to emoji reactions
|
2020-01-29 11:39:06 +01:00 |
|
Alexander Strizhakov
|
1f4fbe9d98
|
title parse improvement
|
2020-01-29 11:13:34 +03:00 |
|
Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
2020-01-28 20:39:20 +03:00 |
|
lain
|
cedee2793d
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
|
2020-01-28 17:52:42 +01:00 |
|
lain
|
e8f22451da
|
Merge branch 'linkify-test-expansion' into 'develop'
Formatter: Add a test for domain / username clashes
See merge request pleroma/pleroma!2151
|
2020-01-28 16:51:29 +00: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 |
|
lain
|
2c121b2623
|
Merge branch 'fix/1524-link_preview' into 'develop'
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
|
2020-01-28 16:38:14 +00:00 |
|
Alexander Strizhakov
|
7bd4c14581
|
meta tag parser respect first title header
|
2020-01-28 19:29:27 +03:00 |
|
lain
|
d385789a45
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
|
2020-01-28 17:06:36 +01: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 |
|
lain
|
e816edbb2f
|
Update streamer_test.exs
|
2020-01-28 15:42:05 +00:00 |
|
lain
|
77f24525ca
|
Streamer: Correctly handle reblog mutes
|
2020-01-28 16:40:44 +01:00 |
|
Alexander Strizhakov
|
33bd8fbffe
|
filename and test fixes
|
2020-01-28 18:02:11 +03:00 |
|
|
|
d9cb8acd3e
|
Merge branch 'fix/attachments-cleanup' into 'develop'
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
|
2020-01-28 14:52:57 +00:00 |
|
Egor Kislitsyn
|
2ddd1bb088
|
Fix compatibility with Elixir v1.10
|
2020-01-28 18:23:59 +04:00 |
|
Roman Chvanikov
|
d18a2e4e36
|
Add test for custom base_url when deleting an attachment
|
2020-01-28 17:22:24 +03:00 |
|
lain
|
51283bf996
|
Formatter: Add a test for domain / username clashes
|
2020-01-28 13:38:21 +01:00 |
|
Maksim Pechnikov
|
be926863a8
|
fix test
|
2020-01-27 21:20:33 +03: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
|
bfc70fdf29
|
Merge branch 'develop' into issue/1383
|
2020-01-27 08:48:19 +03:00 |
|
Mark Felder
|
d770cffce0
|
Merge branch 'develop' into issue/1280
|
2020-01-26 11:23:05 -06:00 |
|
Alexander Strizhakov
|
ac97d01fb6
|
right test
|
2020-01-25 19:21:21 +03:00 |
|
Alexander Strizhakov
|
e93cc561cd
|
restarting pleroma from outside application
|
2020-01-25 18:42:04 +03:00 |
|
Ivan Tashkinov
|
86e4d23acb
|
[#1505] Background fetching of incoming activities' replies collections.
|
2020-01-25 10:47:30 +03:00 |
|
Maksim Pechnikov
|
99c0a11c58
|
added atom feed
|
2020-01-24 22:12:23 +03:00 |
|
Maksim Pechnikov
|
055edd3d72
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-24 21:46:57 +03:00 |
|
rinpatch
|
8533b63d1f
|
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
|
2020-01-24 11:33:02 +00:00 |
|
rinpatch
|
0fceeb44b3
|
Merge branch 'emoji-reaction-sanity-check' into 'develop'
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
|
2020-01-24 11:32:25 +00:00 |
|
lain
|
347f3ed2c6
|
Emoji reactions: Change api format once more
|
2020-01-24 10:52:24 +01:00 |
|
Alexander Strizhakov
|
6a0f0ac4a2
|
fix for non existing atom
|
2020-01-24 12:22:26 +03:00 |
|
Maksim Pechnikov
|
293281fcbd
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-24 08:58:07 +03:00 |
|
|
|
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 |
|
Alexander Strizhakov
|
6cd2e851d9
|
parsing Swoosh modules
|
2020-01-23 18:21:29 +03:00 |
|
Alexander Strizhakov
|
4344c5d5b9
|
truncate config table on migrate to db task
|
2020-01-23 17:23:02 +03:00 |
|
Alexander Strizhakov
|
2bad25cf14
|
fix for migrate to db test
|
2020-01-23 15:13:27 +03:00 |
|
lain
|
34fc0ca053
|
Emoji reactions: Add sanity checks for the cache
|
2020-01-23 12:34:34 +01:00 |
|
Maksim Pechnikov
|
2cfe1b9385
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-23 11:42:10 +03:00 |
|
Maksim Pechnikov
|
5fc2fa8908
|
Merge branch 'develop' into issue/1383
|
2020-01-23 11:11:18 +03:00 |
|
Maksim Pechnikov
|
ce7c887a27
|
removed try/rescue
|
2020-01-23 11:05:08 +03:00 |
|
Haelwenn
|
dddebee047
|
Merge branch 'emoji-notifications' into 'develop'
Emoji notifications
See merge request pleroma/pleroma!2130
|
2020-01-23 02:12:03 +00:00 |
|
Mark Felder
|
e151dea276
|
Merge branch 'develop' into feature/new-registrations-digest
|
2020-01-22 15:59:24 -06:00 |
|
Mark Felder
|
ae78059ff4
|
Merge branch 'develop' into features/remote-follow-userpage-redirect
|
2020-01-22 15:05:39 -06:00 |
|
lain
|
615b72238e
|
Notifications: Add emoji reaction notifications
|
2020-01-22 20:06:12 +01:00 |
|
Ivan Tashkinov
|
cf96c40057
|
[#1505] Added Mastodon-compatible replies collection to Note federated representation.
|
2020-01-22 21:10:17 +03:00 |
|
Maksim Pechnikov
|
cf19bf3c7c
|
Merge branch 'develop' into issue/1383
|
2020-01-22 20:20:39 +03:00 |
|
Egor Kislitsyn
|
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 |
|
Egor Kislitsyn
|
b6f5b326e7
|
Fix credo warnings
|
2020-01-22 20:59:58 +04:00 |
|
Egor Kislitsyn
|
df0b8f1d08
|
Add new users digest email
|
2020-01-22 20:31:42 +04:00 |
|
rinpatch
|
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 |
|
lain
|
dd3fc50ea4
|
Emoji reactions: Change cache and reply format
|
2020-01-22 13:57:42 +01:00 |
|
Alexander Strizhakov
|
d5f8a88a37
|
support for updating env after settings deletion
|
2020-01-22 15:14:11 +03:00 |
|
Alexander Strizhakov
|
32a643a159
|
Merge branch 'develop' into admin-be
|
2020-01-22 11:22:31 +03:00 |
|
Maksim Pechnikov
|
b8d5c09f48
|
Merge branch 'develop' into issue/1383
|
2020-01-22 09:30:30 +03:00 |
|
Maksim Pechnikov
|
5ea8596448
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-21 20:56:49 +03:00 |
|
Roman Chvanikov
|
22e94bb2c7
|
Merge branch 'develop' into fix/attachments-cleanup
|
2020-01-21 19:45:13 +03:00 |
|
Haelwenn (lanodan) Monnier
|
7bfb8ed14d
|
remote_follow_controller.ex: Redirect to the user page on success
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
|
2020-01-21 16:46:16 +01:00 |
|
Alexander Strizhakov
|
f01ab6cd29
|
some refactor and tests
|
2020-01-21 18:42:00 +03:00 |
|
rinpatch
|
04c9ca5d68
|
Merge branch 'emoji-reaction-extensions' into 'develop'
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
|
2020-01-21 13:13:17 +00:00 |
|
Alexander Strizhakov
|
503d966e9f
|
Merge branch 'develop' into admin-be
|
2020-01-21 10:32:27 +03:00 |
|
Alexander Strizhakov
|
dcae5914d1
|
fix for db key
|
2020-01-21 10:14:48 +03:00 |
|
Maksim Pechnikov
|
41e2332007
|
Merge branch 'develop' into feature/tag_feed
|
2020-01-21 09:23:35 +03:00 |
|
Maksim Pechnikov
|
6e88a7e591
|
exclude blocked user posts from search results
|
2020-01-21 07:40:13 +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 |
|
Ivan Tashkinov
|
ca3b4de2c9
|
[#1521] AdminApiControllerTest: fixed create report test (OAuth).
|
2020-01-20 20:04:25 +03:00 |
|
rinpatch
|
00d08c9231
|
Merge branch 'favoritng-responses' into 'develop'
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
|
2020-01-20 16:31:43 +00:00 |
|
lain
|
4c5b5f14dc
|
StatusView: Add emoji_reactions
|
2020-01-20 16:24:20 +01:00 |
|
lain
|
6a716e3fe5
|
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
|
2020-01-20 14:42:43 +00:00 |
|
lain
|
2199d63ddc
|
StatusControllerTest: Fix typo
|
2020-01-20 15:31:14 +01:00 |
|
lain
|
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
|
2020-01-20 13:49:06 +00:00 |
|
lain
|
510776ba31
|
CommonAPI: Don't error out on double favs/repeats
|
2020-01-20 14:27:59 +01:00 |
|
lain
|
c814f22030
|
Merge branch 'fix-admin-api-scope' into 'develop'
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
|
2020-01-20 12:07:12 +00:00 |
|
lain
|
5fddf988ea
|
Pleroma API: emoji_reactions_by does not need authorization
|
2020-01-20 13:05:35 +01:00 |
|
Haelwenn (lanodan) Monnier
|
5c533e10e7
|
Bump credo to 1.1.5
|
2020-01-20 12:17:14 +01:00 |
|
rinpatch
|
dc0498ab2b
|
Check for unapplied migrations on startup
Closes #1328
|
2020-01-20 12:20:26 +03:00 |
|
Roman Chvanikov
|
0f1fc382d0
|
Add test case for attachment deletion when non-map data.url present in DB
|
2020-01-19 22:04:14 +03:00 |
|
Roman Chvanikov
|
d6a532bf0f
|
Delete attachments asynchronously
|
2020-01-19 19:45:20 +03:00 |
|
Alexander Strizhakov
|
efb8ef5abe
|
releases support
|
2020-01-18 17:14:50 +03:00 |
|
Alexander Strizhakov
|
e699861690
|
full update for some subkeys
|
2020-01-18 12:25:56 +03:00 |
|
Alexander Strizhakov
|
89e93fb33f
|
return db key on update requests
|
2020-01-17 18:15:41 +03:00 |
|
Alexander Strizhakov
|
7676ed8239
|
some clean up
|
2020-01-17 16:28:44 +03:00 |
|
Maksim Pechnikov
|
108a39c876
|
updated error messages for authentication process
|
2020-01-17 15:01:37 +03:00 |
|
Alexander Strizhakov
|
60ba2339a2
|
saving to DB only added by user settings
|
2020-01-17 11:45:44 +03:00 |
|
Alexander Strizhakov
|
29155137fd
|
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
|
2020-01-16 08:50:27 +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 |
|
Alexander Strizhakov
|
59ba5c80b9
|
little cleanup
|
2020-01-15 17:10:33 +03:00 |
|
Egor Kislitsyn
|
023b7f605b
|
Fix notification controller test
|
2020-01-15 16:51:09 +04: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 |
|
Alexander Strizhakov
|
a9c7cd341b
|
Merge branch 'develop' into admin-be
|
2020-01-14 19:56:33 +03:00 |
|
Alexander Strizhakov
|
0d331f3d23
|
compilation warnings fix
|
2020-01-14 15:49:52 +03:00 |
|
Alexander Strizhakov
|
70c7a26de8
|
Merge branch 'develop' into admin-be
|
2020-01-14 14:52:00 +03:00 |
|
Maksim Pechnikov
|
b7908844f2
|
Merge branch 'develop' into issue/1383
|
2020-01-13 12:41:07 +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 |
|
|
|
bb5862ea2f
|
Merge branch 'issue/1354' into 'develop'
[#1354] fix remote follow
See merge request pleroma/pleroma!2079
|
2020-01-12 18:20:31 +00:00 |
|
Mark Felder
|
e64059d218
|
Assign token that can write to follows
|
2020-01-12 12:14:09 -06:00 |
|
Mark Felder
|
2f5b8fbeb3
|
Merge branch 'develop' into issue/1354
|
2020-01-12 12:12:15 -06:00 |
|
|
|
ea4a462858
|
Merge branch 'issue/1487' into 'develop'
[#1487] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
|
2020-01-12 17:25:25 +00:00 |
|
|
|
0c9c62509d
|
Remove MDII uploader
|
2020-01-11 17:19:54 +00:00 |
|
Alexander Strizhakov
|
1630ecaa20
|
Merge branch 'develop' into admin-be
|
2020-01-11 12:15:42 +03:00 |
|
Alexander Strizhakov
|
d933fd3d61
|
more renamings
|
2020-01-10 19:51:32 +03:00 |
|
Alexander Strizhakov
|
7d128ca208
|
dynamic_configuration renaming
and moving it from instance settings
|
2020-01-10 19:34:19 +03:00 |
|
Ivan Tashkinov
|
39ce894a07
|
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
# Conflicts:
# lib/pleroma/user.ex
|
2020-01-10 16:18:32 +03:00 |
|
lain
|
05ca420c09
|
Merge branch 'issue/1490' into 'develop'
[#1490] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
|
2020-01-10 13:14:20 +00:00 |
|
Alexander Strizhakov
|
88a16bb9fc
|
deep merge in config update
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
c841174de8
|
flag for delete fix
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
0b02040327
|
little fixes and typos fix
|
2020-01-10 15:52:02 +03:00 |
|
Alexander
|
9c1f3bfeff
|
fixes for logger backends
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
cda2c1fc63
|
fix for subgroup tuple
added settings for swoosh adapters local
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
063ab6d911
|
logger backends fix
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
583cee4607
|
parsing proxy url setting
|
2020-01-10 15:52:01 +03:00 |
|
Alexander
|
e412d2f152
|
test fixes after rebase
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
fea734ca70
|
errors on endpoints
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
5cacb988b9
|
partially settings update
|
2020-01-10 15:52:00 +03:00 |
|
Alexander
|
0656816c77
|
tests for setttings without an explicit key
|
2020-01-10 15:51:59 +03:00 |
|
Alex S
|
2753285b77
|
config editing through database
|
2020-01-10 15:51:59 +03: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 |
|
Maksim Pechnikov
|
70410dfafd
|
fix create service actor
|
2020-01-08 16:40:49 +03: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
|
fa7d8e77e6
|
fixed Metadata.Utils.scrub_html_and_truncate
|
2020-01-03 16:28:13 +03:00 |
|
Ivan Tashkinov
|
badd0a96ea
|
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
|
2020-01-02 13:03:33 +03:00 |
|
Maksim Pechnikov
|
933dc12043
|
added code of mr#2067
|
2019-12-25 15:12:43 +03:00 |
|
