lain
|
a7966f2080
|
Webfinger: Request account info with the acct scheme
|
2020-05-03 13:48:01 +02:00 |
|
lain
|
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 |
|
Egor Kislitsyn
|
7b0c8f0fde
|
Add tests for account registration with captcha enabled and improve errors
|
2020-04-29 21:26:07 +04:00 |
|
Maksim Pechnikov
|
ea5142b94b
|
convert markdown content to html
|
2020-04-28 09:32:43 +03:00 |
|
Egor Kislitsyn
|
2efc00b3cf
|
Use json_response_and_validate_schema/2 in tests to validate OpenAPI schema
|
2020-04-27 20:46:52 +04:00 |
|
Egor Kislitsyn
|
f1ca917bb0
|
Merge branch 'develop' into openapi/account
|
2020-04-27 14:33:00 +04:00 |
|
Egor Kislitsyn
|
f362836742
|
Support validation for inline OpenAPI schema and automatic tests for examples
|
2020-04-24 15:16:15 +04:00 |
|
Egor Kislitsyn
|
736fead494
|
Merge branch 'develop' into openapi/account
|
2020-04-20 18:40:02 +04:00 |
|
Haelwenn
|
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 |
|
Egor Kislitsyn
|
260cbddc94
|
Add spec for AccountController.update_credentials
|
2020-04-13 18:16:07 +04:00 |
|
Maksim Pechnikov
|
c5c09fc61b
|
fix mediaType of object
|
2020-04-13 07:02:57 +03:00 |
|
Alexander Strizhakov
|
f497cf2f7c
|
Merge branch 'develop' into gun
|
2020-03-30 12:15:23 +03:00 |
|
Haelwenn
|
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 |
|
Alexander Strizhakov
|
a6ee6784bc
|
creating trusted app from adminFE & mix task
|
2020-03-23 10:44:47 +03:00 |
|
Alexander Strizhakov
|
9bae9b1b1b
|
Merge branch 'develop' into gun
|
2020-03-20 20:47:54 +03:00 |
|
Ivan Tashkinov
|
1c05f539aa
|
Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).
|
2020-03-20 18:33:00 +03:00 |
|
Ivan Tashkinov
|
ec3719f539
|
Improved in-test config management functions.
|
2020-03-18 20:30:31 +03:00 |
|
Alexander Strizhakov
|
f0651730bd
|
Merge branch 'develop' into gun
|
2020-03-16 14:25:55 +03:00 |
|
Alexander Strizhakov
|
39ed608b13
|
Merge branch 'develop' into gun
|
2020-03-12 18:31:10 +03:00 |
|
Ivan Tashkinov
|
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 |
|
feld
|
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 |
|
Haelwenn (lanodan) Monnier
|
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 |
|
Ivan Tashkinov
|
5b696a8ac1
|
[#1560] Enforced authentication for non-federating instances in StaticFEController.
|
2020-03-11 14:05:56 +03:00 |
|
Ivan Tashkinov
|
5fc92deef3
|
[#1560] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
|
2020-03-09 20:51:44 +03:00 |
|
Alexander Strizhakov
|
56ff02f2ef
|
removing GunMock to use Mox
|
2020-03-06 20:23:58 +03:00 |
|
Mark Felder
|
d9c5ae7c09
|
Update Copyrights for gun related files
|
2020-03-03 17:16:24 -06:00 |
|
Mark Felder
|
4427161ca3
|
Merge branch 'develop' into gun
|
2020-03-03 17:15:49 -06:00 |
|
Mark Felder
|
5592db4757
|
Older copyright updates
|
2020-03-03 16:46:45 -06:00 |
|
Mark Felder
|
05da5f5cca
|
Update Copyrights
|
2020-03-03 16:44:49 -06:00 |
|
Alexander Strizhakov
|
884d9710b2
|
refactoring for gun api modules
|
2020-03-03 19:24:14 +03:00 |
|
Alexander Strizhakov
|
509c81e4b1
|
Merge branch 'develop' into gun
|
2020-03-03 10:08:07 +03:00 |
|
Alexander Strizhakov
|
cc98d010ed
|
relay list shows hosts without accepted follow
|
2020-03-02 09:27:20 +03:00 |
|
Haelwenn (lanodan) Monnier
|
6da6540036
|
Bump copyright years of files changed after 2020-01-07
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
|
2020-03-02 06:08:45 +01:00 |
|
Haelwenn (lanodan) Monnier
|
6c0d869d9d
|
Bump copyright years of files changed after 2019-01-01
Done via the following command:
git diff 1e6c102b --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
|
2020-03-02 05:54:56 +01:00 |
|
Alexander Strizhakov
|
814b275af7
|
Merge branch 'develop' into gun
|
2020-02-29 11:34:50 +03:00 |
|
lain
|
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 |
|
Haelwenn (lanodan) Monnier
|
f9fe6a9e30
|
Captcha: return invalid when answer_data is nil
|
2020-02-24 02:49:53 +01:00 |
|
Alexander Strizhakov
|
13918cb545
|
Merge branch 'develop' into gun
|
2020-02-21 10:02:37 +03:00 |
|
Ivan Tashkinov
|
0c65a8c3d0
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
# Conflicts:
# config/config.exs
|
2020-02-20 15:00:48 +03:00 |
|
Ivan Tashkinov
|
61d9f43e46
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
|
2020-02-18 17:46:09 +03:00 |
|
Alexander Strizhakov
|
514c899275
|
adding gun adapter
|
2020-02-18 08:19:01 +03:00 |
|
Ivan Tashkinov
|
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 |
|
Ivan Tashkinov
|
e84fee5b86
|
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
|
2020-02-05 07:56:36 +03:00 |
|
Maksim Pechnikov
|
21a2a05407
|
Merge branch 'develop' into issue/1383
|
2020-01-28 20:39:20 +03:00 |
|
Egor Kislitsyn
|
2ddd1bb088
|
Fix compatibility with Elixir v1.10
|
2020-01-28 18:23:59 +04:00 |
|
Ivan Tashkinov
|
86e4d23acb
|
[#1505] Background fetching of incoming activities' replies collections.
|
2020-01-25 10:47:30 +03:00 |
|
Maksim Pechnikov
|
cf19bf3c7c
|
Merge branch 'develop' into issue/1383
|
2020-01-22 20:20:39 +03:00 |
|
Alexander Strizhakov
|
29155137fd
|
renaming
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
|
2020-01-16 08:50:27 +03:00 |
|
Alexander Strizhakov
|
59ba5c80b9
|
little cleanup
|
2020-01-15 17:10:33 +03:00 |
|
Maksim Pechnikov
|
b7908844f2
|
Merge branch 'develop' into issue/1383
|
2020-01-13 12:41:07 +03:00 |
|