Ivan Tashkinov
|
8f88a90ca3
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/config.ex
|
2021-02-23 13:58:35 +03:00 |
|
Ivan Tashkinov
|
77f3da0358
|
[#3213] Misc. tweaks: proper upsert in Hashtag, better feature toggle management.
|
2021-02-23 13:52:28 +03:00 |
|
rinpatch
|
484ba5d062
|
Merge branch '2534-pleroma-endpoint-earlier-init' into 'develop'
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer)
Closes #2534
See merge request pleroma/pleroma!3338
|
2021-02-23 10:01:09 +00:00 |
|
Ivan Tashkinov
|
a98c4423f3
|
Apply i1t's suggestion(s) to 1 file(s)
|
2021-02-22 20:41:57 +00:00 |
|
Ivan Tashkinov
|
6531eddf36
|
[#3213] hashtags: altered name type to text. hashtags_objects: removed unused index. HashtagsTableMigrator: records_per_second calculation fix. ActivityPub: hashtags-related options normalization.
|
2021-02-22 23:26:07 +03:00 |
|
Ivan Tashkinov
|
0ef783baa1
|
[#2534] Earlier init of Pleroma.Web.Endpoint (must be started prior to Pleroma.Web.Streamer).
|
2021-02-22 23:09:41 +03:00 |
|
|
|
0edb5c805b
|
Merge branch 'revert/changelog' into 'develop'
Revert changelog entry that leaked from another branch.
See merge request pleroma/pleroma!3334
|
2021-02-20 23:18:43 +00:00 |
|
|
|
e31274f51d
|
Revert changelog entry that leaked from another branch.
|
2021-02-20 17:07:12 -06:00 |
|
Haelwenn
|
f6d43cec42
|
Merge branch 'fix/filters' into 'develop'
Minor fixes to upload filters
See merge request pleroma/pleroma!3332
|
2021-02-20 21:18:04 +00:00 |
|
|
|
1cb417bce6
|
Document HeifToJpeg and its requirement of libheif's heic-convert tool
|
2021-02-20 14:32:14 -06:00 |
|
|
|
73aef0503c
|
Exiftool also cannot strip from heic files.
|
2021-02-20 14:29:35 -06:00 |
|
|
|
369581db6d
|
Show a proper error. A failure doesn't always mean the command isn't available, and we check for it on startup
|
2021-02-20 14:27:42 -06:00 |
|
Ivan Tashkinov
|
998437d4a4
|
[#3213] Experimental / debug feature: database: [improved_hashtag_timeline: :preselect_hashtag_ids].
|
2021-02-18 21:03:06 +03:00 |
|
Ivan Tashkinov
|
b981edad8a
|
[#3213] HashtagsTableMigrator: fault rate allowance to enable the feature (defaults to 1%), counting of affected objects, misc. tweaks.
|
2021-02-18 20:40:10 +03:00 |
|
rinpatch
|
8829a408ec
|
Merge branch 'fix/chats-no-unread-in-openapi' into 'develop'
ChatMessage schema: Add `unread` property
See merge request pleroma/pleroma!3323
|
2021-02-18 09:54:59 +00:00 |
|
Haelwenn
|
c0437d1244
|
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
Remove `:auth, :enforce_oauth_admin_scope_usage`
See merge request pleroma/pleroma!3327
|
2021-02-17 22:31:11 +00:00 |
|
rinpatch
|
2ab9499258
|
OAuthScopesPlug: remove transform_scopes in favor of explicit admin scope definitions
Transforming scopes is no longer necessary since we are dropping
support for accessing admin api without `admin:` prefix in scopes.
|
2021-02-17 21:37:23 +03:00 |
|
rinpatch
|
95a22c1cc2
|
OpenAPI: Add admin: scope prefix to admin operations
Also splits "Emoji packs" to two categories: "Emoji pack administration"
and "Emoji packs"
|
2021-02-17 21:10:28 +03:00 |
|
rinpatch
|
6d66fadea7
|
Remove :auth, :enforce_oauth_admin_scope_usage
`admin` scope has been required by default for more than a year now
and all apps that use the API seems to request a proper scope by now.
|
2021-02-17 20:47:38 +03:00 |
|
rinpatch
|
679a2e799e
|
Merge branch 'test-docker-images' into 'develop'
Generate custom docker images for testing
See merge request pleroma/pleroma!3326
|
2021-02-17 17:09:24 +00:00 |
|
|
|
dc4baee6dd
|
Do not want these interfering with develop builds
|
2021-02-17 10:24:37 -06:00 |
|
|
|
068740aa16
|
Make it possible to generate custom docker images by prefixing the branch name with "build-docker"
|
2021-02-17 10:08:12 -06:00 |
|
Haelwenn
|
046bcf1bf6
|
Merge branch 'chore/documentation-relicensing' into 'develop'
Relicense documentation under CC-BY-4.0
See merge request pleroma/pleroma!3322
|
2021-02-17 15:57:11 +00:00 |
|
Haelwenn
|
e7b1f0f5f4
|
Merge branch 'feat/chat-list-pagination' into 'develop'
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Closes #2140
See merge request pleroma/pleroma!3325
|
2021-02-17 15:36:59 +00:00 |
|
rinpatch
|
158f9f18ee
|
Merge branch 'remove-conversation-api' into 'develop'
Add API endpoint to remove a conversation
Closes #2488
See merge request pleroma/pleroma!3321
|
2021-02-17 15:14:27 +00:00 |
|
rinpatch
|
264cb2c77f
|
Merge branch '2510-oauth-app-tokens-further-support' into 'develop'
[#2510] Improved support for app-bound OAuth tokens
Closes #2510
See merge request pleroma/pleroma!3316
|
2021-02-17 13:08:51 +00:00 |
|
rinpatch
|
d7ad288c84
|
Chats: Introduce /api/v2/pleroma/chats which implements pagination
Also removes incorrect claim that /api/v1/pleroma/chats supports
pagination and deprecates it.
Closes #2140
|
2021-02-17 16:03:24 +03:00 |
|
rinpatch
|
d5270a1c41
|
Merge branch 'update-default-avatar' into 'develop'
Update the default avatar to look nicer
See merge request pleroma/pleroma!3320
|
2021-02-17 09:48:42 +00:00 |
|
Ivan Tashkinov
|
854ea1aefb
|
[#3213] Fixed HashtagsTableMigrator.count/1.
|
2021-02-17 09:23:35 +03:00 |
|
Ivan Tashkinov
|
111bfdd3a0
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
|
2021-02-16 23:23:49 +03:00 |
|
Ivan Tashkinov
|
938823c730
|
[#3213] HashtagsTableMigrator state management refactoring & improvements (proper stats serialization etc.).
|
2021-02-16 23:14:15 +03:00 |
|
rinpatch
|
98ab2b82a6
|
ChatMessage schema: Add unread property
It is present in the code, but was not documented.
|
2021-02-16 22:41:06 +03:00 |
|
rinpatch
|
13e324abe9
|
Merge branch '2053-notifications-actor-is-active-refactoring' into 'develop'
[#2053] `Notification.for_user_query/2` timeout fix
Closes #2053
See merge request pleroma/pleroma!3318
|
2021-02-16 10:11:41 +00:00 |
|
rinpatch
|
f1f215cb38
|
Relicense documentation under CC-BY-4.0
All contributors whose contributions were still being used
at the moment of relicensing have agreed to it.
See https://git.pleroma.social/pleroma/pleroma/-/issues/2146 .
|
2021-02-16 13:10:58 +03:00 |
|
Ivan Tashkinov
|
1dac7d1462
|
[#3213] Fixed hashtags.name lookup (must use citext type to do index scan). Fixed embedded hashtags lookup (lowercasing), adjusted tests.
|
2021-02-15 21:13:14 +03:00 |
|
Egor Kislitsyn
|
cf6d3db58f
|
Add API endpoint to remove a conversation
|
2021-02-15 21:48:13 +04:00 |
|
Shpuld Shpuldson
|
0c73935de1
|
update changelog to mention change of avatar
|
2021-02-15 15:52:36 +02:00 |
|
Shpuld Shpuldson
|
956bbc1ec7
|
replace avi.png
|
2021-02-15 15:44:27 +02:00 |
|
rinpatch
|
8910303f71
|
Merge branch 'chore/mailmap' into 'develop'
Add myself to .mailmap
See merge request pleroma/pleroma!3319
|
2021-02-15 10:30:29 +00:00 |
|
rinpatch
|
e2927d714e
|
Add myself to .mailmap
I changed my email to rin@patch.cx
|
2021-02-15 13:19:44 +03:00 |
|
Ivan Tashkinov
|
284504f689
|
[#2053] Changed Notification/for_user_query/2 to use join to filter out inactive actors instead of subselect of _all_ inactive AP ids from users.
|
2021-02-15 09:08:04 +03:00 |
|
Ivan Tashkinov
|
349b8b0f4f
|
[#3213] rescue around potentially-raising Repo.insert_all/_ calls. Misc. improvements (docs etc.).
|
2021-02-13 22:01:11 +03:00 |
|
rinpatch
|
db716f860a
|
Merge branch 'not-used-mock' into 'develop'
Not used mock
See merge request pleroma/pleroma!3313
|
2021-02-12 08:52:04 +00:00 |
|
rinpatch
|
76414ad277
|
Merge branch 'bugfix/answer-outbox' into 'develop'
Add test for Answer presence into an authenticated /outbox
See merge request pleroma/pleroma!3269
|
2021-02-12 08:48:51 +00:00 |
|
Ivan Tashkinov
|
5992382cf8
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
# Conflicts:
# CHANGELOG.md
# lib/mix/tasks/pleroma/database.ex
# lib/pleroma/web/templates/feed/feed/_activity.rss.eex
|
2021-02-11 19:31:57 +03:00 |
|
Ivan Tashkinov
|
a996ab46a5
|
[#3213] Reorganized hashtags cleanup. Transaction-wrapped Hashtag.get_or_create_by_names/1. Misc. improvements.
|
2021-02-11 19:30:21 +03:00 |
|
Ivan Tashkinov
|
df89b5019b
|
[#2510] Improved support for app-bound OAuth tokens. Auth-related refactoring.
|
2021-02-11 15:02:50 +03:00 |
|
Alexander Strizhakov
|
b5d001fc8c
|
not used mock
|
2021-02-10 18:44:49 +03:00 |
|
Haelwenn
|
2cf753c502
|
Merge branch 'fix/no-version-api-pleroma-social' into 'develop'
Fix no version number on api.pleroma.social
See merge request pleroma/pleroma!3310
|
2021-02-10 00:52:59 +00:00 |
|
rinpatch
|
a853218701
|
Merge branch 'features/ap_id-c2s-authentication' into 'develop'
activity_pub_controller: Add authentication to object & activity endpoints
See merge request pleroma/pleroma!3295
|
2021-02-09 19:29:43 +00:00 |
|
