2883f75a3a
Add pagination to users admin API
6 years ago
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
6 years ago
9ade1242c2
Add user muted status info to twitterapi.
6 years ago
90d0d055fc
Add more admin actions
6 years ago
efa506b874
delegate user retrieval to the User module
6 years ago
9e0686efa6
Move visibility into own module.
6 years ago
bff9eb5ef7
Reports
6 years ago
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
6 years ago
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
6 years ago
94708d6370
Render only "id", "valid_until" and "app_name" in TokenView
6 years ago
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
62a45bdc11
Add revoke token
6 years ago
61a4bc5095
Add OAuth tokens endpoint
6 years ago
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
6 years ago
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
6a6a5b3251
de-group alias/es
6 years ago
60ea29dfe6
Credo fixes: alias grouping/ordering
6 years ago
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
8e8a1e1ba8
Return new-style config if old-style config is set to false.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
6 years ago
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
6 years ago
07a9a891ad
twitter api: fix up activity representer
6 years ago
5d895093fd
twitter api: embed card in twitterapi posts
6 years ago
f83bae7c22
Views: wrap activity rendering in a rescue
...
this avoids complete timeline breakage when an activity fucks up
rendering.
6 years ago
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
6 years ago
9274cabe01
Use correct logic to determine "attentions" list
6 years ago
4333fea1dc
Send "hide_network" in user_view
6 years ago
e221c681dc
New frontend configuration mechanism.
6 years ago
973c9eed18
Treat User.Info pinned ids as strings
6 years ago
28d77e373c
Flake Ids for Users and Activities
6 years ago
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
6 years ago
651a1d64b5
Add current user to mentioned
6 years ago
943324b661
MastoAPI: Don't break on missing users.
6 years ago
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
6 years ago
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
6 years ago
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
a99e156f2c
Add integer casts.
6 years ago
7ac152ed38
TwitterAPI: Add follower/following pagination.
6 years ago
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
6 years ago
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
6 years ago
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
6 years ago
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
6 years ago
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
6 years ago
6556be344d
Resolve some test failures.
6 years ago
0787f0dfbe
Strip HTML in and allow emoji in summaries.
6 years ago
bf5aaefbb5
Merge branch 'fix/html-cache-content-collision' into 'develop'
...
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
6 years ago
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
6 years ago
980b5288ed
update copyright years to 2019
6 years ago
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
dec23500d8
Resolve merge conflict
6 years ago
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
6 years ago
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
6 years ago
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
6 years ago
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
6 years ago
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
6 years ago
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
6 years ago
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
6 years ago
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
b520d44b58
[ #114 ] `mix format`
6 years ago
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
3371a45884
[ #114 ] Formatting fix.
6 years ago
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
6 years ago
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
6 years ago
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
6 years ago
92a5133c42
fix text field
6 years ago
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
cc87880488
Support both OAuth token record and token string in UserView
6 years ago
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
23549d3952
Formatting fixes
6 years ago
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
28c43a417e
Add an ability to disabled captcha
6 years ago
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
980131b4db
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
...
Improve web push
Closes #393 , #422 , and #452
See merge request pleroma/pleroma!524
6 years ago
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
baead4ea4b
fix markdown formatting
6 years ago
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
6 years ago
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
6 years ago
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
6 years ago
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
6 years ago
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
6 years ago
213176c3c3
Add new frontend options to server-side config.
6 years ago
074fa790ba
fix compile warnings
6 years ago
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
6 years ago
578051809f
Add uploadlimit to Twitter API config
6 years ago
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
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
6 years ago
04a48286e6
Add web push support
6 years ago
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
6 years ago
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
fdac215091
TwitterAPI: Show users their own network.
6 years ago
839526a913
TwitterAPI: Add network hiding.
6 years ago
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.
6 years ago
be187f82f7
[ #210 ] Further refactoring.
6 years ago
48e6193bf2
[ #210 ] Refactoring.
6 years ago
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
02288b5f1c
twitterapi: fix bad rebase
6 years ago
e8570758f9
twitterapi: fix remaining test failures
6 years ago
3b8e5bcbeb
fix most tests
6 years ago
95a458f392
twitterapi: more object normalization work
6 years ago
ce98d5eb9b
Parse user's bio on register
6 years ago
8c9a4e8b40
TwitterAPI: Implement hide_network.
6 years ago
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
02d3dc6869
Uploads fun, part. 2
6 years ago
b19597f602
reverse proxy / uploads
6 years ago
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
d407f662af
Fix TwitterApiController.
6 years ago
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
bc5cf2c192
Improved version string
6 years ago
fbb70d25fe
Several twitter api fixes.
6 years ago
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
6 years ago
7b170cd616
Add Pleroma user search api for PleromaFE.
6 years ago
ea9a776d7b
TwitterApi: Add direct message endpoint
6 years ago
cb6fd73861
Twitter API: Fall back to user.nickname if user has no name
6 years ago
4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
6 years ago
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
6 years ago
b2105a3131
twitterapi: add notification read endpoint
6 years ago
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.
6 years ago
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
6 years ago
013f7ba8c1
Add federating plug & public tests
6 years ago
6fe23c5458
Runtime configured router
6 years ago
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()`.
6 years ago
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
6 years ago
24ba08de13
twitter api: add support for rendering Page objects
6 years ago
e12489e2fe
twitter api: enforce upload limits for avatars, banners and backgrounds
6 years ago
5c6ec2d9fc
twitter/mastodon api: always use mediaproxy URLs in attachments
...
if using local media, the mediaproxy will not replace the URL anyway.
6 years ago
26eb11c172
activitypub: add support for filtering broken threads out of timelines
6 years ago
1ed25c963a
twitterapi: activity view: add the other in_reply_to fields
6 years ago
fee43ae5e7
twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
6 years ago
a253c1466e
New frontend options
6 years ago
7562912f6a
Use maybe_direct_follow for follow imports
6 years ago
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
6 years ago
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
6 years ago
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
6 years ago
c2b69798dd
twitter api: add support for disabling rich text
6 years ago
2f5b026548
twitter api: add support for user-specified html policy
6 years ago
c9585ec007
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
6 years ago
e82ce2a4b3
formatting
6 years ago
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
6 years ago
e2ce0e9e05
run `mix format`.
6 years ago
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
6 years ago
0f1c629d65
better solution, added test.
6 years ago
Maxim Filippov