Ivan Tashkinov
|
2a95014b9d
|
[#923] OAuth consumer improvements, fixes, refactoring.
|
2019-03-27 15:39:35 +03:00 |
|
lambda
|
926bf114b7
|
Merge branch 'feature/more-user-filters' into 'develop'
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
|
2019-03-27 11:33:13 +00:00 |
|
lambda
|
a5f141d9d5
|
Merge branch 'fix-reblog-tests' into 'develop'
Fix muting reblogs tests
See merge request pleroma/pleroma!984
|
2019-03-27 11:30:07 +00:00 |
|
rinpatch
|
776bb5137f
|
Fix muting reblogs tests
|
2019-03-27 13:43:43 +03:00 |
|
rinpatch
|
6da1999fc8
|
Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'
Fix missing announces in MastoAPI home timeline
Closes #762
See merge request pleroma/pleroma!983
|
2019-03-27 09:37:08 +00:00 |
|
rinpatch
|
ce6d64bbd8
|
Fix missing announces in MastoAPI home timeline
Closes #762
|
2019-03-27 12:28:53 +03:00 |
|
lambda
|
b2e163ec57
|
Merge branch 'apps-verify-credentials' into 'develop'
MastodonAPI: Add GET /api/v1/apps/verify_credentials
See merge request pleroma/pleroma!981
|
2019-03-27 09:16:00 +00:00 |
|
Maxim Filippov
|
3cf7539bca
|
Add more user filters + move search to its own module
|
2019-03-27 03:51:59 +05:00 |
|
eugenijm
|
a4ab60ac54
|
Add vapid_key to the POST /api/v1/apps response
|
2019-03-26 23:27:37 +03:00 |
|
eugenijm
|
691d1208b5
|
Add GET /api/v1/apps/verify_credentials
|
2019-03-26 21:53:28 +03:00 |
|
lambda
|
ff3b09f6b3
|
Merge branch 'fix/ap-icon' into 'develop'
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
|
2019-03-26 16:12:50 +00:00 |
|
lambda
|
c6ab5ebe7c
|
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
|
2019-03-26 16:01:52 +00:00 |
|
lain
|
10a7a4a868
|
AP UserView: Refactor banner / avatar display code, add test.
|
2019-03-26 16:59:28 +01:00 |
|
Ivan Tashkinov
|
47b49ab1a1
|
Test for MastoAPI /api/v1/instance response structure (formatting fix).
|
2019-03-26 18:18:36 +03:00 |
|
lambda
|
9e3899bf36
|
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
|
2019-03-26 15:13:55 +00:00 |
|
Ivan Tashkinov
|
caf0e9cf33
|
Test for MastoAPI /api/v1/instance response structure.
|
2019-03-26 18:13:24 +03:00 |
|
lambda
|
21ff78cd40
|
Merge branch 'replies-count' into 'develop'
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
|
2019-03-26 14:49:09 +00:00 |
|
lambda
|
3f44433ebd
|
Merge branch 'refactor/remove-activity-representer' into 'develop'
Remove ActivityRepresenter
See merge request pleroma/pleroma!980
|
2019-03-26 14:46:01 +00:00 |
|
rinpatch
|
aacdcac1be
|
Credo is upset about me not remembering the alphabet
|
2019-03-26 17:35:45 +03:00 |
|
rinpatch
|
087662d4fb
|
Fix formatting
|
2019-03-26 17:18:18 +03:00 |
|
rinpatch
|
406d19331f
|
Remove ActivityRepresenter
|
2019-03-26 17:16:21 +03:00 |
|
Ivan Tashkinov
|
eef1042b16
|
Mastodon 2.7.2 instance attributes (registrations, languages).
|
2019-03-26 16:27:17 +03:00 |
|
eugenijm
|
568e348588
|
Increment replies_count on replies (MastoAPI)
|
2019-03-26 15:27:04 +03:00 |
|
Ivan Tashkinov
|
b0759f821b
|
Comments split.
|
2019-03-26 15:24:29 +03:00 |
|
Ivan Tashkinov
|
263ca3dea2
|
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true.
|
2019-03-26 15:09:06 +03:00 |
|
Mark Felder
|
c410296120
|
Try sending an empty map
|
2019-03-25 19:00:35 -05:00 |
|
Mark Felder
|
6f090f981b
|
Attempt to fix incorrect federation of default instance avatars
|
2019-03-25 18:47:04 -05:00 |
|
rinpatch
|
15aa94f40f
|
Merge branch 'fix/notification-id-index' into 'develop'
Add an `id desc nulls last` index to notifications
See merge request pleroma/pleroma!975
|
2019-03-25 19:07:15 +00:00 |
|
rinpatch
|
9725c93cea
|
Add an id index to notifications
|
2019-03-25 21:59:52 +03:00 |
|
lain
|
037fefe218
|
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
|
2019-03-25 13:37:32 +01:00 |
|
rinpatch
|
b028b0f97d
|
Merge branch 'bugfix/missing-announces' into 'develop'
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
|
2019-03-25 09:24:08 +00:00 |
|
William Pitcock
|
26b0c802c3
|
fix up missing announcements with preloads
|
2019-03-25 07:38:09 +00:00 |
|
kaniini
|
bc14c98de1
|
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969
|
2019-03-25 02:25:59 +00:00 |
|
kaniini
|
63ffa4842c
|
Merge branch 'fix/mastoapi-liked' into 'develop'
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
|
2019-03-25 02:24:27 +00:00 |
|
rinpatch
|
a7f58b3c13
|
Serve non-public activities in /api/v1/favourites
Fixes #648
|
2019-03-25 02:15:45 +03:00 |
|
Austin Lanari
|
6c96d68f77
|
add overriding truncated_namespace condition for truncating paths for digital ocean
|
2019-03-24 11:32:09 -07:00 |
|
rinpatch
|
750de7d842
|
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
|
2019-03-24 15:02:13 +00:00 |
|
Haelwenn (lanodan) Monnier
|
eab9425cc4
|
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
|
2019-03-24 15:47:50 +01:00 |
|
rinpatch
|
a32bcab04b
|
Merge branch 'fix/eldap-warnings' into 'develop'
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
|
2019-03-24 11:17:40 +00:00 |
|
kaniini
|
9b6b2395e4
|
Merge branch 'feature/object-normalize-preload' into 'develop'
preloaded object normalization
See merge request pleroma/pleroma!967
|
2019-03-24 02:31:56 +00:00 |
|
rinpatch
|
a5326bb783
|
Remove useless echo
|
2019-03-23 10:19:13 +03:00 |
|
William Pitcock
|
4a3dd86a55
|
tests: fix up activity collision test
|
2019-03-23 03:17:51 +00:00 |
|
William Pitcock
|
4aa699271c
|
activity: use left join instead of inner join when fetching activities that may or may not have a child object
|
2019-03-23 03:17:50 +00:00 |
|
William Pitcock
|
332dc1371b
|
user: use preloads when deleting accounts
|
2019-03-23 03:06:00 +00:00 |
|
William Pitcock
|
debf7f016d
|
ostatus: use preload objects with Object.normalize() when opportunistic
|
2019-03-23 03:05:57 +00:00 |
|
William Pitcock
|
3c2350cbee
|
object: downgrade normalize warning to debug severity
|
2019-03-23 03:05:15 +00:00 |
|
William Pitcock
|
8c70156157
|
activitypub: object view: use preloaded object when possible
|
2019-03-23 03:05:14 +00:00 |
|
William Pitcock
|
f9d5c13b21
|
activity: add get_by_ap_id_with_object()
|
2019-03-23 03:05:13 +00:00 |
|
William Pitcock
|
ce47eb8b29
|
activitypub: when fetching objects, use the preloaded object from the synthesized activity
|
2019-03-23 03:05:10 +00:00 |
|
William Pitcock
|
aabcecb269
|
notification: formatting
|
2019-03-23 02:30:53 +00:00 |
|