knova/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
3230 commits 9 branches 75 tags 292 MiB
Commit graph

480 commits

Author SHA1 Message Date
lambda
52ac7dce5c Merge branch 'captcha' into 'develop' 
Captcha

See merge request pleroma/pleroma!550
 2018-12-17 19:45:14 +00:00
raeno
cc87880488 Support both OAuth token record and token string in UserView 2018-12-17 16:02:26 +01:00
href
f672555ad3
Upgrade to Phoenix 1.4 2018-12-16 17:15:07 +01:00
Ekaterina Vaartis
23549d3952 Formatting fixes 2018-12-15 22:08:26 +03:00
lambda
cc6689cc20 Merge branch 'fix/views-ignore-unhandled-activites' into 'develop' 
TwitterAPI.ActivityView: Ignore unhandled activities

See merge request pleroma/pleroma!547
 2018-12-15 15:23:51 +00:00
Ekaterina Vaartis
28c43a417e Add an ability to disabled captcha 2018-12-15 03:12:47 +03:00
Ekaterina Vaartis
a2399c1c7c Add base CAPTCHA support (currently only kocaptcha) 2018-12-15 03:12:44 +03:00
href
e74f384b68 Merge branch 'fix/issue_433' into 'develop' 
[#433] fix markdown formatting

See merge request pleroma/pleroma!545
 2018-12-14 20:30:35 +00:00
href
bfe27c1b55 Merge branch '114_email_invites' into 'develop' 
[#114] Email invites

See merge request pleroma/pleroma!541
 2018-12-14 20:22:24 +00:00
href
980131b4db Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop' 
Improve web push

Closes #393, #422, and #452

See merge request pleroma/pleroma!524
 2018-12-14 18:50:44 +00:00
href
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities 2018-12-14 18:09:59 +01:00
Maksim Pechnikov
baead4ea4b fix markdown formatting 2018-12-14 16:03:58 +03:00
href
91236c60c7 Merge branch 'feature/file-size-checking' into 'develop' 
[#36] Add warnings when file upload fails

See merge request pleroma/pleroma!523
 2018-12-14 13:00:24 +00:00
href
331396cbcd
Properly disable Web Push if no VAPID key is set 2018-12-14 13:05:51 +01:00
Ivan Tashkinov
66380b0641 [#114] Removed confirm_email action stub (to be addressed in a separate MR). 2018-12-14 14:01:00 +03:00
Ivan Tashkinov
9666376f5f [#114] Readded invites_enabled config setting, updated readme. 2018-12-14 12:37:06 +03:00
Ivan Tashkinov
a89e3b4b60 [#114] Moved email_invite action to AdminAPIController, adjusted tests. 2018-12-14 12:28:23 +03:00
Ivan Tashkinov
3cbf16a5fe [#114] Added UserInviteToken creation, adjusted invitation email link to include it. 2018-12-14 12:28:22 +03:00
Ivan Tashkinov
cc83d7ffe7 [#114] Naive implementation of email invitations. 2018-12-14 12:28:14 +03:00
href
30dc81667c Merge branch '114_user_registration_emails' into 'develop' 
[#114] User registration emails

Closes #114

See merge request pleroma/pleroma!531
 2018-12-14 09:16:03 +00:00
Ivan Tashkinov
f81213910f [#114] Addressed MR comments. Removed functionality to be extracted to other MRs. 2018-12-14 12:09:55 +03:00
eal
61ad2ce422 TwitterAPI: Include favorited post in json 2018-12-14 08:24:18 +02:00
Ivan Tashkinov
18b9467d1a [#114] Removed email_invite implementation (to be addressed separately). 2018-12-13 16:22:42 +03:00
Ivan Tashkinov
00744c6b03 [#114] Initial implementation of user email invitations. 2018-12-13 14:30:48 +03:00
Ivan Tashkinov
908943352f [#114] Refactored password_reset (moved to TwitterAPI). Added homepage links to password reset result pages. 2018-12-13 13:17:49 +03:00
Ivan Tashkinov
bfff2399ff [#114] Routes and config for confirm_email and email_invite (Twitter API). 2018-12-12 20:15:43 +03:00
Ivan Tashkinov
e3a21bcd45 [#114] Addressed warnings. Fix of with statement clause in password_reset. 2018-12-12 17:14:31 +03:00
Ivan Tashkinov
f5afb11032 [#114] Initial implementation of user password reset emails (user-initiated). 2018-12-12 17:04:39 +03:00
scarlett
213176c3c3 Add new frontend options to server-side config. 2018-12-10 23:15:01 +00:00
Maksim Pechnikov
074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
Rin Toshaka
15616eda5e Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content 2018-12-08 21:48:49 +01:00
Rin Toshaka
578051809f Add uploadlimit to Twitter API config 2018-12-07 20:03:30 +01:00
lambda
94d8f1ab30 Merge branch '394_user_tags' into 'develop' 
[#394] User tags

Closes #394

See merge request pleroma/pleroma!508
 2018-12-07 18:25:38 +00:00
Ivan Tashkinov
7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map. 2018-12-06 22:26:25 +03:00
Ivan Tashkinov
7bcb6a183a [#394] Refactoring. 2018-12-06 20:23:16 +03:00
Ivan Tashkinov
7b19487389 [#394] Added users.tags and admin routes to tag and untag users. Added tests. 2018-12-06 20:06:50 +03:00
Egor Kislitsyn
4944498133 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
 2018-12-06 20:15:16 +07:00
Egor Kislitsyn
8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions 
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
 2018-12-06 19:55:58 +07:00
Egor Kislitsyn
04a48286e6 Add web push support 2018-12-06 19:29:04 +07:00
kaniini
ccf0b46dd6 Merge branch '210_twitter_api_uploads_alt_text' into 'develop' 
[#210] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.

See merge request pleroma/pleroma!496
 2018-12-06 07:36:21 +00:00
Ivan Tashkinov
3e90f688f1 [#210] Mastodon: actor storing for media uploads, ownership check to update_media. 
Refactoring.
 2018-12-06 10:26:17 +03:00
lain
76d6b1c6ab Merge remote-tracking branch 'origin' into follower-hiding 2018-12-05 21:27:56 +01:00
lain
fdac215091 TwitterAPI: Show users their own network. 2018-12-05 21:14:06 +01:00
lain
839526a913 TwitterAPI: Add network hiding. 2018-12-05 19:22:40 +01:00
Ivan Tashkinov
848151f7cb [#210] [TwitterAPI] Made actor be stored for uploads. Added ownership check 
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
 2018-12-05 13:37:06 +03:00
Ivan Tashkinov
be187f82f7 [#210] Further refactoring. 2018-12-05 11:48:50 +03:00
Ivan Tashkinov
48e6193bf2 [#210] Refactoring. 2018-12-04 19:24:41 +03:00
Ivan Tashkinov
826fc446d5 [#210] TwitterAPI: implemented /api/media/metadata/create 
to allow uploads description (alt text) setting.
 2018-12-04 18:35:57 +03:00
Maxim Filippov
ce98d5eb9b Parse user's bio on register 2018-12-02 22:03:53 +03:00
lain
8c9a4e8b40 TwitterAPI: Implement hide_network. 2018-12-02 18:14:13 +01:00
lain
93f2dc19d9 TwitterAPI: Fix banner and background update. 2018-12-01 12:01:22 +01:00
lain
c443c9bd72 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info 2018-12-01 09:55:46 +01:00
href
02d3dc6869
Uploads fun, part. 2 2018-11-30 18:02:37 +01:00
href
b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
lain
d0ec2812bd Merge remote-tracking branch 'origin' into validate-user-info 2018-11-30 17:34:20 +01:00
lain
d407f662af Fix TwitterApiController. 2018-11-30 17:07:37 +01:00
lain
a6812bc9df Remove "most recent notification" endpoint. 2018-11-30 16:47:37 +01:00
href
bc5cf2c192
Improved version string 2018-11-20 17:55:03 +01:00
lain
fbb70d25fe Several twitter api fixes. 2018-11-18 22:36:47 +01:00
lain
f87b315618 TwitterAPI: Fix dm_timeline displaying only half of the conversation. 2018-11-16 19:47:36 +01:00
lain
7b170cd616 Add Pleroma user search api for PleromaFE. 2018-11-14 20:33:23 +01:00
lain
ea9a776d7b TwitterApi: Add direct message endpoint 2018-11-13 20:08:50 +01:00
scarlett
cb6fd73861 Twitter API: Fall back to user.nickname if user has no name 2018-11-12 15:52:13 +00:00
kaniini
4d627a5117 Merge branch 'feature/qvitter-notifications-dismiss' into 'develop' 
qvitter notifications: add new "read notifications" API

See merge request pleroma/pleroma!431
 2018-11-07 22:33:06 +00:00
kaniini
b451a92d78 Merge branch 'runtime-config' into 'develop' 
Runtime configuration

See merge request pleroma/pleroma!430
 2018-11-07 22:32:34 +00:00
William Pitcock
b2105a3131 twitterapi: add notification read endpoint 2018-11-06 23:25:07 +00:00
href
5bb88fd174
Runtime configuration 
Related to #85

Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
 2018-11-06 19:41:15 +01:00
kaniini
0f3e78addb Merge branch 'runtime-router' into 'develop' 
Runtime configured router

See merge request pleroma/pleroma!426
 2018-11-06 15:35:19 +00:00
href
013f7ba8c1
Add federating plug & public tests 2018-11-06 14:45:04 +01:00
href
6fe23c5458
Runtime configured router 2018-11-05 15:19:03 +01:00
href
763fc7b44f
Runtime configured emojis 
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.

This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
 2018-11-05 13:24:00 +01:00
Haelwenn (lanodan) Monnier
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo 2018-11-01 15:07:27 +01:00
William Pitcock
24ba08de13 twitter api: add support for rendering Page objects 2018-11-01 10:01:35 +00:00
William Pitcock
e12489e2fe twitter api: enforce upload limits for avatars, banners and backgrounds 2018-10-29 16:43:05 +00:00
William Pitcock
5c6ec2d9fc twitter/mastodon api: always use mediaproxy URLs in attachments 
if using local media, the mediaproxy will not replace the URL anyway.
 2018-10-29 15:19:32 +00:00
William Pitcock
26eb11c172 activitypub: add support for filtering broken threads out of timelines 2018-10-26 06:16:51 +00:00
William Pitcock
1ed25c963a twitterapi: activity view: add the other in_reply_to fields 2018-10-25 04:04:04 +00:00
William Pitcock
fee43ae5e7 twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper 2018-10-25 02:59:04 +00:00
scarlett
a253c1466e New frontend options 2018-10-21 12:52:52 +01:00
scarlett
7562912f6a Use maybe_direct_follow for follow imports 2018-10-17 04:16:11 +01:00
William Pitcock
7b3fff9af8 {mastodon api, twitter api}: make the follow handshake timeout configurable 2018-10-07 01:05:59 +00:00
William Pitcock
e69faf550c user: add wait_and_refresh() for async three-way handshake case 2018-10-05 23:40:49 +00:00
William Pitcock
16307da311 twitterapi: frontend config: add formattingOptionsEnabled 2018-10-05 20:49:34 +00:00
William Pitcock
b1be9415ef Revert "Merge branch 'revert-a26d5e6b' into 'develop'" 
This reverts commit d31bbb1cfe, reversing
changes made to 340ab3cb90.
 2018-10-05 20:49:34 +00:00
Haelwenn (lanodan) Monnier
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields" 2018-09-28 10:44:45 +02:00
William Pitcock
56577d8b48 twitter api: add no_rich_text option to userview for account prefs 2018-09-22 03:24:40 +00:00
William Pitcock
c2b69798dd twitter api: add support for disabling rich text 2018-09-22 02:53:02 +00:00
William Pitcock
2f5b026548 twitter api: add support for user-specified html policy 2018-09-22 02:53:01 +00:00
William Pitcock
c9585ec007 twitter api: fix mimetype fallback when attachments use a URI instead of a URL object 2018-09-19 04:59:26 +00:00
William Pitcock
e82ce2a4b3 formatting 2018-09-10 00:28:40 +00:00
William Pitcock
ac486fc59b everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly 2018-09-10 00:14:47 +00:00
kaniini
b7923aa304 Merge branch 'hotfix_broken_likes' into 'develop' 
hotfix for broken like completely breaking the notifications API

See merge request pleroma/pleroma!284
 2018-09-02 12:37:00 +00:00
William Pitcock
e2ce0e9e05 run mix format. 2018-09-01 21:12:42 +00:00
William Pitcock
c921d99898 config: add ability to disable Pleroma FE config management (closes #276) 2018-09-01 21:05:32 +00:00
lambda
58539e1357 Revert "Merge branch 'feature/rich-text' into 'develop'" 
This reverts merge request !309
 2018-08-31 09:51:20 +00:00
William Pitcock
856b5e1ca4 config: chase pleroma-fe updates from MR pleroma-fe!324. 2018-08-31 04:01:21 +00:00
William Pitcock
6aa65b68b8 common api: add support for formatting messages outside of twitter-style plain text 2018-08-31 03:13:59 +00:00
Henry Jameson
0f1c629d65 better solution, added test. 2018-08-27 17:07:26 +03:00
hakabahitoyo
946a0769c4 remove unused settings from /api/statusnet/config 2018-08-26 17:40:15 +09:00
William Pitcock
aab2bdddf4 twitter api: provide object descriptions as attachment description field 2018-08-25 00:12:58 +00:00