Alexander Strizhakov
a9c7cd341b
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
0d331f3d23
compilation warnings fix
5 years ago
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
5 years ago
feld
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
5 years ago
Mark Felder
e64059d218
Assign token that can write to follows
5 years ago
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
5 years ago
feld
ea4a462858
Merge branch 'issue/1487' into 'develop'
...
[#1487 ] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
5 years ago
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
5 years ago
Alexander Strizhakov
d933fd3d61
more renamings
5 years ago
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
5 years ago
Alexander Strizhakov
88a16bb9fc
deep merge in config update
5 years ago
Alexander
c841174de8
flag for delete fix
5 years ago
Alexander
0b02040327
little fixes and typos fix
5 years ago
Alexander
9c1f3bfeff
fixes for logger backends
5 years ago
Alexander
063ab6d911
logger backends fix
5 years ago
Alexander
583cee4607
parsing proxy url setting
5 years ago
Alexander
fea734ca70
errors on endpoints
5 years ago
Alexander
5cacb988b9
partially settings update
5 years ago
Alexander
0656816c77
tests for setttings without an explicit key
5 years ago
Alex S
2753285b77
config editing through database
5 years ago
Maksim Pechnikov
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
5 years ago
Ivan Tashkinov
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
5 years ago
Maksim Pechnikov
933dc12043
added code of mr#2067
5 years ago
Maksim Pechnikov
bdd71669da
update test
5 years ago
Maksim Pechnikov
5b84156013
moved remote follow in separate controller
5 years ago
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
5 years ago
Mark Felder
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
5 years ago
feld
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
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
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
5 years ago
Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
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
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
5 years ago
rinpatch
eae65e3216
formatting
5 years ago
rinpatch
6ffbfdeeb2
tests: significantly reduce streamer timeout
...
there is no reason IPC between two processes on the same node should
take 4 seconds
5 years ago
rinpatch
137a3d220b
tests: remove a useless 1 second sleep
...
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
5 years ago
rinpatch
814a99c80f
tests: remove a useless 3 second sleep
...
the ids favs use are accurate down to a microsecond, there is no need
for it
5 years ago
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
5 years ago
Ivan Tashkinov
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
5 years ago
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
5 years ago
Mark Felder
9ef912aecf
Merge branch 'develop' into issue/1411
5 years ago
Sadposter
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
5 years ago
Sadposter
5abee19b63
make analysis happy
5 years ago
Sadposter
19d228cc58
modify SQL to include followed-but-domain-blocked activities
5 years ago
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
5 years ago
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
5 years ago
rinpatch
37c34ccec3
Merge branch 'fix/prefer-url-over-search' into 'develop'
...
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
5 years ago
rinpatch
f4b7f32d51
status search: prefer the status fetched by url over other results
5 years ago