lain
5367a00257
Deletion: Handle the case of pruned objects.
před 4 roky
lain
84bb116ae3
Merge branch 'descriptions-fix' into 'develop'
copy/paste fix for descriptions
See merge request pleroma/pleroma!2504
před 4 roky
Alexander Strizhakov
da6a38d205
copy/paste fix for descriptions
před 4 roky
lain
7ca83e71a9
Merge branch 'shortening-modules-name' into 'develop'
Descriptions that module names are shortened
See merge request pleroma/pleroma!2428
před 4 roky
rinpatch
b3e6953d23
Merge branch 'fix/skeleton-migration-nonlocal-locals' into 'develop'
insert skeletons migration: fix for non-local locals
Closes #1746
See merge request pleroma/pleroma!2502
před 4 roky
rinpatch
0ad89762a1
insert skeletons migration: fix for non-local locals
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.
In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx
Closes #1746
před 4 roky
rinpatch
d73e8b6b12
Merge branch 'pleroma-fe-2020-05-08-7a0e554d' into 'develop'
PleromaFE bundle dropping requirement for embedded account relationships
See merge request pleroma/pleroma!2494
před 4 roky
rinpatch
5e1d994785
Merge branch 'fix/eldap-otp' into 'develop'
include eldap in OTP releases
Closes #1313
See merge request pleroma/pleroma!2501
před 4 roky
rinpatch
b6d1bcc55d
include eldap in OTP releases
Closes #1313
před 4 roky
lain
c962c6afb3
Merge branch 'fix/healthcheck-total-alloc' into 'develop'
healthcheck: report real amount of memory allocated by beam
See merge request pleroma/pleroma!2499
před 4 roky
rinpatch
30eaef9d61
healthcheck: report real amount of memory allocated by beam
as opposed to memory currently in use
před 4 roky
rinpatch
df82ee4179
Merge branch 'chore/changelog-sync' into 'develop'
CHANGELOG.md: Add entries from 2.0.3
See merge request pleroma/pleroma!2498
před 4 roky
rinpatch
f4d50fbd81
CHANGELOG.md: Add entries from 2.0.3
před 4 roky
feld
3a014dd609
Merge branch 'chore/description-grammar' into 'develop'
Minor grammar nit
See merge request pleroma/pleroma!2496
před 4 roky
Mark Felder
c9344b5f2d
Minor grammar nit
před 4 roky
feld
65299daa85
Merge branch 'fix/adminfe-icons' into 'develop'
Restore deleted icons. No idea how this happened.
See merge request pleroma/pleroma!2495
před 4 roky
Mark Felder
6a291b1834
Restore deleted icons. No idea how this happened.
před 4 roky
Ivan Tashkinov
0e1bda55e8
PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
7a0e554daf
před 4 roky
rinpatch
570940a3fd
Merge branch 'bugfix/fix-like-notifications' into 'develop'
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
před 4 roky
lain
fbcc53760e
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
před 4 roky
lain
7e9aaa0d02
Transmogrifier tests: Remove more double tests.
před 4 roky
lain
f1274c3326
Transmogrifier tests: Remove double tests.
před 4 roky
lain
6acbe45eb2
Builder: Extract common features of likes and reactions.
před 4 roky
lain
0cf43391f2
Merge branch 'issue/1276-2' into 'develop'
[#1276 ] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
před 4 roky
Maksim Pechnikov
a081135365
revert mix.lock
před 4 roky
lain
218a22c9a3
Merge branch 'fix/privacy-notification' into 'develop'
Privacy option affects all push notifications, not just Direct Messages
Closes #1745
See merge request pleroma/pleroma!2485
před 4 roky
Maksim Pechnikov
b078e0567d
Merge branch 'develop' into issue/1276-2
před 4 roky
Haelwenn
769d95644d
Merge branch 'feature/restrict-c2s' into 'develop'
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
před 4 roky
lain
ef55d24054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
před 4 roky
rinpatch
bef08b85e5
Merge branch 'feature/undo-validator-reduced' into 'develop'
Move Undo (except undo follow) to the common pipeline
See merge request pleroma/pleroma!2489
před 4 roky
Mark Felder
ea01e647df
Test Direct, Public, and Favorite notifications with privacy option
před 4 roky
lain
516ff945ce
Merge branch 'openapi/search' into 'develop'
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
před 4 roky
rinpatch
9f2bb22e15
Merge branch 'fix/streamer-wrong-arg-order' into 'develop'
Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
See merge request pleroma/pleroma!2490
před 4 roky
rinpatch
eb1f2fcbc6
Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
před 4 roky
lain
d11eea62b1
Credo fixes
před 4 roky
lain
7ac0cffb34
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
před 4 roky
lain
788b7e7bbd
Merge fixes.
před 4 roky
lain
cda410adfd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
před 4 roky
lain
f0c22df226
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
před 4 roky
rinpatch
b7635bf2b6
Merge branch 'fix/downgraded-deps' into 'develop'
Restore mix.lock after 2FA merge
See merge request pleroma/pleroma!2487
před 4 roky
rinpatch
9c3c142c32
Restore mix.lock after 2FA merge
It downgraded a bunch of deps, including plug. Which resulted in errors
since pleroma was using a feature plug didn't support at the time.
před 4 roky
lain
8ae4d64d47
Apply suggestion to lib/pleroma/notification.ex
před 4 roky
lain
3f867d8e9b
Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex
před 4 roky
lain
f57fa2a00d
Notifications: Simplify recipient calculation for some Activities.
Fixes the 'getting notfications for other people's posts' bug.
před 4 roky
Egor Kislitsyn
dc4a448f48
Add OpenAPI spec for SearchController
před 4 roky
Egor Kislitsyn
cdca62e8d4
Add schema for Tag
před 4 roky
lain
4c92dfb73e
Merge branch 'openapi/polls' into 'develop'
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
před 4 roky
lain
4061841846
Merge branch 'streamer-worker-registry' into 'develop'
Streamer rework
See merge request pleroma/pleroma!2426
před 4 roky
href
9491ba3e49
Streamer rework
před 4 roky
lain
f4c2bf0985
Merge branch 'issue/209' into 'develop'
[#209 ] 2FA/two_factor_authentication support
See merge request pleroma/pleroma!801
před 4 roky