60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
2020-09-19 19:16:55 +03:00
41939e3175
User search respect discoverable flag
2020-09-17 12:15:50 -04:00
f70335002d
RichMedia: Do a HEAD request to check content type/length
...
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
2020-09-14 14:45:58 +03:00
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
921f926e96
Remove OStatus in testsuite
2020-09-08 18:43:57 +02:00
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
9a9121805c
Apply 1 suggestion(s) to 1 file(s)
2020-08-11 09:08:27 +00:00
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05:00
34cbe9f44a
Merge branch 'features/poll-validation' into 'develop'
...
Poll and votes pipeline ingestion
Closes #1362 and #1852
See merge request pleroma/pleroma!2635
2020-08-07 10:44:06 +00:00
97b5701449
Update clear_config macro
2020-08-05 17:46:14 +03:00
878c7f3f30
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation
2020-08-04 15:28:41 +02:00
56e9bf3393
Unify Config.get behaviour for atom/list key param
2020-08-04 14:35:47 +03:00
f9301044ed
Add ReportNote test
2020-08-02 17:45:15 -05:00
77b48cb4ce
Factory: Add report_activity_factory
2020-08-02 16:36:55 -05:00
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation
2020-07-31 13:57:21 +02:00
33f0427809
Expose seconds_valid in Pleroma Captcha API endpoint
2020-07-29 16:07:22 -05:00
b87a1f8eaf
Refactor require_migration/1 into a test helper function
2020-07-22 14:32:44 -05:00
c19bdc811e
Fix attachments in polls
2020-07-15 12:32:42 +02:00
3c0c1fd2ef
Merge branch 'develop' into issue/1790-updated-oban
2020-07-10 11:34:53 -05:00
4d809144d8
Merge branch 'cluster-test-ci' into 'develop'
...
RE-enable cluster tests on CI
See merge request pleroma/pleroma!2743
2020-07-10 08:56:12 +00:00
08211eff22
Re-enable the federated tests, increase timeout
2020-07-09 13:49:30 -04:00
6a679d80c9
Move get_favicon to Pleroma.Instances, use /
2020-07-08 06:28:39 +02:00
f6d09fafee
Add support for remote favicons
2020-07-08 06:28:39 +02:00
9ad305209a
Merge branch 'bugfix/peertube-videos' into 'develop'
...
Fix getting videos from peertube
See merge request pleroma/pleroma!2728
2020-07-07 09:14:50 +00:00
fbb9743a70
Fix getting videos from peertube
2020-07-07 09:38:38 +02:00
4a8c26654e
Restrict statuses that contain user's irreversible filters
2020-07-06 09:28:21 +03:00
4695bdd81b
Merge branch 'develop' into issue/1790-updated-oban
2020-07-03 10:36:41 -05:00
244655e884
MastoAPI: Show source field when deleting
2020-06-26 19:52:20 +02:00
a8d967762e
migrate to oban 2.0-rc1
2020-06-23 15:09:01 +03:00
4ec2fb967e
Merge branch 'features/users-raw_bio' into 'develop'
...
User: Add raw_bio, storing unformatted bio
See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
3bec0d2e50
Factory: Set users to be ap_enabled by default.
2020-05-25 12:59:42 +02:00
a42a0716ec
Merge branch 'features/emoji_stealer' into 'develop'
...
MRF.StealEmojiPolicy: New Policy
See merge request pleroma/pleroma!2385
2020-05-21 13:31:49 +00:00
490a3a34b6
Add OpenAPI spec for PleromaAPI.PleromaAPIController
2020-05-20 15:15:13 +04:00
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-14 09:59:56 +02:00
b46811a074
Upgrade Comeonin to v5
...
https://github.com/riverrun/comeonin/blob/master/UPGRADE_v5.md
2020-05-12 17:14:59 -05:00
4061841846
Merge branch 'streamer-worker-registry' into 'develop'
...
Streamer rework
See merge request pleroma/pleroma!2426
2020-05-07 09:13:32 +00:00
9491ba3e49
Streamer rework
2020-05-07 09:13:32 +00:00
3d0c567fbc
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
2020-05-07 08:14:54 +00:00
f84c8f2f0d
Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop'
...
Webfinger: Request account info with the acct scheme
Closes #1728
See merge request pleroma/pleroma!2465
2020-05-06 08:46:45 +00:00
7fdc7078ae
Merge branch 'openapi/lists' into 'develop'
...
Add OpenAPI spec for ListController
See merge request pleroma/pleroma!2453
2020-05-06 08:43:21 +00:00
332e016bcd
Add OpenAPI spec for ScheduledActivityController
2020-05-05 23:42:24 +04:00
5ec6aad567
Add OpenAPI spec for ListController
2020-05-05 17:05:34 +04:00
335aabc39c
Transmogrifier tests: Extract like tests.
2020-05-04 14:45:28 +02:00
a7966f2080
Webfinger: Request account info with the acct scheme
2020-05-03 13:48:01 +02:00
44fbd09709
Merge branch 'issue/1577' into 'develop'
...
[#1577 ] fix mediaType of object
See merge request pleroma/pleroma!2372
2020-05-01 12:38:46 +00:00
7b0c8f0fde
Add tests for account registration with captcha enabled and improve errors
2020-04-29 21:26:07 +04:00
ea5142b94b
convert markdown content to html
2020-04-28 09:32:43 +03:00
2efc00b3cf
Use `json_response_and_validate_schema/2` in tests to validate OpenAPI schema
2020-04-27 20:46:52 +04:00
f1ca917bb0
Merge branch 'develop' into openapi/account
2020-04-27 14:33:00 +04:00
f362836742
Support validation for inline OpenAPI schema and automatic tests for examples
2020-04-24 15:16:15 +04:00
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
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
2020-04-17 09:19:35 +00:00
260cbddc94
Add spec for AccountController.update_credentials
2020-04-13 18:16:07 +04:00
c5c09fc61b
fix mediaType of object
2020-04-13 07:02:57 +03:00
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
2020-03-20 18:33:00 +03:00
ec3719f539
Improved in-test config management functions.
2020-03-18 20:30:31 +03:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
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
2020-03-12 12:07:07 +03:00
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
2020-03-11 15:10:09 +00:00
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
2020-03-11 13:46:42 +01:00
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
2020-03-11 14:05:56 +03:00
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
2020-03-09 20:51:44 +03:00
56ff02f2ef
removing GunMock to use Mox
2020-03-06 20:23:58 +03:00
d9c5ae7c09
Update Copyrights for gun related files
2020-03-03 17:16:24 -06:00
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06:00
5592db4757
Older copyright updates
2020-03-03 16:46:45 -06:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
884d9710b2
refactoring for gun api modules
2020-03-03 19:24:14 +03:00
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +03:00
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
...
Done via the following command:
git diff 1e6c102b
2020-03-02 05:54:56 +01:00
814b275af7
Merge branch 'develop' into gun
2020-02-29 11:34:50 +03:00
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
2020-02-24 14:54:22 +00:00
f9fe6a9e30
Captcha: return invalid when answer_data is nil
2020-02-24 02:49:53 +01:00
13918cb545
Merge branch 'develop' into gun
2020-02-21 10:02:37 +03:00
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
2020-02-20 15:00:48 +03:00
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
2020-02-13 21:55:47 +03:00
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
2ddd1bb088
Fix compatibility with Elixir v1.10
2020-01-28 18:23:59 +04:00
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
2020-01-25 10:47:30 +03:00
cf19bf3c7c
Merge branch 'develop' into issue/1383
2020-01-22 20:20:39 +03:00
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00
59ba5c80b9
little cleanup
2020-01-15 17:10:33 +03:00
b7908844f2
Merge branch 'develop' into issue/1383
2020-01-13 12:41:07 +03:00
1630ecaa20
Merge branch 'develop' into admin-be
2020-01-11 12:15:42 +03:00
5cacb988b9
partially settings update
2020-01-10 15:52:00 +03:00
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
54c9db38c8
Merge branch 'develop' into issue/1383
2019-12-21 20:38:59 +03:00
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2019-12-19 17:24:08 +03:00
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
2019-12-19 17:23:27 +03:00
Thomas Citharel
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>
2019-12-17 16:16:21 +01:00
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
2019-12-15 22:32:42 +03:00
2b821036c4
Merge branch 'develop' into issue/1383
2019-12-09 19:41:43 +03:00
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
5876a9cb79
Merge branch 'develop' into issue/1383
2019-12-08 19:52:46 +03:00
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
2019-12-06 15:36:30 +00:00
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
2019-12-05 17:16:23 +00:00
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
2019-12-05 13:34:34 +00:00
3fe7a1fd35
Merge branch 'develop' into issue/1342
2019-12-05 15:46:27 +03:00
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
aa97fe8f17
ChatChannel: Ignore messages that are too long.
2019-12-04 12:48:34 +01:00
29a98b86b7
Merge branch 'develop' into issue/1383
2019-12-04 09:34:44 +03:00
652cc6ba4b
updated ScheduledActivity
2019-12-04 09:12:17 +03:00
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
2019-11-30 10:42:51 +00:00
1915b23e72
test missing first field
2019-11-30 15:43:12 +09:00
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +03:00
f01881e82a
Add federated test infrastructure
2019-11-26 15:01:35 -05:00
5869a43fe7
Fix tests
2019-11-26 01:06:54 +09:00
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
5271bbcf11
add missing tesla mocks
2019-11-04 15:18:32 +00:00
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
ef659331b0
implement invisible support for remote users
2019-10-19 23:21:37 +00:00
dbfdb1f6e3
add some missing tesla fixtures
2019-10-18 14:50:10 +00:00
4f82e42e4e
websub: remove entirely
2019-10-18 14:50:09 +00:00
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
dc6d20b68d
provide mocks for webfinger endpoints
2019-10-09 16:32:28 +00:00
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
2019-10-06 11:43:49 +03:00
b1ff66dc5f
Add test for handling Announces with inlined object from different origin
2019-10-05 13:56:40 +02:00
977e711e22
Import object from self-Announce whenever possible
2019-10-05 13:56:40 +02:00
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
2019-10-02 20:42:40 +03:00
c3d09921e4
test: factory: implement support for generating mock audio and listen objects
2019-09-30 10:39:17 +00:00
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
2019-09-19 10:59:09 +03:00
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-09-18 18:13:21 +03:00
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
2019-09-17 22:53:26 +03:00
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
2019-09-15 18:22:08 +03:00
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06 13:26:05 +03:00
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
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
2019-08-28 07:10:35 +00:00
Ivan Tashkinov
stwf
rinpatch
Alexander Strizhakov
Haelwenn (lanodan) Monnier
lain
Alex Gleason
Roman Chvanikov
Mark Felder
Sergey Suprunenko
Maksim Pechnikov
Egor Kislitsyn
href
Haelwenn
feld
Thomas Citharel
kPherox
Chris McCord
Maxim Filippov
Ariadne Conill
Thibaut Girka