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
946a0769c4
remove unused settings from /api/statusnet/config
6 years ago
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
9b046d2a84
fixed notifications API completely breaking if there's a like for
...
missing (deleted) post.
6 years ago
643f373514
Run mix format
6 years ago
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
6 years ago
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
74c74decf5
Basic peertube support.
6 years ago
cdb3dd48ab
Format
6 years ago
5debd7b5cc
Twitter API: Support Mastodon-style bios
...
(multi-line, with links, and user mentions)
6 years ago
8c0c930041
formatting
6 years ago
ffd9ad1f0c
Fix for elixir 1.7.
6 years ago
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
9de6145737
Merge branch 'fix/remote-follow-errormessage' into 'develop'
...
Remote follow: don't show confusing error if already following
See merge request pleroma/pleroma!267
6 years ago
db5cdfa333
Remote follow: don't show confusing error if already following
6 years ago
37b802682c
HTML-sanitize usernames before emojifying.
6 years ago
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
6 years ago
b23630076f
TwitterAPI: present pleroma frontend config in API
6 years ago
b832df1e15
formatting
6 years ago
f03e57f764
twitter api: activity representer: add summary field for testsuite
6 years ago
152a526237
twitter api: refactor activity html generation, add support for Articles
6 years ago
3b799f22b7
twitterapi: activity view: expose message summary text
6 years ago
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
6 years ago
971bb4f2bd
activity interpretation: formatting
6 years ago
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
6 years ago
121c1f6230
twitter api: refactor activity html generation, add support for Articles
6 years ago
2f14996d9a
twitter api: allow setting default_scope
6 years ago
dcdf7b6686
twitter api: user view: show default message scope if known
6 years ago
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
6 years ago
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
6 years ago
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
6 years ago
9c1cf1befb
formatting
6 years ago
f42ffbe9a8
Initial invites support + tests.
6 years ago
f8e0942745
twitter api: add approve/deny endpoints
6 years ago
e08cf21e5b
twitter api: add friend requests list api
6 years ago
ba8dab7542
twitterapi: user view: return if an account is locked or not
6 years ago
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
6 years ago
1525a0404b
Fix follow errors
6 years ago
0f70e83e8c
Better error handling in TwitterApiController.
6 years ago
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
6 years ago
3ece4a3ebc
Only return certain activities in TwitterAPI mentions.
6 years ago
e80d91c64a
introduce User.maybe_direct_follow() and use it where we used to call User.follow()
6 years ago
c89b90222c
twitter api: also remove explicit User.follow here
6 years ago
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
6 years ago
72b93d13f8
Hook up block/unblock to TwitterAPI
6 years ago
55f9aefd08
Hook unfollow into TwitterAPI
6 years ago
d0690622cd
Added endpoint for changing passwords
6 years ago
89c5de9096
Fix unfollows
6 years ago
dca26f3655
Fix specs.
6 years ago
ff007af0c2
Return visilility in twitter api, too.
6 years ago
434601a5c3
Return private / direct posts on user timelines, too.
6 years ago
8b0c222b43
Merge branch 'feature/account-deletion' into 'develop'
...
Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157
6 years ago
6f39ecc41b
Support Undo like activities ( Fix #139 )
6 years ago
d1366f8d46
Modified deleting an account to run as a task
6 years ago
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
6 years ago
a16117225f
Added endpoint for user account deletion
6 years ago
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
6 years ago
aaacebd906
Fix unused variables, imports, and aliases
6 years ago
636f0fa402
Clean up unused aliases and imports
6 years ago
943820ae29
More unused variables
6 years ago
ab4aa5720a
Fix a bunch of unused variable warnings
6 years ago
bc215f5684
Fix format.
6 years ago
0df1a4efc8
Fix comment grammar
7 years ago
7517155544
Changed to support \r\n and \n
7 years ago
52ee91efce
Patch to replace newlines with <br> tags in bio
7 years ago
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
7 years ago
a61e8ac154
Formatting.
7 years ago
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
7 years ago
32a26eb910
Fix TwitterAPI.delete call
7 years ago
7b4f55238e
Handle unrepeats via the TwitterAPI
7 years ago
85bd191291
Remove unretweet function for now
7 years ago
b949577472
Add unrepeat functionality
7 years ago
8f9bcc4ab0
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
7 years ago
70bcdf32bd
Only search in public data for now.
...
This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.
7 years ago
e7ddda44c0
Follow import: allow URI in addition to screen_name.
7 years ago
d70d1c427a
TwitterAPI: Don't put follows into the public tls.
7 years ago
b3b7ab5d9a
Load all users at once in timelines.
7 years ago
360c51f1f5
Use context_ids directly if we have them.
7 years ago
bc31bee7c4
Generates contexts and ids on insertion time.
7 years ago
a4db3a732f
Pre-fetch conversation ids.
7 years ago
802736679c
Remove unused ActivityRepresenter module.
7 years ago
7ab94ae22d
TwitterApiController: Use ActivityView.
7 years ago
e90f8f6c4b
TwApi ActivityView: Add delete activities.
7 years ago
1f32ba052c
TwApi ActivityView: Add follows.
7 years ago
4afbef39f4
Format the code.
7 years ago
c1d529ee94
TwApi ActivityView: Add announces.
7 years ago
1f1caab138
TwApi ActivityView: Add Like rendering.
7 years ago
df8fc72491
Don't go through all available emoji.
...
object carry their emoji information.
7 years ago
e30752bc79
Add basic activity view.
7 years ago
d2099c849d
More Jason changes.
7 years ago
847cb15626
Fix tests.
7 years ago
c7be7a9454
Unify user fetching.
7 years ago
a17ba0ee0d
Only return posts in TwAPI user view.
7 years ago
e9de04b74b
Add support for outgoing update.
7 years ago
4ea2a41014
Fix more specs.
7 years ago
dfaddeb765
Use update_and_set cache.
7 years ago
7e0ce32f4d
Fix external url in twitterapi.
7 years ago
94db9ac4db
Merge branch 'develop' into feature/activitypub
7 years ago
947ba6495d
More TwAPI fixes.
7 years ago
391b3e3586
TwitterAPI: Fix some bugz.
7 years ago
fd95075e32
TwitterAPI: Fix mentions.
7 years ago
5bc810c452
Add moderator function.
7 years ago
01faa7c555
TwitterAPI: support follow activities without published date.
7 years ago
1633470e4a
TwitterAPI: Only fetch creates, announces, follows.
7 years ago
010f818a29
Fix conversations.
7 years ago
5d89997a70
Respect visibility in API.
7 years ago
c974f6544f
Show users their own posts in timeline.
7 years ago
539340d914
Handle sensitive property.
7 years ago
ce31f3a922
Twitter Representers: Handle Mastodon attachments.
7 years ago
08f458e6df
UtilController: Fix statusnet config api compatibility.
7 years ago
29be70c008
Add remote following of local profiles.
7 years ago
ab83e0de6d
TwitterAPI: Add is_local to user view.
7 years ago
beb13bf3a9
Revert "Revert "Add remote follow pages.""
...
This reverts commit b259b4e4d1
7 years ago
b259b4e4d1
Revert "Add remote follow pages."
...
This reverts commit 47e8c8db05
7 years ago
47e8c8db05
Add remote follow pages.
7 years ago
b3e7d7ae6d
Fetch external profile in the background.
7 years ago
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
7 years ago
5c09d8d3f1
Unlink follow import process from the one processing request.
...
Mistakes were made.
7 years ago
35ac549a99
Merge branch 'media-proxy' into 'develop'
...
Media proxy
See merge request pleroma/pleroma!34
7 years ago
29c9812789
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
...
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
7 years ago
1969773fb4
Fix follower/following lists.
...
Add tests.
7 years ago
fdfb508259
Run follow import in the background.
7 years ago
d89193a8d7
Allow uploading a file for follow import.
7 years ago
39ccfdc084
Add follow import.
7 years ago
72f7baa654
Merge remote-tracking branch 'upstream/develop' into media-proxy
7 years ago
5c40986120
Basic backend chat.
7 years ago
5f35fdcf5d
media proxy: good enough wip
7 years ago
59770c3f5c
Fix all compilation warnings
7 years ago
31e4277ba5
Don't add summary if empty.
7 years ago
1cca544e20
Merge branch 'twitterapi-bitlbee' into 'develop'
...
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
7 years ago
f9828e578c
TwitterAPI: Add /users/show.
7 years ago
22bbe27115
TwitterAPI: Add unimplemented /friendships/no_retweets/ids.
7 years ago
3533bf7eac
TwitterAPI: Add /friends/ids.
7 years ago
77e272df2d
Merge branch 'following-you-in-user-view' into 'develop'
...
TwitterAPI user view: add follows_you.
See merge request pleroma/pleroma!11
7 years ago
f7fc048aeb
TwitterAPI user view: add follows_you.
7 years ago
d2430d5007
Look through whole db for user timelines.
...
They already have an index that's good enough.
7 years ago
4656cb9b99
TwitterAPI user view: add blocks.
7 years ago
6c0758e041
TwitterAPI: Add blocks.
7 years ago
c6210183e1
Add mastodon API endpoint for custom emoji.
7 years ago
d89a7a0b34
TwitterAPI: Add blocking to fetches.
7 years ago
04217f52c9
TwitterAPI: Display cws.
7 years ago
fe7804e42d
Add an API endpoint for emoji.
7 years ago
6af164f27b
Add password reset.
7 years ago
d009a79df5
TwitterAPI: Return proper error.
...
Fixes #32 .
7 years ago
6877d7aaad
Fix typo.
7 years ago
b7b3e3f263
Use inserted_at as sort in search.
7 years ago
959e993c7d
Apply incoming custom emoji.
7 years ago
884006a9e9
Federate emoji out.
7 years ago
c17c8ce36d
Don't check limit twice in TwitterAPIController.
7 years ago
03952a2760
Sort by updated_at
...
the updated_at column isn't indexed, so postgres won't take the wrong index.
7 years ago
f039c9c19a
Don't specify order in results for now.
7 years ago
5d1f8dcd1c
TwitterAPI: Add search.
7 years ago
c20530e708
Add configuration option for registrations.
7 years ago
50409326a8
Refactor posting and make character limit configurable.
7 years ago
d625d8db7d
Add unfav to Mastodon API.
7 years ago
454dc18570
Add favoriting to Mastodon API.
7 years ago
66e4c710d4
Add reblogging to MastodonAPI.
7 years ago
4dc517a0bb
Add deletion to masto api.
7 years ago
2652d9e4ed
Slight cleanup.
7 years ago
632e1f7943
Add delete to TwAPI representer correctly.
7 years ago
1f9a5272e1
Add delete to TwAPI.
7 years ago
fcf3128a56
Add TwAPI representer for deletes.
7 years ago
6c3a0ffae4
Add banner and background updating.
7 years ago
Ivan Tashkinov