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
|
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 |
|
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
|
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
|
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
|
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 |
|
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
|
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
|
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 |
|
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 |
|
Haelwenn (lanodan) Monnier
|
72a4272d84
|
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
|
2019-02-16 19:52:46 +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 |
|
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 |
|
|
|
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 |
|
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 |
|
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 |
|
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 |
|
Egor Kislitsyn
|
305d219413
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
|
2019-02-11 13:54:21 +07:00 |
|
Haelwenn (lanodan) Monnier
|
74579115a7
|
test: Change lenght(…) == 0 to Enum.empty?(…)
|
2019-02-11 03:44:16 +01:00 |
|
Haelwenn (lanodan) Monnier
|
8bb7e19b38
|
test: de-group alias/es
|
2019-02-11 03:44:15 +01:00 |
|
|
|
6a150de3bd
|
Add unique index and unique constraint check, uniqueness test fails
|
2019-02-09 20:52:11 +01:00 |
|
|
|
478a05b4c9
|
Merged "check mute" test into the other two
|
2019-02-09 18:34:00 +01:00 |
|
|
|
a0d732ec55
|
it works!!
|
2019-02-09 17:47:57 +01:00 |
|
|
|
4430a0ad12
|
added another test
|
2019-02-09 14:34:42 +01:00 |
|
|
|
09189c3a7c
|
Made a test!
|
2019-02-09 14:23:51 +01:00 |
|
rinpatch
|
b05a341187
|
oof
|
2019-02-09 08:12:30 +03:00 |
|
rinpatch
|
9a23f8f3ea
|
Add tests and fix a typo in docs
|
2019-02-08 20:23:26 +03:00 |
|
Mark Felder
|
74518d0b60
|
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
This was a dirty regex replace which worked on my server
|
2019-02-06 22:34:44 +00:00 |
|
Haelwenn
|
1220a17146
|
Merge branch 'bugfix/rich-media-card' into 'develop'
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
|
2019-02-06 18:39:13 +00:00 |
|
William Pitcock
|
26670b09a7
|
tests: add a rich media card that contains all relevant fields
|
2019-02-06 18:27:55 +00:00 |
|
William Pitcock
|
6eb8c1eb92
|
test: add some regression tests for the rich media card rendering
|
2019-02-06 18:12:26 +00:00 |
|
Egor Kislitsyn
|
5b1d7c3c56
|
fix tests
|
2019-02-06 12:17:41 +07:00 |
|
Egor Kislitsyn
|
6f05f448f8
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
|
2019-02-06 11:33:00 +07:00 |
|
eugenijm
|
035eaeb9b8
|
Allow to configure visibility for admin and moderator badges
|
2019-02-06 06:18:05 +03:00 |
|
eugenijm
|
398c81f9c8
|
Add is_admin and is_moderator boolean fields to the user view
|
2019-02-06 02:10:06 +03:00 |
|
