rinpatch
|
b6d1bcc55d
|
include eldap in OTP releases
Closes #1313
|
2020-05-09 15:17:12 +03:00 |
|
|
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
|
2020-05-09 08:10:56 +00: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
|
df82ee4179
|
Merge branch 'chore/changelog-sync' into 'develop'
CHANGELOG.md: Add entries from 2.0.3
See merge request pleroma/pleroma!2498
|
2020-05-08 20:56:16 +00:00 |
|
|
rinpatch
|
f4d50fbd81
|
CHANGELOG.md: Add entries from 2.0.3
|
2020-05-08 23:54:16 +03:00 |
|
|
feld
|
3a014dd609
|
Merge branch 'chore/description-grammar' into 'develop'
Minor grammar nit
See merge request pleroma/pleroma!2496
|
2020-05-08 19:48:39 +00:00 |
|
|
Mark Felder
|
c9344b5f2d
|
Minor grammar nit
|
2020-05-08 14:36:59 -05:00 |
|
|
feld
|
65299daa85
|
Merge branch 'fix/adminfe-icons' into 'develop'
Restore deleted icons. No idea how this happened.
See merge request pleroma/pleroma!2495
|
2020-05-08 19:34:12 +00:00 |
|
|
Mark Felder
|
6a291b1834
|
Restore deleted icons. No idea how this happened.
|
2020-05-08 14:22:49 -05:00 |
|
|
Ivan Tashkinov
|
b2924ab1fb
|
Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding
|
2020-05-08 21:37:55 +03:00 |
|
|
Ivan Tashkinov
|
0e1bda55e8
|
PleromaFE bundle dropping requirement for embedded account relationships in statuses / notifications.
7a0e554daf
|
2020-05-08 21:33:56 +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 |
|
|
Alexander Strizhakov
|
287f781808
|
user deletion
|
2020-05-08 17:11:17 +03: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 |
|
|
lain
|
7e9aaa0d02
|
Transmogrifier tests: Remove more double tests.
|
2020-05-08 11:43:07 +02:00 |
|
|
lain
|
f1274c3326
|
Transmogrifier tests: Remove double tests.
|
2020-05-08 11:41:13 +02: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 |
|
|
Maksim Pechnikov
|
a081135365
|
revert mix.lock
|
2020-05-08 12:06:24 +03: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 |
|
|
Mark Felder
|
ea01e647df
|
Test Direct, Public, and Favorite notifications with privacy option
|
2020-05-07 09:13:43 -05: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
|
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
|
2020-05-07 13:26:29 +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
|
cda410adfd
|
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/undo-validator-reduced
|
2020-05-07 14:45:35 +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 |
|
|
rinpatch
|
b7635bf2b6
|
Merge branch 'fix/downgraded-deps' into 'develop'
Restore mix.lock after 2FA merge
See merge request pleroma/pleroma!2487
|
2020-05-07 11:47:11 +00:00 |
|
|
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.
|
2020-05-07 14:35:29 +03: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 |
|
|
lain
|
f4c2bf0985
|
Merge branch 'issue/209' into 'develop'
[#209] 2FA/two_factor_authentication support
See merge request pleroma/pleroma!801
|
2020-05-07 08:14:54 +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 |
|
|
lain
|
68a126317d
|
Merge branch 'fix/syslog-compile' into 'develop'
Fix for syslog compile with updated rebar3
See merge request pleroma/pleroma!2482
|
2020-05-06 15:44:21 +00:00 |
|
|
Alexander Strizhakov
|
4b00eb93fe
|
fix for syslog compile with updated rebar3
|
2020-05-06 18:04:16 +03:00 |
|