29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
2019-09-23 22:35:09 +00:00
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
2019-09-23 22:34:52 +00:00
05a8242325
Merge branch 'clean-up-views' into 'develop'
...
Clean up views
See merge request pleroma/pleroma!1709
2019-09-23 22:33:59 +00:00
e1d2d69c87
Clean up views
2019-09-23 22:33:59 +00:00
db0c00db8b
Merge branch 'emoji-pack-json-pretty' into 'develop'
...
Also pretty print pack.json
See merge request pleroma/pleroma!1710
2019-09-23 22:30:31 +00:00
e63f167f01
Also pretty print pack.json
2019-09-24 00:37:27 +03:00
f60beecfa7
Merge branch 'develop' into 'develop'
...
add tunable for stream uploads, as needed for jortage to work.
See merge request pleroma/pleroma!1708
2019-09-23 20:38:53 +00:00
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
2019-09-23 20:38:53 +00:00
494bb6bac6
updated tests
2019-09-23 22:37:30 +03:00
ad2ffd7ef1
Merge branch 'update-adminfe/2019-09-23' into 'develop'
...
Update AdminFE bundle
See merge request pleroma/pleroma!1707
2019-09-23 19:23:33 +00:00
646bf01608
Update AdminFE bundle
2019-09-23 21:13:39 +02:00
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-23 21:41:57 +03:00
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-23 21:32:50 +03:00
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
2019-09-23 18:20:08 +00:00
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
2019-09-23 21:14:51 +03:00
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
2ad50583f0
Document and test /api/ap/whoami
2019-09-23 19:47:35 +02:00
cf1960d596
Better changelog wording
2019-09-22 23:14:18 +03:00
d72d4757a8
Format
2019-09-22 23:13:48 +03:00
79c3443b60
Update CHANGELOG
2019-09-22 17:00:49 +03:00
c8fdf757c1
I did not put these lines in CHANGELOG
2019-09-22 16:59:37 +03:00
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
f89fe3ac06
Update docs
2019-09-22 16:45:38 +03:00
72a01f1350
Use router helper to generate reset password link
2019-09-22 16:36:59 +03:00
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
2019-09-20 18:27:00 +03:00
472e7b796c
Merge branch 'config/update-mongoose' into 'develop'
...
Make it obvious how to support dual stack for MongooseIM
See merge request pleroma/pleroma!1702
2019-09-20 13:21:07 +00:00
df3feb9412
Make it obvious how to support dual stack for MongooseIM
2019-09-20 13:21:07 +00:00
c4da7499a3
Merge branch 'conversation-docs' into 'develop'
...
API Docs: Document conversation ids.
See merge request pleroma/pleroma!1701
2019-09-19 19:04:55 +00:00
fe4db3b94e
API Docs: Document conversation ids.
2019-09-19 21:01:05 +02:00
c1e011624d
Merge branch 'docs/clients-update' into 'develop'
...
docs/clients.md: Update source code urls
See merge request pleroma/pleroma!1697
2019-09-19 18:01:49 +00:00
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
2019-09-19 16:53:59 +00:00
9aca2cc95d
Add test for correct AP outbox pagination
2019-09-19 16:49:27 +02:00
9c8a94bae2
Merge branch 'direct_conversation_id_on_status_creation' into 'develop'
...
Return `pleroma.direct_conversation_id` when creating a direct message
See merge request pleroma/pleroma!1699
2019-09-19 14:34:24 +00:00
0e6085da10
Fix pagination in AP outbox.json
2019-09-19 16:09:07 +02:00
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19 10:59:09 +03:00
ae1d371428
Update CHANGELOG
2019-09-19 14:57:37 +07:00
95c948110c
Add `rel="ugc"` to hashtags and mentions
2019-09-19 14:56:10 +07:00
d639cdcecb
Update "config/description.exs"
2019-09-19 14:56:10 +07:00
cf3041220a
Add support for `rel="ugc"`
2019-09-19 14:56:10 +07:00
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
2019-09-19 08:59:25 +03:00
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
2019-09-18 22:28:10 +00:00
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
3e972c0456
Add :shared_pack_cache_seconds_per_file to description.exs
2019-09-19 00:23:18 +03:00
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
c3856bed0c
docs/clients.md: Update source code urls
2019-09-18 23:17:15 +02:00
b585134c90
Get the nodeinfo address from the well-known
2019-09-19 00:16:34 +03:00
kaniini