Sadposter
|
4af4f6166b
|
honour domain blocks on streaming notifications
|
2019-07-24 11:09:06 +01:00 |
|
kaniini
|
0be548b90a
|
Merge branch 'Fix-static-dir-doc' into 'develop'
Fix static_dir docs
See merge request pleroma/pleroma!1465
|
2019-07-24 01:59:41 +00:00 |
|
aries
|
9638da43e9
|
Add text about gitignore
|
2019-07-24 01:50:56 +00:00 |
|
kaniini
|
9c6357324e
|
Merge branch 'feature/admin-api-user-statuses' into 'develop'
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
|
2019-07-23 23:59:21 +00:00 |
|
kaniini
|
2ae510ee81
|
Merge branch 'bugfix/rich-media-splice-url' into 'develop'
rich media: parser: splice the given URL into the result
See merge request pleroma/pleroma!1480
|
2019-07-23 23:59:06 +00:00 |
|
Ariadne Conill
|
d3bdb8e704
|
rich media: parser: splice the given URL into the result
|
2019-07-23 23:51:29 +00:00 |
|
Maxim Filippov
|
f46805bb40
|
Merge branch 'develop' into feature/admin-api-user-statuses
|
2019-07-24 02:42:28 +03:00 |
|
Maxim Filippov
|
03471151d6
|
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
|
2019-07-24 01:51:36 +03:00 |
|
kaniini
|
1a751529fb
|
Merge branch 'chore/update-mix-lock' into 'develop'
update mix.lock
See merge request pleroma/pleroma!1478
|
2019-07-23 19:59:15 +00:00 |
|
Ariadne Conill
|
0afaf96640
|
update mix.lock
|
2019-07-23 19:49:36 +00:00 |
|
kaniini
|
bd265acf91
|
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
Router: Remove deprecated AdminAPI endpoints
See merge request pleroma/pleroma!1466
|
2019-07-23 19:48:34 +00:00 |
|
sadposter
|
1f8c0953a2
|
add emojo
|
2019-07-23 20:37:04 +01:00 |
|
Haelwenn (lanodan) Monnier
|
90be91b0e0
|
Router: Remove deprecated AdminAPI endpoints
|
2019-07-23 21:35:25 +02:00 |
|
sadposter
|
ef7466921b
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-07-23 20:29:00 +01:00 |
|
kaniini
|
5230b9ef3d
|
Merge branch 'admin-config-fix' into 'develop'
Admin config fix
See merge request pleroma/pleroma!1471
|
2019-07-23 19:17:00 +00:00 |
|
Alexander Strizhakov
|
5e72554f3c
|
Admin config fix
|
2019-07-23 19:17:00 +00:00 |
|
kaniini
|
dd96be5c8b
|
Merge branch 'tests/activity_pub_publisher' into 'develop'
tests for Pleroma.Web.ActivityPub.Publisher
See merge request pleroma/pleroma!1473
|
2019-07-23 19:15:48 +00:00 |
|
Maksim
|
c49a09ed88
|
tests for Pleroma.Web.ActivityPub.Publisher
|
2019-07-23 19:15:48 +00:00 |
|
kaniini
|
8d3cf7e519
|
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
|
2019-07-23 19:14:43 +00:00 |
|
kaniini
|
ad60837300
|
Merge branch 'patch-2' into 'develop'
Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`.
Closes #1050
See merge request pleroma/pleroma!1475
|
2019-07-23 19:14:16 +00:00 |
|
kaniini
|
03d89e182e
|
Merge branch 'fix/subscriber-notifications' into 'develop'
Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477
|
2019-07-23 19:13:55 +00:00 |
|
Mark Felder
|
ec7b085b76
|
Fix test
|
2019-07-23 13:57:22 -05:00 |
|
Mark Felder
|
6a79bb12c3
|
Fix function
|
2019-07-23 13:53:05 -05:00 |
|
Sadposter
|
54a161cb7a
|
move unauth'd user blocks?/2 check
|
2019-07-23 19:44:47 +01:00 |
|
Haelwenn
|
638f772356
|
Merge branch 'bugfix/http-signatures-misskey' into 'develop'
signature: properly deduce the actor from misskey key IDs
See merge request pleroma/pleroma!1476
|
2019-07-23 18:39:01 +00:00 |
|
Mark Felder
|
fd287387a0
|
Do not notify subscribers for messages from users which are replies to others
|
2019-07-23 13:14:26 -05:00 |
|
Ariadne Conill
|
e7c64f106e
|
signature: properly deduce the actor from misskey key IDs
|
2019-07-23 16:47:22 +00:00 |
|
oncletom
|
2e697f87f4
|
Update prometheus_phoenix to v1.3 in order to support phoenix@1.4.
|
2019-07-23 15:16:47 +00:00 |
|
Sadposter
|
c400565427
|
fix test names because i cannot type
|
2019-07-23 15:47:17 +01:00 |
|
Sadposter
|
299c0e965b
|
actually reblog on the reblog test
|
2019-07-23 15:38:19 +01:00 |
|
Sadposter
|
7026018c8c
|
Use correct URL for tests
|
2019-07-23 15:31:35 +01:00 |
|
Sadposter
|
452980652d
|
Mix format
|
2019-07-23 15:13:05 +01:00 |
|
Sadposter
|
fd1fa5a2ec
|
add tests for unauthed reqs to liked/reblogged_by
|
2019-07-23 15:08:41 +01:00 |
|
Sadposter
|
eacf61d823
|
fix unauthenticated req to favourited/rebloggd_by
|
2019-07-23 15:08:33 +01:00 |
|
kPherox
|
e818381042
|
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
|
2019-07-23 19:47:27 +09:00 |
|
Maxim Filippov
|
14ab2fd0f4
|
remove pry
|
2019-07-23 12:30:37 +03:00 |
|
Aries
|
1e7d68e8bf
|
Fix the sentence and add the setting example
|
2019-07-23 09:55:58 +09:00 |
|
kaniini
|
a042a7ac6d
|
Merge branch 'tests/skip-some-tests-on-mac' into 'develop'
Exclude tests that use :crypt.crypt/2 on macOS
See merge request pleroma/pleroma!1470
|
2019-07-22 19:54:22 +00:00 |
|
Sergey Suprunenko
|
9340896c9e
|
Exclude tests that use :crypt.crypt/2 on macOS
|
2019-07-22 19:54:22 +00:00 |
|
kaniini
|
2951714429
|
Merge branch 'changelog' into 'develop'
changelog
See merge request pleroma/pleroma!1469
|
2019-07-22 19:53:53 +00:00 |
|
Alexander Strizhakov
|
2442b5c18e
|
changelog
|
2019-07-22 19:53:53 +00:00 |
|
kaniini
|
4a8b522639
|
Merge branch 'feature/1087-wildcard-option-for-blocks' into 'develop'
Feature/1087 wildcard option for blocks
Closes #1087
See merge request pleroma/pleroma!1467
|
2019-07-22 14:33:58 +00:00 |
|
Alexander Strizhakov
|
b70e659304
|
Feature/1087 wildcard option for blocks
|
2019-07-22 14:33:58 +00:00 |
|
Haelwenn
|
674ad5e1df
|
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
|
2019-07-22 11:01:35 +00:00 |
|
aries
|
63924ee712
|
Fix static_dir docs
|
2019-07-22 18:46:32 +09:00 |
|
sadposter
|
3b5aba6f91
|
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
|
2019-07-22 09:22:18 +01:00 |
|
kaniini
|
7271b2a954
|
Merge branch 'bugfix/muted-user-notif-streaming' into 'develop'
Bugfix: muted/blocked user notification streaming
Closes #1105
See merge request pleroma/pleroma!1461
|
2019-07-22 02:43:55 +00:00 |
|
Sadposter
|
f712ee879a
|
Bugfix: muted/blocked user notification streaming
|
2019-07-22 02:43:55 +00:00 |
|
kaniini
|
24362cbb3c
|
Merge branch 'tests/improve-test-coverage' into 'develop'
Add tests for users tasks and PleromaAuthenticator
See merge request pleroma/pleroma!1462
|
2019-07-22 02:43:15 +00:00 |
|
Sergey Suprunenko
|
05b5af8075
|
Add tests for users tasks and PleromaAuthenticator
|
2019-07-22 02:43:15 +00:00 |
|