Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
6,856 Commits 1 Branch 0 Tags 222 MiB
27a3221d57
Commit Graph

6856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ekaterina Vaartis
118d6dcdf4 Fix nodeinfo handling 2019-09-25 12:32:19 +02:00
Ekaterina Vaartis
ba9d35a904 Add an API endpoint for listing remote packs 2019-09-25 12:32:19 +02:00
vaartis
a6e85215e1 Credo fix (remove parens on function definition) 2019-09-25 12:32:19 +02:00
vaartis
f21dbbc021 Move emoji_dir_path & cache_seconds_per_file 2019-09-25 12:32:19 +02:00
Ekaterina Vaartis
cdbe7cd37a When listing emoji packs, be sure to create the directory 2019-09-25 12:32:19 +02:00
Maksim Pechnikov
1b2e4a0ae0 clears robot.txt after tests 2019-09-25 13:27:31 +03:00
lain
a150664a0a Merge branch 'issue/1218' into 'develop' 
[#1218] Issue/1218

See merge request pleroma/pleroma!1609
 2019-09-25 10:26:41 +00:00
Egor Kislitsyn
b5dfe83433 Replace Pleroma.FlakeId with flake_id hex package 2019-09-25 17:14:31 +07:00
Maksim Pechnikov
1a858134ed Merge branch 'develop' into issue/1218 2019-09-25 12:24:12 +03:00
Maxim Filippov
60cbea5bb2 Allow activities pagination via limit/offset 2019-09-25 01:25:42 +03:00
Egor Kislitsyn
035f22f784 Fix Credo warnings 2019-09-24 19:50:09 +07:00
Egor Kislitsyn
1bea67cb5e Cleanup Pleroma.User 2019-09-24 19:50:09 +07:00
Egor Kislitsyn
209395c7e6 Add User.change_info/2 and User.update_info/2 2019-09-24 19:50:07 +07:00
Maxim Filippov
5e9759cd7d Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-24 13:00:48 +03:00
Egor Kislitsyn
a66a7a328f Extract notification actions from MastodonAPIController into NotificationController 2019-09-24 15:16:44 +07:00
Egor Kislitsyn
79b25be4e1 Do not return tuple when unneeded 2019-09-24 15:03:20 +07:00
kaniini
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
kaniini
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
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
 2019-09-23 22:35:09 +00:00
kaniini
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
kaniini
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
Steven Fuchs
e1d2d69c87 Clean up views 2019-09-23 22:33:59 +00:00
kaniini
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
Ekaterina Vaartis
e63f167f01 Also pretty print pack.json 2019-09-24 00:37:27 +03:00
rinpatch
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
Rachel Fae Fox
63af6951fa add tunable for stream uploads, as needed for jortage to work. 2019-09-23 20:38:53 +00:00
rinpatch
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
Haelwenn (lanodan) Monnier
646bf01608
Update AdminFE bundle 2019-09-23 21:13:39 +02:00
Maksim Pechnikov
38245f1336 Merge branch 'develop' into test/activity_pub/transmogrifier.ex 2019-09-23 21:32:50 +03:00
rinpatch
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
rinpatch
6b3d5ed6db Emoji API Controller: Follow phoenix directory structure 2019-09-23 21:14:51 +03:00
Maxim Filippov
cf1960d596 Better changelog wording 2019-09-22 23:14:18 +03:00
Maxim Filippov
d72d4757a8 Format 2019-09-22 23:13:48 +03:00
Maxim Filippov
79c3443b60 Update CHANGELOG 2019-09-22 17:00:49 +03:00
Maxim Filippov
c8fdf757c1 I did not put these lines in CHANGELOG 2019-09-22 16:59:37 +03:00
Maxim Filippov
02bbcd6180 Merge branch 'develop' into feature/return-link-for-password-reset 2019-09-22 16:58:39 +03:00
Maxim Filippov
f89fe3ac06 Update docs 2019-09-22 16:45:38 +03:00
Maxim Filippov
72a01f1350 Use router helper to generate reset password link 2019-09-22 16:36:59 +03:00
Maxim Filippov
6f25668215 Admin API: Add ability to force user's password reset 2019-09-22 16:08:07 +03:00
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) 2019-09-20 18:27:00 +03:00
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
 2019-09-20 13:21:07 +00:00
feld
df3feb9412 Make it obvious how to support dual stack for MongooseIM 2019-09-20 13:21:07 +00:00
rinpatch
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
lain
fe4db3b94e API Docs: Document conversation ids. 2019-09-19 21:01:05 +02:00
Haelwenn
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
lain
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
D Anzorge
9aca2cc95d Add test for correct AP outbox pagination 2019-09-19 16:49:27 +02:00
rinpatch
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
D Anzorge
0e6085da10 Fix pagination in AP outbox.json 2019-09-19 16:09:07 +02:00
Egor Kislitsyn
ae1d371428 Update CHANGELOG 2019-09-19 14:57:37 +07:00