Maksim
dd4263da5a
Apply suggestion to test/tasks/instance_test.exs
5 years ago
rinpatch
98be68e91b
Merge branch 'emoji-packs-create-dir' into 'develop'
...
When listing emoji packs, be sure to create the directory + add an endpoint to list remote packs since JS can't do that
See merge request pleroma/pleroma!1711
5 years ago
rinpatch
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
rinpatch
f2880d7d29
Credo considered harmful
5 years ago
rinpatch
c7d8ccd0c4
Remove useless with clause
5 years ago
rinpatch
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
5 years ago
Ekaterina Vaartis
1fd9c60f87
Fix emoji tags for shareable packs to be "pack:{name}"
5 years ago
Ekaterina Vaartis
118d6dcdf4
Fix nodeinfo handling
5 years ago
Ekaterina Vaartis
ba9d35a904
Add an API endpoint for listing remote packs
5 years ago
vaartis
a6e85215e1
Credo fix (remove parens on function definition)
5 years ago
vaartis
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
5 years ago
Ekaterina Vaartis
cdbe7cd37a
When listing emoji packs, be sure to create the directory
5 years ago
Maksim Pechnikov
1b2e4a0ae0
clears `robot.txt` after tests
5 years ago
lain
a150664a0a
Merge branch 'issue/1218' into 'develop'
...
[#1218 ] Issue/1218
See merge request pleroma/pleroma!1609
5 years ago
Egor Kislitsyn
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
Maxim Filippov
60cbea5bb2
Allow activities pagination via limit/offset
5 years ago
Egor Kislitsyn
035f22f784
Fix Credo warnings
5 years ago
Egor Kislitsyn
1bea67cb5e
Cleanup Pleroma.User
5 years ago
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Egor Kislitsyn
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
5 years ago
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
kaniini
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
5 years ago
kaniini
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
5 years ago
kaniini
05a8242325
Merge branch 'clean-up-views' into 'develop'
...
Clean up views
See merge request pleroma/pleroma!1709
5 years ago
Steven Fuchs
e1d2d69c87
Clean up views
5 years ago
kaniini
db0c00db8b
Merge branch 'emoji-pack-json-pretty' into 'develop'
...
Also pretty print pack.json
See merge request pleroma/pleroma!1710
5 years ago
Ekaterina Vaartis
e63f167f01
Also pretty print pack.json
5 years ago
rinpatch
f60beecfa7
Merge branch 'develop' into 'develop'
...
add tunable for stream uploads, as needed for jortage to work.
See merge request pleroma/pleroma!1708
5 years ago
Rachel Fae Fox
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
5 years ago
rinpatch
ad2ffd7ef1
Merge branch 'update-adminfe/2019-09-23' into 'develop'
...
Update AdminFE bundle
See merge request pleroma/pleroma!1707
5 years ago
Haelwenn (lanodan) Monnier
646bf01608
Update AdminFE bundle
5 years ago
Maksim Pechnikov
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
5 years ago
rinpatch
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
5 years ago
Maxim Filippov
cf1960d596
Better changelog wording
5 years ago
Maxim Filippov
d72d4757a8
Format
5 years ago
Maxim Filippov
79c3443b60
Update CHANGELOG
5 years ago
Maxim Filippov
c8fdf757c1
I did not put these lines in CHANGELOG
5 years ago
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Maxim Filippov
f89fe3ac06
Update docs
5 years ago
Maxim Filippov
72a01f1350
Use router helper to generate reset password link
5 years ago
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
eugenijm
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`)
5 years ago
Haelwenn
472e7b796c
Merge branch 'config/update-mongoose' into 'develop'
...
Make it obvious how to support dual stack for MongooseIM
See merge request pleroma/pleroma!1702
5 years ago
feld
df3feb9412
Make it obvious how to support dual stack for MongooseIM
5 years ago