feld
|
3a014dd609
|
Merge branch 'chore/description-grammar' into 'develop'
Minor grammar nit
See merge request pleroma/pleroma!2496
|
4 years ago |
|
Mark Felder
|
c9344b5f2d
|
Minor grammar nit
|
4 years ago |
|
feld
|
65299daa85
|
Merge branch 'fix/adminfe-icons' into 'develop'
Restore deleted icons. No idea how this happened.
See merge request pleroma/pleroma!2495
|
4 years ago |
|
Mark Felder
|
6a291b1834
|
Restore deleted icons. No idea how this happened.
|
4 years ago |
|
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
4 years ago |
|
Ivan Tashkinov
|
0e1bda55e8
|
PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
7a0e554daf
|
4 years ago |
|
rinpatch
|
570940a3fd
|
Merge branch 'bugfix/fix-like-notifications' into 'develop'
Notifications: Simplify recipient calculation for some Activities.
See merge request pleroma/pleroma!2486
|
4 years ago |
|
Alexander Strizhakov
|
287f781808
|
user deletion
|
4 years ago |
|
lain
|
fbcc53760e
|
Merge branch 'feature/emojireactvalidator' into 'develop'
Move EmojiReacts to the Pipeline.
See merge request pleroma/pleroma!2473
|
4 years ago |
|
lain
|
7e9aaa0d02
|
Transmogrifier tests: Remove more double tests.
|
4 years ago |
|
lain
|
f1274c3326
|
Transmogrifier tests: Remove double tests.
|
4 years ago |
|
Maksim Pechnikov
|
4d71c4b805
|
fixed 'source' object in verify_credentials
|
4 years ago |
|
lain
|
6acbe45eb2
|
Builder: Extract common features of likes and reactions.
|
4 years ago |
|
lain
|
0cf43391f2
|
Merge branch 'issue/1276-2' into 'develop'
[#1276] added an endpoint for getting unread notification count
See merge request pleroma/pleroma!2392
|
4 years ago |
|
Maksim Pechnikov
|
a081135365
|
revert mix.lock
|
4 years ago |
|
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
|
4 years ago |
|
Maksim Pechnikov
|
b078e0567d
|
Merge branch 'develop' into issue/1276-2
|
4 years ago |
|
Haelwenn
|
769d95644d
|
Merge branch 'feature/restrict-c2s' into 'develop'
AP C2S: Restrict creation to `Note`s for now.
See merge request pleroma/pleroma!2472
|
4 years ago |
|
lain
|
ef55d24054
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
4 years ago |
|
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
|
4 years ago |
|
Mark Felder
|
ea01e647df
|
Test Direct, Public, and Favorite notifications with privacy option
|
4 years ago |
|
lain
|
516ff945ce
|
Merge branch 'openapi/search' into 'develop'
Add OpenAPI spec for SearchController
See merge request pleroma/pleroma!2484
|
4 years ago |
|
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
|
4 years ago |
|
rinpatch
|
eb1f2fcbc6
|
Streamer: Fix wrong argument order when rendering activities to authenticated user
Closes #1747
|
4 years ago |
|
lain
|
d11eea62b1
|
Credo fixes
|
4 years ago |
|
lain
|
7ac0cffb34
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
|
4 years ago |
|
lain
|
788b7e7bbd
|
Merge fixes.
|
4 years ago |
|
lain
|
cda410adfd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
|
4 years ago |
|
lain
|
f0c22df226
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
|
4 years ago |
|
rinpatch
|
b7635bf2b6
|
Merge branch 'fix/downgraded-deps' into 'develop'
Restore mix.lock after 2FA merge
See merge request pleroma/pleroma!2487
|
4 years ago |
|
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.
|
4 years ago |
|
lain
|
8ae4d64d47
|
Apply suggestion to lib/pleroma/notification.ex
|
4 years ago |
|
lain
|
3f867d8e9b
|
Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex
|
4 years ago |
|
lain
|
f57fa2a00d
|
Notifications: Simplify recipient calculation for some Activities.
Fixes the 'getting notfications for other people's posts' bug.
|
4 years ago |
|
Egor Kislitsyn
|
dc4a448f48
|
Add OpenAPI spec for SearchController
|
4 years ago |
|
Egor Kislitsyn
|
cdca62e8d4
|
Add schema for Tag
|
4 years ago |
|
lain
|
4c92dfb73e
|
Merge branch 'openapi/polls' into 'develop'
Add OpenAPI spec for PollController
See merge request pleroma/pleroma!2476
|
4 years ago |
|
lain
|
4061841846
|
Merge branch 'streamer-worker-registry' into 'develop'
Streamer rework
See merge request pleroma/pleroma!2426
|
4 years ago |
|
href
|
9491ba3e49
|
Streamer rework
|
4 years ago |
|
lain
|
f4c2bf0985
|
Merge branch 'issue/209' into 'develop'
[#209] 2FA/two_factor_authentication support
See merge request pleroma/pleroma!801
|
4 years ago |
|
Maksim
|
3d0c567fbc
|
Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController
|
4 years ago |
|
Mark Felder
|
a2580adc91
|
Hide the sender when privacy option is enabled
|
4 years ago |
|
Mark Felder
|
57736c1833
|
Privacy option affects all push notifications, not just Direct Messages
|
4 years ago |
|
lain
|
68a126317d
|
Merge branch 'fix/syslog-compile' into 'develop'
Fix for syslog compile with updated rebar3
See merge request pleroma/pleroma!2482
|
4 years ago |
|
Alexander Strizhakov
|
4b00eb93fe
|
fix for syslog compile with updated rebar3
|
4 years ago |
|
feld
|
a32483f224
|
Merge branch 'docs/chat-in-cheatsheet' into 'develop'
Add :chat to cheatsheet
See merge request pleroma/pleroma!2480
|
4 years ago |
|
rinpatch
|
473b0d9f3d
|
Merge branch 'feature/delete-validator' into 'develop'
Move deletions to the common pipeline
Closes #1497
See merge request pleroma/pleroma!2441
|
4 years ago |
|
Mark Felder
|
d7537a37c7
|
Add :chat to cheatsheet
|
4 years ago |
|
feld
|
b73b173114
|
Merge branch 'fix/apache-cert-chain' into 'develop'
Apache chain issue fix
See merge request pleroma/pleroma!2478
|
4 years ago |
|
Alexander Strizhakov
|
3c42caa85c
|
apache chain issue fix
|
4 years ago |
