sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,553 Commits 1 Branch 0 Tags 184 MiB
3eff542678
Commit Graph

5930 Commits

Author SHA1 Message Date
Stephanie Wilde-Hobbs
20cbfb5cb5
Allow whitelisting whole groups 2020-05-14 12:43:53 +01:00
Steph
5c6f575315
Style fixes 2020-05-14 12:15:48 +01:00
Stephanie Wilde-Hobbs
a2fcfc78c9
Filter config descriptions by config whitelist 2020-05-12 21:07:33 +01:00
Stephanie Wilde-Hobbs
620247a015
Add database configuration whitelist 2020-05-12 17:12:27 +01:00
rinpatch
f8190aea5e Merge branch 'fix/issue-1676' into 'develop' 
[#1676] fixed 'source' object in verify_credentials

See merge request pleroma/pleroma!2492
 2020-05-11 22:30:36 +00:00
href
e2b15e8ad3 Fix streamer timeout (closes #1753). 
Cowboy handles automatically responding to the client's ping, but
doesn't automatically send a :ping frame to the client.
 2020-05-11 16:51:34 +02:00
lain
5367a00257 Deletion: Handle the case of pruned objects. 2020-05-11 15:06:23 +02:00
rinpatch
30eaef9d61 healthcheck: report real amount of memory allocated by beam 
as opposed to memory currently in use
 2020-05-08 23:57:47 +03:00
rinpatch
570940a3fd Merge branch 'bugfix/fix-like-notifications' into 'develop' 
Notifications: Simplify recipient calculation for some Activities.

See merge request pleroma/pleroma!2486
 2020-05-08 15:00:43 +00:00
lain
fbcc53760e Merge branch 'feature/emojireactvalidator' into 'develop' 
Move EmojiReacts to the Pipeline.

See merge request pleroma/pleroma!2473
 2020-05-08 10:41:41 +00:00
Maksim Pechnikov
4d71c4b805 fixed 'source' object in verify_credentials 2020-05-08 12:35:34 +03:00
lain
6acbe45eb2 Builder: Extract common features of likes and reactions. 2020-05-08 11:30:31 +02:00
lain
0cf43391f2 Merge branch 'issue/1276-2' into 'develop' 
[#1276] added an endpoint for getting unread notification count

See merge request pleroma/pleroma!2392
 2020-05-08 09:23:01 +00:00
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
 2020-05-08 09:04:24 +00:00
Maksim Pechnikov
b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +03:00
Haelwenn
769d95644d Merge branch 'feature/restrict-c2s' into 'develop' 
AP C2S: Restrict creation to `Note`s for now.

See merge request pleroma/pleroma!2472
 2020-05-07 22:29:16 +00:00
lain
ef55d24054 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 18:53:34 +02:00
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
 2020-05-07 14:28:10 +00:00
lain
516ff945ce Merge branch 'openapi/search' into 'develop' 
Add OpenAPI spec for SearchController

See merge request pleroma/pleroma!2484
 2020-05-07 13:38:34 +00:00
rinpatch
eb1f2fcbc6 Streamer: Fix wrong argument order when rendering activities to authenticated user 
Closes #1747
 2020-05-07 16:13:24 +03:00
lain
d11eea62b1 Credo fixes 2020-05-07 15:09:37 +02:00
lain
7ac0cffb34 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator 2020-05-07 15:03:12 +02:00
lain
788b7e7bbd Merge fixes. 2020-05-07 14:52:37 +02:00
lain
f0c22df226 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced 2020-05-07 14:45:20 +02:00
lain
8ae4d64d47 Apply suggestion to lib/pleroma/notification.ex 2020-05-07 11:01:52 +00:00
lain
3f867d8e9b Apply suggestion to lib/pleroma/web/api_spec/operations/search_operation.ex 2020-05-07 10:48:09 +00:00
lain
f57fa2a00d Notifications: Simplify recipient calculation for some Activities. 
Fixes the 'getting notfications for other people's posts' bug.
 2020-05-07 12:43:30 +02:00
Egor Kislitsyn
dc4a448f48
Add OpenAPI spec for SearchController 2020-05-07 14:04:48 +04:00
Egor Kislitsyn
cdca62e8d4
Add schema for Tag 2020-05-07 14:04:07 +04:00
lain
4c92dfb73e Merge branch 'openapi/polls' into 'develop' 
Add OpenAPI spec for PollController

See merge request pleroma/pleroma!2476
 2020-05-07 09:19:45 +00:00
lain
4061841846 Merge branch 'streamer-worker-registry' into 'develop' 
Streamer rework

See merge request pleroma/pleroma!2426
 2020-05-07 09:13:32 +00:00
href
9491ba3e49 Streamer rework 2020-05-07 09:13:32 +00:00
Maksim
3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
Mark Felder
a2580adc91 Hide the sender when privacy option is enabled 2020-05-06 16:42:27 -05:00
Mark Felder
57736c1833 Privacy option affects all push notifications, not just Direct Messages 2020-05-06 16:30:05 -05:00
rinpatch
473b0d9f3d Merge branch 'feature/delete-validator' into 'develop' 
Move deletions to the common pipeline

Closes #1497

See merge request pleroma/pleroma!2441
 2020-05-06 14:32:58 +00:00
Maksim Pechnikov
bd261309cc added unread_notifications_count for /api/v1/accounts/verify_credentials 2020-05-06 15:08:38 +03:00
Maksim Pechnikov
8b97b6f5ba Merge branch 'develop' into issue/1276-2 2020-05-06 14:47:50 +03:00
Egor Kislitsyn
06c69c0a0a
Fix description 2020-05-06 14:18:19 +04:00
lain
07e7c80bc9 Merge branch 'plug-if-unless-func-options-refactoring' into 'develop' 
Refactoring of :if_func / :unless_func plug options

See merge request pleroma/pleroma!2446
 2020-05-06 09:14:05 +00:00
lain
a716543267 Merge branch 'openapi/subscriptions' into 'develop' 
Add OpenAPI spec for SubscriptionController

See merge request pleroma/pleroma!2444
 2020-05-06 09:10:17 +00:00
lain
61ea8f1f5a Merge branch 'openapi/markers' into 'develop' 
Add OpenAPI spec for MarkerController

See merge request pleroma/pleroma!2386
 2020-05-06 09:06:50 +00:00
lain
df846eda71 Merge branch 'bugfix/sensitive_object' into 'develop' 
Transmogrifier.set_sensitive/1: Keep sensitive set to true

Closes #954

See merge request pleroma/pleroma!2470
 2020-05-06 09:04:13 +00:00
lain
c3f1ce80eb Merge branch 'fix/1726-user-pagination' into 'develop' 
Pagination fix for service users filters in admin api

Closes #1726

See merge request pleroma/pleroma!2452
 2020-05-06 09:01:42 +00:00
lain
0a88bf6a9d Merge branch 'openapi/follow_requests' into 'develop' 
Add OpenAPI spec for FollowRequestController

See merge request pleroma/pleroma!2448
 2020-05-06 09:00:39 +00:00
lain
957172a307 Merge branch 'openapi/filters' into 'develop' 
Add OpenAPI spec for FilterController

See merge request pleroma/pleroma!2382
 2020-05-06 08:51:10 +00:00
lain
f84c8f2f0d Merge branch 'feature/1728-webfinger-acct-scheme' into 'develop' 
Webfinger: Request account info with the acct scheme

Closes #1728

See merge request pleroma/pleroma!2465
 2020-05-06 08:46:45 +00:00
lain
1ee34d4acb Merge branch 'openapi/instance' into 'develop' 
Add OpenAPI spec for InstanceController

See merge request pleroma/pleroma!2450
 2020-05-06 08:46:14 +00:00
lain
7fdc7078ae Merge branch 'openapi/lists' into 'develop' 
Add OpenAPI spec for ListController

See merge request pleroma/pleroma!2453
 2020-05-06 08:43:21 +00:00
lain
76c1a7a34b Merge branch 'openapi/conversations' into 'develop' 
Add OpenAPI spec for ConversationController

See merge request pleroma/pleroma!2445
 2020-05-06 08:40:04 +00:00