fedward/distraction.party
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
5658 commits 4 branches 73 tags 294 MiB
Commit graph

2879 commits

Author SHA1 Message Date
kaniini
0369a5db16 Merge branch 'idempotency-plug' into 'develop' 
Add IdempotencyPlug and use it in all of the api

Closes #1003

See merge request pleroma/pleroma!1339
 2019-06-27 04:20:17 +00:00
Alexander Strizhakov
c6705144a2 don't delete config settings on admin update 2019-06-27 04:19:44 +00:00
Egor Kislitsyn
889a9c3a3f Polish IdempotencyPlug 2019-06-27 01:53:58 +07:00
Egor Kislitsyn
0b8aeac0f3 Remove previous idempotency implementation from post_status 2019-06-26 18:49:14 +07:00
Egor Kislitsyn
74132e3715 Enable IdempotencyPlug for the all API 2019-06-26 18:42:49 +07:00
Sergey Suprunenko
d53fb55bb7 Return correct response when reply to a direct message is not direct itself 2019-06-26 10:59:27 +00:00
kaniini
24bcc209f9 Merge branch 'refactoring/fix_render_view' into 'develop' 
Fix Controller.render/4 deprecation

See merge request pleroma/pleroma!1337
 2019-06-26 05:34:26 +00:00
Maksim Pechnikov
5c0f646cef fix validate_page_url 2019-06-26 06:27:17 +03:00
Roman Chvanikov
a7a54068f9 Fix Controller.render/4 deprecation 2019-06-26 03:28:02 +03:00
Maksim Pechnikov
4ad15ad2a9 add ignore hosts and TLDs for rich_media 2019-06-25 22:25:37 +03:00
Maksim Pechnikov
0276cf5a02 fix validate_url for private ip 2019-06-25 17:44:24 +03:00
Maksim
a0c4ebb4d7 [#184] small refactoring reset password 2019-06-24 19:01:56 +00:00
Sergey Suprunenko
2c63c67512 Rework user deletion 2019-06-24 18:59:12 +00:00
Eugenij
f2c03425b0 Broadcast conversation update when DM is deleted 2019-06-24 07:14:04 +00:00
kaniini
27b9605de0 Merge branch 'rich_media_titles_two' into 'develop' 
Rich media titles two

See merge request pleroma/pleroma!1325
 2019-06-23 05:43:11 +00:00
Alex S
982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
Alex S
410add1c30 support for tuples with more than 2 values 2019-06-22 17:30:53 +03:00
lain
0e415921cd Rich Media Parser: Do not return just a title if nothing else is there. 2019-06-22 16:22:59 +02:00
lain
58c4d5312b Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'"" 
This reverts commit b6af80f769.
 2019-06-22 15:12:57 +02:00
Alex S
f0fccb7578 fix for int and modules 2019-06-22 09:01:30 +03:00
kaniini
55742d978d Merge branch 'feature/mrf-anti-link-spam' into 'develop' 
implement anti link spam MRF

See merge request pleroma/pleroma!1307
 2019-06-21 22:56:54 +00:00
kaniini
e3534f5b3c Merge branch 'oauth_secure_redirect' into 'develop' 
OAuth security improvements (`redirect_uri` listing enforcement)

See merge request pleroma/pleroma!1302
 2019-06-21 22:31:12 +00:00
William Pitcock
127a5a7d65 change the anti-link-spam MRF implementation to use old_user? instead of the previous name 2019-06-21 22:27:14 +00:00
feld
b6af80f769 Revert "Merge branch 'fix/ogp-title' into 'develop'" 
This reverts merge request !1277
 2019-06-21 11:36:32 +00:00
William Pitcock
21dacd4b15 unbreak polls 2019-06-19 16:33:49 +00:00
William Pitcock
736d8ad6be implement anti link spam MRF 2019-06-19 15:58:32 +00:00
rinpatch
df2dab69a7 Merge branch 'begone-the-dot-hack' into 'develop' 
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits

See merge request pleroma/pleroma!1298
 2019-06-19 10:22:23 +00:00
lain
966317e052 Merge branch 'deps/update-auto-linker' into 'develop' 
Deps: Update auto_linker

See merge request pleroma/pleroma!1300
 2019-06-18 20:47:36 +00:00
Ivan Tashkinov
64bc7ac619 Minor edit (comment). 2019-06-18 17:15:26 +03:00
Ivan Tashkinov
9f45f93949 Added more redirect_uri checks to prevent redirect to not explicitly listed URI. 2019-06-18 17:00:49 +03:00
rinpatch
f30a3241d2 Deps: Update auto_linker 2019-06-18 16:08:18 +03:00
rinpatch
c7acca2abb Mastodon API: Sanitize display names 
Closes #1000
 2019-06-18 14:12:11 +03:00
rinpatch
c4e4f7d0e4 Add proper error handling for when the post exceeds character limits 2019-06-18 05:05:05 +03:00
rinpatch
dce27de733 Mastodon API: Remove the dot hack 2019-06-18 05:04:41 +03:00
rinpatch
49a49d3763 Merge branch 'removing-test-errors' into 'develop' 
Removing test errors

See merge request pleroma/pleroma!1296
 2019-06-17 14:16:23 +00:00
Haelwenn
c34327b22e Merge branch 'fix/sanitize-report-content' into 'develop' 
Sanitize HTML in ReportView

Closes #990

See merge request pleroma/pleroma!1293
 2019-06-16 18:05:00 +00:00
Alex S
0f59265a50 salmon fix 
removed some ownership sandbox error
 2019-06-16 20:10:12 +08:00
Maksim
a04bf131e0 [#570] add user:notification stream 2019-06-16 10:33:25 +00:00
rinpatch
bf6aa6f1a8 Fix report content stopping to be nullable 2019-06-16 13:06:12 +03:00
rinpatch
44de34d170 Credo fixes 2019-06-16 01:35:45 +03:00
rinpatch
641bcaa44e Sanitize HTML in ReportView 
Closes #990
 2019-06-16 01:30:32 +03:00
lain
135c196769 Merge branch 'bugfix/980-polls-double-vote' into 'develop' 
MastodonAPI Controller: Band-Aid double vote problem.

See merge request pleroma/pleroma!1275
 2019-06-15 15:13:48 +00:00
lain
37ee6c6e2c Merge branch 'update/phoenix-and-plug' into 'develop' 
Update Phoenix

See merge request pleroma/pleroma!1290
 2019-06-15 15:09:14 +00:00
kaniini
52b1b0e45d Merge branch '963_oob_oauth_redirect_fix' into 'develop' 
[#963] No redirect on OOB OAuth authorize request with existing authorization

See merge request pleroma/pleroma!1276
 2019-06-15 13:45:50 +00:00
Mark Felder
9b908697dd OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f 
and this leftover artifact breaks compiling now.
 2019-06-15 07:04:01 -05:00
lain
a440cf856d Mastodon API: Return the token needed for the chat. 2019-06-15 10:59:35 +02:00
rinpatch
62ffc00a5d Merge branch 'feature/add-background-image-to-mastoapi' into 'develop' 
AccountView: Add user background.

See merge request pleroma/pleroma!1280
 2019-06-14 16:49:28 +00:00
Alexander Strizhakov
c2ca1f22a2 it is changed in compile time 
we can't change module attributes and endpoint settings in runtime
 2019-06-14 15:45:05 +00:00
Maksim
ee4ed87fb4 [#948] /api/v1/account_search added optional parameters (limit, offset, following) 2019-06-14 11:39:57 +00:00
lain
eac298083f MastodonAPI: Add a way to update the background image. 2019-06-14 11:19:22 +02:00