7fdc7078ae
Merge branch 'openapi/lists' into 'develop'
...
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
4 years ago
332e016bcd
Add OpenAPI spec for ScheduledActivityController
4 years ago
5ec6aad567
Add OpenAPI spec for ListController
4 years ago
335aabc39c
Transmogrifier tests: Extract like tests.
4 years ago
a7966f2080
Webfinger: Request account info with the acct scheme
4 years ago
44fbd09709
Merge branch 'issue/1577' into 'develop'
...
[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372
4 years ago
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
4 years ago
ea5142b94b
convert markdown content to html
4 years ago
2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
4 years ago
f1ca917bb0
Merge branch 'develop' into openapi/account
4 years ago
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
4 years ago
736fead494
Merge branch 'develop' into openapi/account
4 years ago
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
4 years ago
260cbddc94
Add spec for AccountController.update_credentials
5 years ago
c5c09fc61b
fix mediaType of object
5 years ago
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
5 years ago
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
ec3719f539
Improved in-test config management functions.
5 years ago
f0651730bd
Merge branch 'develop' into gun
5 years ago
39ed608b13
Merge branch 'develop' into gun
5 years ago
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
5 years ago
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
5 years ago
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
5 years ago
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
56ff02f2ef
removing GunMock to use Mox
5 years ago
d9c5ae7c09
Update Copyrights for gun related files
5 years ago
4427161ca3
Merge branch 'develop' into gun
5 years ago
5592db4757
Older copyright updates
5 years ago
05da5f5cca
Update Copyrights
5 years ago
884d9710b2
refactoring for gun api modules
5 years ago
509c81e4b1
Merge branch 'develop' into gun
5 years ago
cc98d010ed
relay list shows hosts without accepted follow
5 years ago
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
5 years ago
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
...
Done via the following command:
git diff 1e6c102b
5 years ago
814b275af7
Merge branch 'develop' into gun
5 years ago
81f29e7c6a
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
...
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
5 years ago
f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
13918cb545
Merge branch 'develop' into gun
5 years ago
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
514c899275
adding gun adapter
5 years ago
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
2ddd1bb088
Fix compatibility with Elixir v1.10
5 years ago
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
5 years ago
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
5 years ago
59ba5c80b9
little cleanup
5 years ago
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
5cacb988b9
partially settings update
5 years ago
2753285b77
config editing through database
5 years ago
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
5 years ago
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years ago
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago
5876a9cb79
Merge branch 'develop' into issue/1383
5 years ago
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
5 years ago
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
5 years ago
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
5 years ago
3fe7a1fd35
Merge branch 'develop' into issue/1342
5 years ago
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
aa97fe8f17
ChatChannel: Ignore messages that are too long.
5 years ago
29a98b86b7
Merge branch 'develop' into issue/1383
5 years ago
652cc6ba4b
updated ScheduledActivity
5 years ago
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
5 years ago
1915b23e72
test missing first field
5 years ago
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
5 years ago
a52da55eb9
added User.NotificationSetting struct
5 years ago
f01881e82a
Add federated test infrastructure
5 years ago
5869a43fe7
Fix tests
5 years ago
1636cc5b7e
Removed users.info and remaining usages.
5 years ago
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
5 years ago
5271bbcf11
add missing tesla mocks
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
ef659331b0
implement invisible support for remote users
5 years ago
dbfdb1f6e3
add some missing tesla fixtures
5 years ago
4f82e42e4e
websub: remove entirely
5 years ago
66b5d0ff55
add Markers /api/v1/markers
5 years ago
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
dc6d20b68d
provide mocks for webfinger endpoints
5 years ago
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
b1ff66dc5f
Add test for handling Announces with inlined object from different origin
5 years ago
977e711e22
Import object from self-Announce whenever possible
5 years ago
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
c3d09921e4
test: factory: implement support for generating mock audio and listen objects
5 years ago
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
5 years ago
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
5 years ago
00abe099cd
added tests for ActivityPub.like\unlike
5 years ago
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
5e7098cf69
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
...
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
5 years ago
20c3f613d8
HttpRequestMock: Remove useless `error = error`
5 years ago
211e163770
Implement missing mocks for rel=me
5 years ago
e22737ffb5
HttpRequestMock: Improve non-implemented error message
5 years ago
18668447d2
HttpRequestMock: Log mock errors as warnings
5 years ago
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
a320358703
added test helpers to clear config after tests
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
4244e17de0
fix credo
5 years ago
dd0b71ea6d
tests: add tests for MRF.describe()
5 years ago
7089400675
test: add mock MRF module for describe() testing
5 years ago
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
5 years ago
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
5 years ago
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
5 years ago
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
5 years ago
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
5 years ago
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
5 years ago
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
5 years ago
301ea0dc04
Add tests for counters being updated on follow
5 years ago
58443d0cd6
tests for TwitterApi/UtilController
5 years ago
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
5 years ago
b20020da16
Show the url advertised in the Activity in the Status JSON response
5 years ago
8d9f43e1d1
Add WebFinger test for AP-only account
5 years ago
55341ac717
tests WebFinger
5 years ago
d2da3d30f3
Merge branch 'develop' into feature/digest-email
5 years ago
36012ef6c1
Require that ephemeral posts live for at least one hour
...
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
5 years ago
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
5 years ago
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
5 years ago
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
5 years ago
14ab2fd0f4
remove pry
5 years ago
36049f08ef
Merge develop
5 years ago
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
5 years ago
b6b748d3e7
tests for Uploader with webhook
5 years ago
c729883936
Merge branch 'develop' into feature/digest-email
5 years ago
f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
5 years ago
lain