Mark Felder
|
c746087f57
|
Also remove Repo functions in the tests
|
2019-04-05 11:59:56 -05:00 |
|
Roger Braun
|
7895ee37fa
|
Add user following / unfollowing to the admin api.
|
2019-04-05 11:27:07 -05:00 |
|
Sadposter
|
a270e7a191
|
Mix format everything
|
2019-04-05 17:07:58 +01:00 |
|
Sadposter
|
f6e131eeb9
|
Don't use twitterAPI for subscription tests
|
2019-04-05 17:02:09 +01:00 |
|
Sadposter
|
9ca91cbb87
|
Change relationship direction of subscriptions
|
2019-04-05 17:02:07 +01:00 |
|
Sadposter
|
73afd13c21
|
Add subscription key to one test I forgot about
|
2019-04-05 15:37:36 +01:00 |
|
Sadposter
|
06cd547fc6
|
Format subscriptions related stuff
|
2019-04-05 15:30:34 +01:00 |
|
Sadposter
|
d56866c824
|
Add subscribed status to user view
Added in pleroma extensions, but can be moved whenever
|
2019-04-05 15:30:31 +01:00 |
|
Sadposter
|
75c4ceb4a2
|
Add tests for subscriptions
|
2019-04-05 15:30:29 +01:00 |
|
Egor Kislitsyn
|
f1712cd2f1
|
Use PleromaJobQueue in Pleroma.Web.Push
|
2019-04-05 19:38:44 +07:00 |
|
Ivan Tashkinov
|
47a236f753
|
[#923] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
|
2019-04-05 15:12:02 +03:00 |
|
Ivan Tashkinov
|
3e7f2bfc2f
|
[#923] OAuthController#callback adjustments (with tests).
|
2019-04-05 09:19:17 +03:00 |
|
Ivan Tashkinov
|
45765918c3
|
[#923] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
# Conflicts:
# mix.exs
|
2019-04-04 23:43:08 +03:00 |
|
Ivan Tashkinov
|
f7cd9131d4
|
[#923] OAuth consumer controller tests. Misc. improvements.
|
2019-04-04 22:41:03 +03:00 |
|
Egor Kislitsyn
|
cfa6e7289f
|
Improve Transmogrifier.upgrade_user_from_ap_id/2
|
2019-04-04 16:10:43 +07:00 |
|
Haelwenn
|
0cb94cfa94
|
Merge branch 'fix-slow-relationships' into 'develop'
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
|
2019-04-02 18:43:48 +00:00 |
|
lambda
|
256b492a58
|
Merge branch 'bugfix/wrong-date-format' into 'develop'
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
|
2019-04-02 14:18:23 +00:00 |
|
lambda
|
a79ce94dd4
|
Merge branch 'feature/fake-statuses' into 'develop'
Add fake status submit
See merge request pleroma/pleroma!995
|
2019-04-02 14:17:43 +00:00 |
|
lain
|
39bcf93007
|
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
|
2019-04-02 16:10:38 +02:00 |
|
lain
|
fd07745d1b
|
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
|
2019-04-02 16:08:55 +02:00 |
|
Alex S
|
fa8483cb80
|
Merging develop into feature/770-add-emoji-tags
Conflict test/web/twitter_api/util_controller_test.exs
|
2019-04-02 20:39:52 +07:00 |
|
lambda
|
180b87257c
|
Merge branch 'bugfix/share-mastodon' into 'develop'
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
|
2019-04-02 12:47:40 +00:00 |
|
lambda
|
ce9284b36f
|
Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
|
2019-04-02 12:45:29 +00:00 |
|
lambda
|
b95cf3d490
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
|
2019-04-02 12:43:28 +00:00 |
|
Alex S
|
9e0567ec52
|
Merge develop into feature/770-add-emoji-tags
|
2019-04-02 19:16:29 +07:00 |
|
rinpatch
|
fdb4357e9b
|
Rename fake param to preview and make the tests check that the object was not inserted to the db
|
2019-04-02 14:31:18 +03:00 |
|
Egor Kislitsyn
|
20c619f85f
|
replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests
|
2019-04-02 17:58:32 +07:00 |
|
lambda
|
091baf9316
|
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
|
2019-04-02 10:57:38 +00:00 |
|
lambda
|
26d509cc86
|
Merge branch 'get_by_id' into 'develop'
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
|
2019-04-02 10:52:29 +00:00 |
|
cascode
|
95c92c49c9
|
Fix account lookup for nicknames beginning with numbers
|
2019-04-02 10:51:33 +00:00 |
|
Egor Kislitsyn
|
9a59c26619
|
replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)
|
2019-04-02 17:47:52 +07:00 |
|
Ivan Tashkinov
|
15ce710460
|
Added "GET /oauth/authorize" tests.
|
2019-04-02 13:43:33 +03:00 |
|
Egor Kislitsyn
|
11c2d6bdc4
|
change Repo.get(Activity, id) => Activity.get_by_id(id) in tests
|
2019-04-02 17:08:03 +07:00 |
|
Egor Kislitsyn
|
1b3d921921
|
change Repo.get(User, id) => User.get_by_id(id)
|
2019-04-02 17:01:26 +07:00 |
|
Sergey Suprunenko
|
3db9235150
|
Ignore dates in wrong formats
|
2019-04-02 11:32:36 +02:00 |
|
Egor Kislitsyn
|
a14742f495
|
add user delete_activities mix task
|
2019-04-02 16:30:11 +07:00 |
|
Alex S
|
484162c187
|
test fix
|
2019-04-02 16:26:40 +07:00 |
|
Alex S
|
9b2188da7c
|
refactoring of emoji tags config to use groups
|
2019-04-02 15:44:56 +07:00 |
|
Ivan Tashkinov
|
aac48d0cc6
|
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
|
2019-04-02 09:19:10 +03:00 |
|
Sachin Joshi
|
6386c1c9c1
|
fetch url for OStatus to know if it is a/c or status
|
2019-04-02 10:26:09 +05:45 |
|
Sergey Suprunenko
|
b6f9f7b8aa
|
Handle dates in the Unix timestamp format (Fixes #763)
|
2019-04-01 22:45:24 +02:00 |
|
Sachin Joshi
|
1d01e8e656
|
[OStatus] adds status to pleroma instance if the url given is a status
|
2019-04-01 22:26:58 +05:45 |
|
Alex S
|
17d3d05a71
|
code style
little fix
|
2019-04-01 17:54:30 +07:00 |
|
Alex S
|
3601f03147
|
Adding tag to emoji ets table
changes in apis
|
2019-04-01 17:17:57 +07:00 |
|
lain
|
e3bf6655ba
|
Add replying.
|
2019-03-31 21:24:29 +02:00 |
|
lain
|
10fdc080a0
|
BBS: Tests and formatting.
|
2019-03-31 20:35:10 +02:00 |
|
rinpatch
|
1bb4d5d65b
|
Implement fake status submit
|
2019-03-29 21:59:04 +03:00 |
|
Egor
|
9a39d1d846
|
Replace Pleroma.Jobs with pleroma_job_queue
|
2019-03-29 12:46:05 +00:00 |
|
Haelwenn (lanodan) Monnier
|
6b407872b4
|
mastodon_api_controller.ex: Use min_id in link header instead of since_id
|
2019-03-28 17:23:21 +01:00 |
|
eugenijm
|
cd90695a34
|
Add PUT /api/pleroma/notification_settings endpoint
|
2019-03-28 18:55:16 +03:00 |
|
eugenijm
|
55d086b520
|
Notification controls
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
|
2019-03-28 07:52:07 +03:00 |
|
eugenijm
|
10c81fc902
|
Add user show endpoint for Pleroma admin API
|
2019-03-27 21:44:15 +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 |
|
rinpatch
|
776bb5137f
|
Fix muting reblogs tests
|
2019-03-27 13:43:43 +03: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 |
|
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 |
|
eugenijm
|
568e348588
|
Increment replies_count on replies (MastoAPI)
|
2019-03-26 15:27:04 +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 |
|
William Pitcock
|
26b0c802c3
|
fix up missing announcements with preloads
|
2019-03-25 07:38:09 +00: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 |
|
William Pitcock
|
4a3dd86a55
|
tests: fix up activity collision test
|
2019-03-23 03:17:51 +00:00 |
|
William Pitcock
|
aaec91b9a1
|
relay test: don't do preloading (since follow objects are activities, it's a mess)
|
2019-03-23 01:23:02 +00:00 |
|
William Pitcock
|
73efe95368
|
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
|
2019-03-23 01:09:12 +00:00 |
|
lambda
|
fee360e581
|
Merge branch 'safe-mentions' into 'develop'
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
|
2019-03-22 11:03:56 +00:00 |
|
lain
|
e2afce34b6
|
NodeInfo: Return safe_dm_mentions feature flag.
|
2019-03-22 11:57:20 +01:00 |
|
rinpatch
|
3229c7a1d6
|
Ensure fts is prefered over trigram and use union_all instead of union in user search query
|
2019-03-22 08:39:49 +03:00 |
|
kaniini
|
1c3d3d0c2b
|
Merge branch 'safe-mentions' into 'develop'
Add safe dm mode option.
See merge request pleroma/pleroma!958
|
2019-03-22 00:50:24 +00:00 |
|
William Pitcock
|
a223e65f35
|
tests: fixup
|
2019-03-21 23:56:57 +00:00 |
|
William Pitcock
|
3cc2554fa3
|
mastodon api: add conversation_id extension (ref #674)
|
2019-03-21 23:25:41 +00:00 |
|
William Pitcock
|
fea3696799
|
common api: move context functions from twitterapi
|
2019-03-21 23:24:04 +00:00 |
|
lain
|
bf27190f7f
|
UtilController: Return state of safe dm mentions.
|
2019-03-21 16:20:58 +01:00 |
|
link0ff
|
f858df819b
|
Skip tests in LDAPAuthorizationTest if :eldap module is unavailable
|
2019-03-21 12:31:16 +02:00 |
|
kaniini
|
b68fb3dc17
|
Merge branch 'imageoptim' into 'develop'
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
|
2019-03-21 00:59:24 +00:00 |
|
lain
|
8468f3f6d4
|
Add safe dm mode option.
|
2019-03-20 21:09:36 +01:00 |
|
Maxim Filippov
|
ed8a2935f5
|
Use ILIKE to search users
|
2019-03-20 01:37:40 +03:00 |
|
William Pitcock
|
455bb526f6
|
test: add test for list sanitization
|
2019-03-19 17:53:40 +00:00 |
|
William Pitcock
|
fd0aa58ee0
|
tests: add test for as:Public issues
|
2019-03-19 17:49:29 +00:00 |
|
optikfluffel
|
00c5d7248f
|
fix UploadTest to use new image_tmp.jpg
|
2019-03-19 10:10:48 +01:00 |
|
optikfluffel
|
a907522690
|
used imageOptim to reduce size of image files
|
2019-03-19 10:10:48 +01:00 |
|
kaniini
|
43bd7f47db
|
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
Order users by nickname
See merge request pleroma/pleroma!945
|
2019-03-18 23:08:31 +00:00 |
|
eugenijm
|
1588688a11
|
Added support for exclude_types, limit, and min_id in Mastodon
notifications.
Unify Mastodon-compatible pagination logic.
|
2019-03-18 11:27:27 +03:00 |
|
Haelwenn (lanodan) Monnier
|
42d034505a
|
Add test for conversation API beforehand
|
2019-03-17 16:51:26 +01:00 |
|
Fong-Wan Chau
|
4ed2618f6c
|
Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).
|
2019-03-17 11:03:19 -04:00 |
|
Maxim Filippov
|
76a13bc5a2
|
Fix test
|
2019-03-17 13:29:28 +03:00 |
|
Maxim Filippov
|
93291c3d7a
|
Order users by nickname
|
2019-03-17 13:23:31 +03:00 |
|
kaniini
|
6d6f48d079
|
Merge branch 'feature/federated-flags' into 'develop'
Federated reports
See merge request pleroma/pleroma!935
|
2019-03-16 19:27:56 +00:00 |
|
lambda
|
28df397454
|
Merge branch 'feature/oauth-me' into 'develop'
oauth: add me property to token responses
See merge request pleroma/pleroma!942
|
2019-03-16 08:44:02 +00:00 |
|
kaniini
|
c69dc2acf1
|
Merge branch 'feature/reblog-muting' into 'develop'
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
|
2019-03-16 04:31:31 +00:00 |
|
William Pitcock
|
40134598a8
|
test: fix defective ldap setup/teardown
|
2019-03-16 04:05:19 +00:00 |
|
William Pitcock
|
e0edc706cf
|
oauth: add me property to token responses
|
2019-03-16 01:12:50 +00:00 |
|
eugenijm
|
43fb03be5a
|
Allow to mark a single notification as read
|
2019-03-15 23:56:14 +03:00 |
|
kaniini
|
8b352af4dd
|
Merge branch 'feature/openldap-support' into 'develop'
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
|
2019-03-15 19:57:09 +00:00 |
|
link0ff
|
a070dd4a83
|
Add tests for LDAP authorization
|
2019-03-15 16:28:46 +02:00 |
|
|
|
ebfc10c834
|
Fix streamer test
|
2019-03-15 14:20:08 +01:00 |
|
|
|
da53c079db
|
Refactor to store user ap_id, add tests
|
2019-03-15 14:20:08 +01:00 |
|
|
|
13c298d354
|
Fix tests to assume reblogs shown by default
|
2019-03-15 14:18:21 +01:00 |
|
Haelwenn
|
41fc67aa49
|
Merge branch 'mastoapi/mime_type' into 'develop'
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
|
2019-03-15 09:48:50 +00:00 |
|
rinpatch
|
d7a34b604b
|
Extend MastoAPI to provide attachment mimetypes
|
2019-03-15 11:58:12 +03:00 |
|
kaniini
|
0f42ea87d6
|
Merge branch 'notifications-is-seen' into 'develop'
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
|
2019-03-15 02:59:17 +00:00 |
|
eugenijm
|
100413bf2c
|
Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
|
2019-03-15 01:35:48 +03:00 |
|
rinpatch
|
cbdd11c381
|
Merge develop to bump elixir version in the CI so I don't get failing formatting
|
2019-03-14 22:33:20 +03:00 |
|
rinpatch
|
355f285a86
|
Fix uploaded media plug test
|
2019-03-14 22:26:54 +03:00 |
|
William Pitcock
|
414d4b8088
|
test: add a test for accepting inbound Flag activities
|
2019-03-14 19:04:33 +00:00 |
|
rinpatch
|
e2fe796c63
|
Add some tests
|
2019-03-14 22:02:48 +03:00 |
|
Maxim Filippov
|
257d8e78e5
|
Add tags
|
2019-03-14 01:52:24 +03:00 |
|
Maxim Filippov
|
4872914d32
|
Add test when local is false
|
2019-03-13 17:56:15 +03:00 |
|
Maxim Filippov
|
d5edff6ce6
|
Fix test
|
2019-03-13 16:14:31 +03:00 |
|
Maxim Filippov
|
490d9cf7b1
|
Add "local" to users admin API
|
2019-03-13 16:04:44 +03:00 |
|
Haelwenn (lanodan) Monnier
|
23960309a0
|
[Credo] Change quoted string with 3+ quotes to sigils
|
2019-03-13 04:26:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
c42d34b2ec
|
[Credo] fix Credo.Check.Readability.MaxLineLength
|
2019-03-13 04:26:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
fb82f6fc7c
|
[Credo] Remove parentesis on argument-less functions
|
2019-03-13 04:26:56 +01:00 |
|
Haelwenn (lanodan) Monnier
|
a3a9cec483
|
[Credo] fix Credo.Check.Readability.AliasOrder
|
2019-03-13 04:26:54 +01:00 |
|
Haelwenn (lanodan) Monnier
|
6c8743d0c0
|
[Credo] Fix the warnings
|
2019-03-13 04:17:30 +01:00 |
|
Maxim Filippov
|
25eb6cf1cb
|
Add "roles" to users admin API
|
2019-03-12 22:15:28 +03:00 |
|
kaniini
|
c231ed610a
|
Merge branch 'masto-api-followers-following' into 'develop'
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
|
2019-03-12 16:27:47 +00:00 |
|
eugenijm
|
984b5f8adf
|
MastoAPI followers/following endpoints
|
2019-03-12 16:01:24 +03:00 |
|
rinpatch
|
faf238c1b0
|
Fix upload tests
|
2019-03-12 15:33:15 +03:00 |
|
lain
|
3474066f6d
|
MastoAPI Accounts: Add fetching by nickname.
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
|
2019-03-11 15:18:32 +01:00 |
|
lambda
|
2c8deecdd2
|
Merge branch 'add-local-field-to-status' into 'develop'
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
|
2019-03-11 13:26:12 +00:00 |
|
lain
|
4811eefa6e
|
MastoAPI StatusView: Add locality indicator.
|
2019-03-11 13:48:27 +01:00 |
|
eugenijm
|
6038c8a753
|
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
|
2019-03-11 09:02:03 +03:00 |
|
kaniini
|
735f40047a
|
Merge branch 'delete-status' into 'develop'
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
|
2019-03-08 22:47:41 +00:00 |
|
kaniini
|
130fc9eae6
|
Merge branch 'fetch-posts-on-first-federation' into 'develop'
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
|
2019-03-08 22:33:31 +00:00 |
|
eugenijm
|
2827dfea50
|
Allow an admin to delete a user status
|
2019-03-08 20:21:56 +03:00 |
|
Ekaterina Vaartis
|
b775fded10
|
Add tests for fetch_ordered_collection
|
2019-03-08 16:28:40 +03:00 |
|
William Pitcock
|
3c5926fe91
|
tests: add regression test
|
2019-03-07 12:20:04 +00:00 |
|
rinpatch
|
992145e64c
|
Merge branch 'bugfix/delete-activity-audience' into 'develop'
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
|
2019-03-07 11:31:08 +00:00 |
|
eugenijm
|
7342b5a45f
|
Preserve parameters in link headers (Mastodon API)
|
2019-03-07 09:12:16 +03:00 |
|
kaniini
|
0fe715f3ba
|
Merge branch 'chore/merge-search-into-list-users' into 'develop'
Merge search endpoint into /users
See merge request pleroma/pleroma!898
|
2019-03-06 22:27:42 +00:00 |
|
kaniini
|
07f8c79a69
|
Merge branch 'bugfix/rel-me_list' into 'develop'
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
|
2019-03-06 13:20:51 +00:00 |
|
Maksim
|
bc7570c282
|
[#647] tests for web push
|
2019-03-06 13:20:12 +00:00 |
|
Haelwenn
|
96901b6554
|
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
|
2019-03-06 01:45:17 +00:00 |
|
|
|
28d5b40d0a
|
Add handling of objects not in database
|
2019-03-05 23:15:22 +01:00 |
|
rinpatch
|
40ff8f5964
|
Add tests for reserved char escaping in upload
|
2019-03-05 19:28:58 +03:00 |
|
rinpatch
|
bcd8ef65e0
|
Merge branch 'add-admin-to-node-info' into 'develop'
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
|
2019-03-05 07:05:44 +00:00 |
|
Haelwenn (lanodan) Monnier
|
788a354ce0
|
Web.RelMe: Fix having other values in rel attr
One example of this is Github which puts a rel="nofollow me" on the
profile link.
|
2019-03-05 02:13:22 +01:00 |
|
eugenijm
|
d1de0a30cc
|
Include admins in nodeinfo
|
2019-03-05 03:17:24 +03:00 |
|
Maxim Filippov
|
e34710b988
|
Format & update docs
|
2019-03-04 21:33:53 +03:00 |
|
William Pitcock
|
9f3cb38012
|
helpers: use AutoLinker to validate URIs as well as the other tests
|
2019-03-04 18:31:49 +00:00 |
|
William Pitcock
|
d7a278a733
|
tests: add tests for rich media helper functions
|
2019-03-04 18:31:49 +00:00 |
|
kaniini
|
d45dbdce5a
|
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
|
2019-03-04 18:29:13 +00:00 |
|
Maxim Filippov
|
f620199836
|
Merge search endpoint into /users
|
2019-03-04 21:26:32 +03:00 |
|
Maxim Filippov
|
cc7b35e097
|
Add status text to notifications (mentions and reposts)
|
2019-03-04 20:47:34 +03:00 |
|
kaniini
|
ca5d894e68
|
Merge branch 'fix/like-adressing' into 'develop'
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
|
2019-03-04 15:59:57 +00:00 |
|
rinpatch
|
33c614bce0
|
Stop adresssing like activities to actor's follower collection on non-public posts
|
2019-03-04 18:09:58 +03:00 |
|
|
|
aab86698a5
|
Expand "to" of delete activities
|
2019-03-04 11:18:45 +01:00 |
|
eugenijm
|
86e4b48a5e
|
Fix DM visibility for blocking users
|
2019-03-04 06:24:27 +03:00 |
|
kaniini
|
ace4231628
|
Merge branch 'features/bio_rel_me' into 'develop'
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
|
2019-03-03 16:00:49 +00:00 |
|
kaniini
|
6c6a2dbfdd
|
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
Add pagination and search to users
See merge request pleroma/pleroma!873
|
2019-03-03 15:59:15 +00:00 |
|
kaniini
|
b531e366df
|
Merge branch 'get-follow-requests-sql' into 'develop'
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
|
2019-03-03 15:51:32 +00:00 |
|
kaniini
|
c93479c6f5
|
Merge branch 'count-only-public-statuses' into 'develop'
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
|
2019-03-03 15:49:19 +00:00 |
|
eugenijm
|
d5418e9ff7
|
Remove follow_request_count as it's not needed for FE anymore.
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
|
2019-03-03 18:42:27 +03:00 |
|
lambda
|
9b63fda9c7
|
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
[#675] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
|
2019-03-03 11:13:59 +00:00 |
|
eugenijm
|
c46950d3b1
|
Increment user note count only on public activities
|
2019-03-03 14:08:43 +03:00 |
|
eugenijm
|
1a1f4520cd
|
Use sql query in User.get_follow_requests/1 for filtering logic
|
2019-03-02 22:18:56 +03:00 |
|
Maxim Filippov
|
bf30df99cb
|
We do not guarantee the order of elements when we search
|
2019-03-02 17:32:40 +03:00 |
|
Maxim Filippov
|
2ec8cf5665
|
Add pagination to search
|
2019-03-02 17:21:30 +03:00 |
|
rinpatch
|
f38c316e6e
|
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
|
2019-03-02 06:39:07 +00:00 |
|
Haelwenn (lanodan) Monnier
|
7b9868f343
|
Pleroma.UserTest: Add tests for rel=me
|
2019-03-02 06:59:09 +01:00 |
|
Haelwenn (lanodan) Monnier
|
8e6f7fdb86
|
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
|
2019-03-02 06:58:42 +01:00 |
|
Haelwenn (lanodan) Monnier
|
25e588496a
|
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
|
2019-03-02 06:31:33 +01:00 |
|
Haelwenn (lanodan) Monnier
|
bb9e40968a
|
Web.OAuth.OAuthControllerTest: Add test against token formatting
|
2019-03-02 04:10:57 +01:00 |
|
Maxim Filippov
|
a25c1313ae
|
Format
|
2019-03-01 21:07:05 +03:00 |
|
Maxim Filippov
|
aaa9fed1ca
|
Fix user_test
|
2019-03-01 20:58:47 +03:00 |
|
Maxim Filippov
|
f384a9a256
|
Format
|
2019-03-01 20:23:19 +03:00 |
|
Maxim Filippov
|
f1a4c3163b
|
Show current user in users list as well
|
2019-03-01 20:23:03 +03:00 |
|
Maxim Filippov
|
5b08b470f6
|
Add "local" params to users search
|
2019-03-01 20:13:02 +03:00 |
|
rinpatch
|
9c6abec4d8
|
use commonapi.post instead of activitybulder
|
2019-03-01 15:48:04 +03:00 |
|
rinpatch
|
1341ee650e
|
[#675] Do not show DMs in mentions timeline
|
2019-03-01 09:37:29 +03:00 |
|
Maxim Filippov
|
46f29b9da1
|
Add search users endpoint
|
2019-02-28 19:04:47 +03:00 |
|
Maxim Filippov
|
70e82a3465
|
Add test for the second page
|
2019-02-28 17:54:02 +03:00 |
|
kaniini
|
cf426a719d
|
Merge branch 'with-mutes' into 'develop'
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
|
2019-02-28 10:22:19 +00:00 |
|
kaniini
|
089e2588a3
|
Merge branch 'speedup-follow-requests' into 'develop'
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
|
2019-02-28 10:10:03 +00:00 |
|
kaniini
|
3c849d0438
|
Merge branch 'deactivated-in-user-view' into 'develop'
Add activation status to the regular user view
See merge request pleroma/pleroma!874
|
2019-02-28 10:08:31 +00:00 |
|
eugenijm
|
6b11011039
|
Added deactivated to the user view
|
2019-02-28 09:08:34 +03:00 |
|
Maxim Filippov
|
2883f75a3a
|
Add pagination to users admin API
|
2019-02-28 01:11:56 +03:00 |
|
lain
|
bbbdbec4fd
|
Remove parts of the old activity view.
Not used anymore.
|
2019-02-27 17:24:51 +01:00 |
|
lain
|
9ade1242c2
|
Add user muted status info to twitterapi.
|
2019-02-27 16:52:03 +01:00 |
|
lain
|
c1ae495878
|
Add user muted status info to MastodonAPI.
|
2019-02-27 16:46:47 +01:00 |
|
lain
|
c4235f96bd
|
Add with_muted param.
|
2019-02-27 16:37:42 +01:00 |
|
lain
|
8d8cb08f94
|
Add follow request test.
|
2019-02-27 14:51:07 +01:00 |
|
William Pitcock
|
1536640962
|
mastodon api: embed relationship card under account card for Pleroma FE convenience
|
2019-02-27 13:01:10 +00:00 |
|
Egor Kislitsyn
|
5d961d536c
|
fix formatter
|
2019-02-27 15:40:30 +07:00 |
|
Maxim Filippov
|
ed7fd6b47e
|
Add missing docs and tests
|
2019-02-27 03:08:03 +03:00 |
|
Egor
|
c3ac9424d2
|
AutoLinker
|
2019-02-26 23:32:26 +00:00 |
|
lain
|
9e0686efa6
|
Move visibility into own module.
|
2019-02-22 13:29:52 +01:00 |
|
lain
|
62296f5a25
|
Fix private post card handling.
|
2019-02-22 12:02:51 +01:00 |
|
KZ
|
7c722c08f5
|
Fix: Fixing an outbox related bug when local user activity is empty
|
2019-02-22 04:37:48 +00:00 |
|
William Pitcock
|
e95dbecf3e
|
tests: fix formatting
|
2019-02-20 20:49:10 +00:00 |
|
William Pitcock
|
aa45674be6
|
tests: add test for fetching AP objects with application/json.
|
2019-02-20 20:45:09 +00:00 |
|
William Pitcock
|
3ee77e95b2
|
tests: fix tests
|
2019-02-20 17:23:05 +00:00 |
|
Egor
|
bff9eb5ef7
|
Reports
|
2019-02-20 16:51:25 +00:00 |
|
lain
|
59c27f29c8
|
Add some nicer urls in status view.
|
2019-02-20 17:36:16 +01:00 |
|
Ivan Tashkinov
|
b574d97c2e
|
[#468] Added support for push OAuth scope (Mastodon 2.4+).
|
2019-02-20 17:27:41 +03:00 |
|
Ivan Tashkinov
|
6fe7acd58e
|
[#468] Merged upstream/develop.
|
2019-02-20 16:48:59 +03:00 |
|
lambda
|
11b3c10c54
|
Merge branch 'muting' into 'develop'
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
|
2019-02-20 13:19:37 +00:00 |
|
lain
|
4196d9af11
|
Add test for User.mutes and so on.
|
2019-02-20 14:14:52 +01:00 |
|
lain
|
9ae79bb71a
|
Add test for muting functionality.
|
2019-02-20 13:47:44 +01:00 |
|
Ivan Tashkinov
|
337367d764
|
[#468] More OAuth scopes-specific tests.
|
2019-02-20 12:27:28 +03:00 |
|
Ivan Tashkinov
|
04ee877a20
|
[#468] Added OAuth scopes-specific tests.
|
2019-02-19 22:28:21 +03:00 |
|
Ekaterina Vaartis
|
ad2cf4fd86
|
Add test for mastodon muting endpoints
|
2019-02-19 21:49:55 +03:00 |
|
eugenijm
|
25b9e7a8c3
|
Added admin API for changing user activation status
|
2019-02-19 19:37:02 +03:00 |
|
Ivan Tashkinov
|
c0ecbf6669
|
[#468] Merged upstream/develop.
|
2019-02-19 19:10:55 +03:00 |
|
kaniini
|
833161b5d2
|
Merge branch 'feature/jobs' into 'develop'
Job Queue
See merge request pleroma/pleroma!732
|
2019-02-18 19:43:06 +00:00 |
|
kaniini
|
7456338ed3
|
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
|
2019-02-18 04:02:41 +00:00 |
|
kaniini
|
c23bd05737
|
Merge branch 'features/flavour-switching' into 'develop'
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
|
2019-02-18 04:01:51 +00:00 |
|
kaniini
|
cd019a5927
|
Merge branch 'follow-request-count' into 'develop'
Follow request count
See merge request pleroma/pleroma!817
|
2019-02-18 04:01:26 +00:00 |
|
kaniini
|
3f38a05571
|
Merge branch 'csv-export' into 'develop'
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
|
2019-02-18 03:59:46 +00:00 |
|
Maxim Filippov
|
fd17a0cc9b
|
Fix test
|
2019-02-18 00:10:48 +03:00 |
|
lambda
|
79e503b3f5
|
Merge branch 'docker-speedup' into 'develop'
Docker speedup
See merge request pleroma/pleroma!837
|
2019-02-17 17:38:25 +00:00 |
|
lambda
|
ae84af4ad0
|
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
|
2019-02-17 16:57:57 +00:00 |
|
lain
|
71c8c60ded
|
More speedup, test fixes.
|
2019-02-17 17:47:24 +01:00 |
|
rinpatch
|
d0a94f98e0
|
more tests for HellthreadPolicy
|
2019-02-17 14:33:44 +03:00 |
|
Ivan Tashkinov
|
bc4f77b10b
|
[#468] Merged upstream/develop, resolved conflicts.
|
2019-02-17 14:07:04 +03:00 |
|
Ivan Tashkinov
|
dcf24a3233
|
[#468] Refactored OAuth scopes' defaults & missing selection handling.
|
2019-02-17 13:49:14 +03:00 |
|
Haelwenn (lanodan) Monnier
|
72a4272d84
|
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
|
2019-02-16 19:52:46 +01:00 |
|
lain
|
f469a8610f
|
Check that the welcome message is sent from the correct user.
|
2019-02-16 17:24:31 +01:00 |
|
lain
|
38e15930cb
|
Add option to return all friends in twitter api.
Mainly useful for user export.
|
2019-02-16 17:01:15 +01:00 |
|
lain
|
d812a347ca
|
Add optional welcome message.
|
2019-02-16 16:42:34 +01:00 |
|
rinpatch
|
921571c19b
|
Merge branch 'hellthread-filter-fix' into 'develop'
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
|
2019-02-15 13:18:35 +00:00 |
|
|
|
dca6bee2f7
|
Rename test, add check for follower collection when delisting
|
2019-02-15 13:43:14 +01:00 |
|
rinpatch
|
b63a5e309d
|
Merge branch 'bugfix/actor-containment' into 'develop'
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
|
2019-02-15 12:27:03 +00:00 |
|
|
|
d943c90249
|
Add tests, change default config values, fix a bug
|
2019-02-15 12:47:50 +01:00 |
|
eugenijm
|
ecdf0657ba
|
Add logic for keeping follow_request_count up-to-date on the follow,
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
|
2019-02-15 12:20:20 +03:00 |
|
William Pitcock
|
32b1649434
|
test: user: add a test for whether user search returns a user or not
|
2019-02-14 20:05:08 +00:00 |
|
lambda
|
ea2698beb7
|
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
|
2019-02-14 19:54:16 +00:00 |
|
Egor Kislitsyn
|
907306174b
|
fix S3 links encoding in Mediaproxy
|
2019-02-14 15:55:21 +07:00 |
|
kaniini
|
19756d68f2
|
Merge branch 'fix/credo-issues-test' into 'develop'
Fix credo issues in ./test
See merge request pleroma/pleroma!808
|
2019-02-14 03:55:26 +00:00 |
|
William Pitcock
|
e031cc6473
|
tests: update tests for totalItems leak fix
|
2019-02-14 03:22:54 +00:00 |
|
William Pitcock
|
64620d8980
|
activitypub: user view: do not expose oAuth endpoints for instance users
|
2019-02-14 02:41:21 +00:00 |
|
William Pitcock
|
889ad95a2a
|
tests: add some reserialization tests based on IR differences
|
2019-02-14 00:59:18 +00:00 |
|
Ivan Tashkinov
|
063baca5e4
|
[#468] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.
|
2019-02-14 00:29:29 +03:00 |
|
William Pitcock
|
d54c483964
|
tests: add tests for endpoints
|
2019-02-13 19:48:24 +00:00 |
|
lain
|
88a4de24f9
|
User.follow_all: Respect blocks in both directions.
|
2019-02-13 13:52:27 +01:00 |
|
Maxim Filippov
|
62a45bdc11
|
Add revoke token
|
2019-02-13 12:59:56 +03:00 |
|
Maxim Filippov
|
61a4bc5095
|
Add OAuth tokens endpoint
|
2019-02-13 12:59:56 +03:00 |
|
rinpatch
|
379d04692c
|
Filter summary in keywordpolicy
|
2019-02-11 21:35:40 +03:00 |
|
|
|
ac72b578da
|
Merge branch 'develop' into feature/thread-muting
|
2019-02-11 12:10:49 +01:00 |
|
|
|
c01ef574c1
|
Refactor as per Rin's suggestions, add endpoint tests
|
2019-02-11 12:04:02 +01:00 |
|
