|
|
978627c5e1
|
Vi and emacs temp files
|
2021-02-24 12:11:50 -06:00 |
|
Haelwenn
|
870f9cb80c
|
Merge branch 'docfix/chat-token' into 'develop'
Update terminology in differences_in_mastoapi_responses.md
See merge request pleroma/pleroma!3344
|
2021-02-24 17:26:26 +00:00 |
|
zonk
|
f38056d2a1
|
Update terminology in differences_in_mastoapi_responses.md
|
2021-02-24 18:16:10 +01:00 |
|
Ivan Tashkinov
|
40d4362261
|
[#3213] mix pleroma.database rollback tweaks.
|
2021-02-23 18:11:25 +03:00 |
|
|
|
d113ed94e7
|
Merge branch 'fix/whalebird-url' into 'develop'
Fix URL of Whalebird in docs
See merge request pleroma/pleroma!3339
|
2021-02-23 14:17:06 +00:00 |
|
lain
|
022eb2a302
|
Merge branch 'chore/no-activitypub-sleeps' into 'develop'
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
See merge request pleroma/pleroma!3330
|
2021-02-23 13:53:59 +00:00 |
|
AkiraFukushima
|
6ff4ef12fd
|
Fix URL of Whalebird in docs
|
2021-02-23 21:31:06 +09:00 |
|
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 |
|
eugenijm
|
c140cc7bf3
|
Update the documentation to use make it use /api/v1/pleroma instead of /api/pleroma
|
2021-02-22 04:33:35 +03:00 |
|
Haelwenn (lanodan) Monnier
|
7fc9cd0974
|
Video: Handle peertube videos only stashing attachments in x-mpegURL
Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2535
|
2021-02-21 23:41:28 +01:00 |
|
eugenijm
|
c1d63bbd9a
|
Reroute /api/pleroma to /api/v1/pleroma
|
2021-02-21 13:26:23 +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 |
|
|
|
db7d6f337f
|
Avoid unnecessary 500ms sleeps from CommonAPI.follow when the target user is remote
|
2021-02-19 18:37:37 -06:00 |
|
|
|
26b620d676
|
Permit :disclose_client in changesets
|
2021-02-18 17:50:46 -06:00 |
|
|
|
63739c5a58
|
Tests to validate client disclosure obeys user setting
|
2021-02-18 17:23:17 -06:00 |
|
|
|
83301fe61a
|
Add field to user schema for controlling disclosure of client details
|
2021-02-18 16:43:41 -06:00 |
|
|
|
d5ef02c7a7
|
Mastodon makes this field null when posting with MastoFE or if you choose to not disclose it, so it's safe to be null by default
|
2021-02-18 16:35:03 -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 |
|
Alexander Strizhakov
|
1e6c27181e
|
expires_in in scheduled status params
|
2021-02-18 14:59:22 +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 |
|
Haelwenn (lanodan) Monnier
|
ff72ce31ca
|
Enhance reports in Pleroma API: index, show
|
2021-02-17 18:46:53 +01: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 |
|
