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
4 years ago
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
5 years ago
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
5 years ago
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
5 years ago
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
1c05f539aa
Improved in-test `clear_config/n` applicability (setup / setup_all / in-test usage).
5 years ago
Ivan Tashkinov
ec3719f539
Improved in-test config management functions.
5 years ago
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
5 years ago
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
5 years ago
feld
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
5 years ago
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
5 years ago
Ivan Tashkinov
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
5 years ago
Ivan Tashkinov
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
5 years ago
Alexander Strizhakov
56ff02f2ef
removing GunMock to use Mox
5 years ago
Mark Felder
d9c5ae7c09
Update Copyrights for gun related files
5 years ago
Mark Felder
4427161ca3
Merge branch 'develop' into gun
5 years ago
Mark Felder
5592db4757
Older copyright updates
5 years ago
Mark Felder
05da5f5cca
Update Copyrights
5 years ago
Alexander Strizhakov
884d9710b2
refactoring for gun api modules
5 years ago
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
5 years ago
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow
5 years ago
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\/>'
5 years ago
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/'
5 years ago
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
5 years ago
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
5 years ago
Haelwenn (lanodan) Monnier
f9fe6a9e30
Captcha: return invalid when answer_data is nil
5 years ago
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun
5 years ago
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
5 years ago
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Alexander Strizhakov
514c899275
adding gun adapter
5 years ago
Ivan Tashkinov
4f8c3462a8
Tweaks to `clear_config` calls in tests in order to prevent side effects on config during test suite execution.
5 years ago
Ivan Tashkinov
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
5 years ago
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
5 years ago
Egor Kislitsyn
2ddd1bb088
Fix compatibility with Elixir v1.10
5 years ago
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
5 years ago
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
5 years ago
Alexander Strizhakov
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
5 years ago
Alexander Strizhakov
59ba5c80b9
little cleanup
5 years ago
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
5 years ago
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander
5cacb988b9
partially settings update
5 years ago
Alex S
2753285b77
config editing through database
5 years ago
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
5 years ago
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
5 years ago
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>
5 years ago
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Maksim Pechnikov
2b821036c4
Merge branch 'develop' into issue/1383
5 years ago
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
5 years ago