captain_arepa
/
akkoma-cachapa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3488 Commits
10 Branches
75 Tags
292 MiB
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '15aa45ae8a'
${ noResults }
Commit Graph

2485 Commits (15aa45ae8a2791a90a5832c1be28233959690987)

Author SHA1 Message Date
cascode 5b23dfa1c5 handle null
6 years ago
kaniini d9d62a110c Merge branch 'mr/retry-queue-remove-fold' into 'develop'
6 years ago
kaniini eaaf701319 Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
6 years ago
rinpatch b73a1a33de Merge branch 'captcha' into 'develop'
6 years ago
William Pitcock eb1a18d22f user: check that the follow request actually has an active account associated with it
6 years ago
Michael Loftis 943211b035 rewrites List.foldl to Enum.each
6 years ago
Maxim Filippov 48e81d3d40 Add RichMediaController and tests
6 years ago
sxsdv1 4e1cc2bab6 Implement delete activity
6 years ago
sxsdv1 551c3d9391 Split create activity specifics from update_outbox
6 years ago
Maxim Filippov 917d48d09b Better variable name
6 years ago
Maxim Filippov 2aab4e03c3 Add OGP parser
6 years ago
kaniini 32bed66471 Merge branch 'pool-usage' into 'develop'
6 years ago
rinpatch 34fa709015 Merge branch 'configurable-federator' into 'develop'
6 years ago
lambda 32541172cd Merge branch 'cleanup/admin-api-useless-if' into 'develop'
6 years ago
lain 400337b0a7 Make Federator options configurable.
6 years ago
lain 096a927805 Merge remote-tracking branch 'origin/develop' into pool-usage
6 years ago
lain d4799e0dc2 Remove default pool, it's used automatically anyway.
6 years ago
Haelwenn (lanodan) Monnier 1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
6 years ago
kaniini 90e157ef80 Merge branch 'features/admin-api-user-views' into 'develop'
6 years ago
William Pitcock 980b5288ed update copyright years to 2019
6 years ago
lambda 33e3a7ba7d Merge branch 'fix/scrubber-cache' into 'develop'
6 years ago
Rin Toshaka 6ed9b31a5f Eh?
6 years ago
Rin Toshaka 7e09c2bd7d Move scrubber cache-related functions to Pleroma.HTML
6 years ago
kaniini 8e7da98b18 Merge branch 'mr/retry-queue' into 'develop'
6 years ago
Rin Toshaka dec23500d8 Resolve merge conflict
6 years ago
Rin Toshaka ab3089d6a7 Fix comment in object.ex
6 years ago
Rin Toshaka c50353e6ae shame on me for not testing after revert
6 years ago
Rin Toshaka 3f9da55adc Fix formating. Aparently my pre-commit hook broke.
6 years ago
Rin Toshaka 62af23bd26 Revert some changes in html.ex
6 years ago
Rin Toshaka c119ea3a57 Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka 535fddd286 Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka d9f40b05b3 Added get_stripped_html_for_object. Renamed a few things
6 years ago
Michael Loftis cb286fdeba Improves RetryQueue behavior
6 years ago
Rin Toshaka bce152aba0 Tidy up the code. Rename key to signature
6 years ago
Rin Toshaka 66d1c31461 Fix some stupid typos
6 years ago
sxsdv1 f40562b4e1 Respond with full activity to outbox post
6 years ago
sxsdv1 1e781715c8 Limit activity types accepted to outbox to only 'Create'
6 years ago
sxsdv1 569bad8210 Create activity when client posts to outbox
6 years ago
sxsdv1 26dc2dddab Implement ActivityPub inbox view
6 years ago
Rin Toshaka a32e23905a Use Object.change instead of Ecto.Changeset.change
6 years ago
sxsdv1 aa082ca7b6 Wire up stub routes for client calls of activitypub inbox/outbox
6 years ago
Rin Toshaka 9a0163db53 use Kernel.put_in instead of Map.merge
6 years ago
vaartis 816db3f494 Remove the debugging IO.inspect
6 years ago
Haelwenn f5d7b0003e Merge branch 'fix_485' into 'develop'
6 years ago
Rin Toshaka 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
kaniini 3dc5f04976 Merge branch 'carrot-bullying' into 'develop'
6 years ago
spctrl ab9cda315f Change 'name' to 'instance_name' so option is used when running non-interactive
6 years ago
kaniini dd8f2196f6 Merge branch '483_blocks_import_export' into 'develop'
6 years ago
Maksim Pechnikov 523848d1fd Salmon# fixed publish an activity to remote accounts
6 years ago
Ivan Tashkinov 7bd49a3222 [#483] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
6 years ago
Ivan Tashkinov b3574dccbb [#483] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
6 years ago
Ivan Tashkinov 67b4297f4d [#483] Refactored blocks and follows import, added tests.
6 years ago
kaniini 49cf5f9ce0 Merge branch '471_invalid_accounts_rendering' into 'develop'
6 years ago
Ivan Tashkinov 700661b761 [#483] Blocked users list import (TwitterAPI).
6 years ago
Ivan Tashkinov 0a41786624 [#467] Refactored valid / invalid user rendering.
6 years ago
kaniini 68f483ef4c Merge branch 'fix/no-attachment-links' into 'develop'
6 years ago
Ivan Tashkinov 6e9a15b181 [#483] Blocked users export for TwitterAPI.
6 years ago
Haelwenn (lanodan) Monnier b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
Ivan Tashkinov 0d1788ce44 [#471] Factored out User.visible_for?/2.
6 years ago
Vyr Cossont d8cc96cb1f Fix Twitter timelines for private instances
6 years ago
kaniini bee6acd51d Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
6 years ago
kaniini cff0292d4b Merge branch 'reserve-user-names' into 'develop'
6 years ago
Ivan Tashkinov e6aeb1d4a5 [#471] Prevented rendering of inactive local accounts.
6 years ago
Maxim Filippov be70272ab0 Treat only true and "true" as true
6 years ago
vaartis 708a228919 Set ttl_interval to the seconds_valid time
6 years ago
Vyr Cossont e4562105e7 Implement exclude_reblogs and include_rts
6 years ago
Maxim Filippov 838c024231 Treat any present value in "no_attachment_links" as true
6 years ago
Ekaterina Vaartis 448af3601a Up captcha timer to 60 secs again, save used captchas in cachex
6 years ago
lain 551d80cc01 Expose restricted names in nodeinfo.
6 years ago
lain 5811e65e67 Add some hard limits on inserted activities.
6 years ago
lain 91724d160a Reserve a few user names
6 years ago
Maxim Filippov ca2e9ce9cc Revert unneeded changes
6 years ago
Maxim Filippov f75f707f6c Revert Activity tombstones, add ObjectTombstone struct
6 years ago
Maxim Filippov 2bbec33c71 Fix failing tests
6 years ago
Maxim Filippov 18a4cbb244 Capitalize "tombstone"
6 years ago
Maxim Filippov 0f412cf6e6 Create tombstone instead of object deletion
6 years ago
William Pitcock 69ad1039ba mix tasks: add legal boilerplate
6 years ago
William Pitcock 2791ce9a1f add license boilerplate to pleroma core
6 years ago
lambda 005b4194ff Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
6 years ago
William Pitcock 34a4ed22c4 twitter api: add "Video" to supported activity types list
6 years ago
William Pitcock 79b51a97fe twitter api: activity representer: remove peertube hack
6 years ago
William Pitcock 32dfc1d12a mastodon api: status view: remove obsolete peertube hack
6 years ago
William Pitcock 71f6d9f418 transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
lambda a3e33fa177 Merge branch 'hotfix/activity-without-content' into 'develop'
6 years ago
Haelwenn (lanodan) Monnier 3aff8067e4 transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
Karen Konou a7f07bb6e5 Implement kaniini's tweaks
6 years ago
Karen Konou c76179419d Renamed the things
6 years ago
Karen Konou 409ff60bf8 Fix formatting
6 years ago
Karen Konou 92362e1e22 Implement large thread filter
6 years ago
Ekaterina Vaartis b386e560ba Move the encryption out of kocaptcha into general captcha module
6 years ago
Ekaterina Vaartis 336e37d98f Make captcha (kocaptcha) stateless
6 years ago
kaniini 2e2030ada8 Merge branch '114_email_confirmation' into 'develop'
6 years ago
Ivan Tashkinov 7cab7de9ff [#114] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
6 years ago
Ivan Tashkinov f69cbf4755 [#114] Added :user_id component to email confirmation path to improve the security.
6 years ago
Ivan Tashkinov 8adcd1e80f [#114] Removed flash messages rendering on redirects.
6 years ago
Ivan Tashkinov 501ce34d7f [#114] Stylistic adjustments.
6 years ago
Maksim f1b93b5be7 [#413] fix parse mentions
6 years ago
kaniini fda148a9a2 Merge branch 'documentation/copy-pleroma-api' into 'develop'
6 years ago
raeno 652f49d176 Remove extra bracket
6 years ago
raeno 7fb3780431 Merge branch 'develop' into oembed_provider
6 years ago
Ivan Tashkinov b520d44b58 [#114] `mix format`
6 years ago
Ivan Tashkinov 279096228c [#114] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
6 years ago
Ivan Tashkinov a532ad5d72 [#114] User.register/1 tweak.
6 years ago
Ivan Tashkinov 968d7490b6 [#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
Ivan Tashkinov 59fc5d15df [#114] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
kaniini f98ee9402f Merge branch 'userless-admin' into 'develop'
6 years ago
lain f3eb414e28 Add a way to use the admin api without a user.
6 years ago
rinpatch ef318fb8a9 Merge branch 'develop' into fix/formatter-ignore-html-chars
6 years ago
rinpatch 059dd6f681 Ignore HTML characters in formatter.ex
6 years ago
Haelwenn (lanodan) Monnier a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
href f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
Ivan Tashkinov 3371a45884 [#114] Formatting fix.
6 years ago
Ivan Tashkinov b096e30cff [#114] Added email confirmation resend action. Added tests
6 years ago
Ivan Tashkinov aed0f90287 [#114] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
Ivan Tashkinov b86057cc7f [#114] Refactored User.register_changeset to init confirmation data.
6 years ago
Ivan Tashkinov 1de0aa2f10 [#114] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
Ivan Tashkinov a05cb10a95 [#114] Email confirmation route, action, node setting, User.Info fields.
6 years ago
raeno a300336459 Merge branch 'develop' into oembed_provider
6 years ago
href b1860fe85a
Instance/Static runtime plug
6 years ago
lambda 3d980daa49 Merge branch '459_fix_user_profile_crash' into 'develop'
6 years ago
Maksim Pechnikov 92a5133c42 fix text field
6 years ago
lambda 52ac7dce5c Merge branch 'captcha' into 'develop'
6 years ago
lambda c6d5f189d9 Merge branch 'fix-tags' into 'develop'
6 years ago
lambda 98c31deaa9 Merge branch 'test-mix-tasks' into 'develop'
6 years ago
lambda 078b8b6d22 Merge branch 'phoenix14' into 'develop'
6 years ago
lain e4763cd459 Fix tagging problems for existing instances.
6 years ago
vaartis 35522fef09 Use :ets.match_delete to delete old captchas
6 years ago
href 77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
raeno cc87880488 Support both OAuth token record and token string in UserView
6 years ago
lambda 567359790e Merge branch 'testfix/webfinger-jrd' into 'develop'
6 years ago
Ekaterina Vaartis ef6829382a Clean captchas up periodically, not schedule it after theyre created
6 years ago
Ekaterina Vaartis 3a31fdaf06 Change minutes_retained config to seconds_retained
6 years ago
Ekaterina Vaartis 6062885df6 Add a configurable auto-cleanup for captchas
6 years ago
href 5dcb7aecea
More put_view.
6 years ago
link0ff 22d483d4f7 Use bindings dbuser and dbname in sample_psql.eex
6 years ago
href f672555ad3
Upgrade to Phoenix 1.4
6 years ago
eal 28478a9c4f Merge branch 'fix/masto-put-settings' into 'develop'
6 years ago
eal 4c783e35c0 Mastodon API: Fix PUT /api/web/settings
6 years ago
Ekaterina Vaartis 8d55a549e6 Replace HTTPoison with Tesla for kocaptha
6 years ago
Ekaterina Vaartis 23549d3952 Formatting fixes
6 years ago
Ekaterina Vaartis b5518da904 Separate captcha implementation into a behaviour and use it
6 years ago
Haelwenn (lanodan) Monnier cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
lambda cc6689cc20 Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
6 years ago
Rin Toshaka 4a895a46d1 Allow port specification in instance.ex
6 years ago
Ekaterina Vaartis 28c43a417e Add an ability to disabled captcha
6 years ago
Ekaterina Vaartis a2399c1c7c Add base CAPTCHA support (currently only kocaptcha)
6 years ago
href e74f384b68 Merge branch 'fix/issue_433' into 'develop'
6 years ago
href bfe27c1b55 Merge branch '114_email_invites' into 'develop'
6 years ago
href acec11626d Merge branch 'fix/issue_272' into 'develop'
6 years ago
Maksim Pechnikov ea72ac549b fix case when tags is invalid
6 years ago
raeno 30812f8451 Remove domain from sample_config template
6 years ago
raeno b0c3211984 Scrub html from activity.content or user.bio for opengraph meta
6 years ago
raeno 90b00701ff Merge branch 'develop' into oembed_provider
6 years ago
Maksim Pechnikov d3ec09bb38 fix tags
6 years ago
raeno 46486595ff Handle "users/:id" links as well. Fix comments in MR.
6 years ago
href 980131b4db Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
6 years ago
Maksim Pechnikov bc6262d250 fixed typo
6 years ago
href 84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
href 412df2cd38
Warn if push is disabled..
6 years ago
Maksim Pechnikov baead4ea4b fix markdown formatting
6 years ago
href 91236c60c7 Merge branch 'feature/file-size-checking' into 'develop'
6 years ago
href 0b4c61e8d5
Fix warning
6 years ago
href ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
href 331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
href 6822916183
Typos
6 years ago
href b1bcd97a0f
Push: respect alerts settings
6 years ago
href d8984b7bf8
Push: add missing notification_type field
6 years ago
href 7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
6 years ago
Egor Kislitsyn 324933a0ac
improve push message format (compatibility with mastodon)
6 years ago
Egor Kislitsyn 658edb166f
fix and improve web push; add configuration docs
6 years ago
Ivan Tashkinov 69fd63e248 [#114] Added `invitesEnabled` to `metadata` of nodeinfo.
6 years ago
Ivan Tashkinov 66380b0641 [#114] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
Ivan Tashkinov 07e93f9940 [#114] Improved tests.
6 years ago
Ivan Tashkinov 9666376f5f [#114] Readded `invites_enabled` config setting, updated readme.
6 years ago
Ivan Tashkinov a89e3b4b60 [#114] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
Ivan Tashkinov 3cbf16a5fe [#114] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
Ivan Tashkinov cc83d7ffe7 [#114] Naive implementation of email invitations.
6 years ago
href 30dc81667c Merge branch '114_user_registration_emails' into 'develop'
6 years ago
Ivan Tashkinov f81213910f [#114] Addressed MR comments. Removed functionality to be extracted to other MRs.
6 years ago
lambda 262cc6d44b Merge branch 'fix/double-rt-or-fav' into 'develop'
6 years ago
eal 61ad2ce422 TwitterAPI: Include favorited post in json
6 years ago
eal 1ca080c862 Prevent accidental double RTs or favorites
6 years ago
raeno c5c3ad90d0 Fix tests. Remove oembed template
6 years ago
raeno b5de7c4c4d Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
raeno 018516d3f3 Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
6 years ago
raeno 49c4f7d604 Set Pleroma.instance.domain when config is generated
6 years ago
raeno 9b3a6cdb07 Extract opengraph/oembed into separate module
6 years ago
raeno d903e34cac Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
6 years ago
raeno 8902942128 WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
raeno 21afdf6d99 Insert meta tags into static index.html on the fly for OStatus#notice
6 years ago
lambda b19ee62252 Merge branch 'username-underscores' into 'develop'
6 years ago
Ivan Tashkinov 9e689de063 [#114] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov 18b9467d1a [#114] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov 00744c6b03 [#114] Initial implementation of user email invitations.
6 years ago
Ivan Tashkinov 908943352f [#114] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
6 years ago
href 7214d57463
Extended nicknames: allow dashes.
6 years ago
link0ff 51dd294c48 Allow to set both admin and moderator at the same time in mix task User
6 years ago
link0ff a40ba3ba57 Fix toggle_activated in mix task User
6 years ago
href 7d9ddbe689
Allow underscores in usernames.
6 years ago
Ivan Tashkinov bfff2399ff [#114] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
Ivan Tashkinov e3a21bcd45 [#114] Addressed warnings. Fix of `with` statement clause in `password_reset`.
6 years ago
Ivan Tashkinov f5afb11032 [#114] Initial implementation of user password reset emails (user-initiated).
6 years ago
Ivan Tashkinov 12905ce1ad [#114] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
Ivan Tashkinov 10c156d98f [#114] SMTP deps and config.
6 years ago
Maksim Pechnikov 89b3729afa fix warnings
6 years ago
scarlett 213176c3c3 Add new frontend options to server-side config.
6 years ago
lain d6bf06ab4f Fix warnings.
6 years ago
lambda 0863ec2737 Merge branch 'fix_empty_bio_crash' into 'develop'
6 years ago
lambda 8aa646ca31 Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'
6 years ago
lambda ff10b9927b Merge branch 'support/bugfix_272' into 'develop'
6 years ago
lambda 6786ad3d98 Merge branch 'fix/theora-detection-read-bytes' into 'develop'
6 years ago
lambda 0554d91dcd Merge branch 'anonymize-filter-text' into 'develop'
6 years ago
lambda bda25b999b Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
6 years ago
lain c81c74d847 Treat warnings as errors outside of tests.
6 years ago
Maksim Pechnikov e94c3442f4 updates
6 years ago
rinpatch 993c8c8bd4 Keep the shortdoc descriptive
6 years ago
raeno 9ba4a1c5fe Fixes #415. Properly handle nil and empty string by User.parse_bio
6 years ago
Rin Toshaka cbe048bb3f Mix tasks: improve uploads.ex moduledoc
6 years ago
Maksim Pechnikov 074fa790ba fix compile warnings
6 years ago
Maksim Pechnikov 068353ac0b formatting
6 years ago
Maksim Pechnikov 9442588ae9 fix hashtags in api response
6 years ago
Rin Toshaka 15616eda5e Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
6 years ago
lambda 5436aaad4f Merge branch 'fix/add-upload.ex' into 'develop'
6 years ago
lambda beadeaffa1 Merge branch 'fix/nodeinfo-nil-features' into 'develop'
6 years ago
lambda 8fa5c66eab Merge branch 'fix/media-proxy-url-encoded' into 'develop'
6 years ago
lambda 4976a8b05f Merge branch 'fix/typo-relay-ex' into 'develop'
6 years ago
Rin Toshaka 6c73136aec [#283] Mix Tasks: Fix a typo in relay.ex
6 years ago
href bdc8112e40
Media proxy: fix url encoding
6 years ago
Rin Toshaka 578051809f Add uploadlimit to Twitter API config
6 years ago
lambda 7d86c0c53f Merge branch 'fix/gopher-respect-ip' into 'develop'
6 years ago
lambda 94ac0075bf Merge branch 'media-proxy-follow-redirect' into 'develop'
6 years ago
href 134cc94cbd
Nodeinfo: remove null features; relay feature.
6 years ago
href d8fcf7c5cf
Media proxy: follow HTTP redirects by default
6 years ago
lambda 94d8f1ab30 Merge branch '394_user_tags' into 'develop'
6 years ago
Rin Toshaka 09f20de0d7 Make gopher respect ip
6 years ago
Rin Toshaka fd5c7b445f Fix a typo
6 years ago
Rin Toshaka a02e0c18bc Mix Tasks: Add task uploads.ex for migrating local uploads.
6 years ago
href 3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
6 years ago
href 3c925e9d88
Emojis: Alphabetical ordering
6 years ago
Ivan Tashkinov 1cea97df64 [#394] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
6 years ago
lambda 8764f64690 Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
6 years ago
rinpatch 4e2250b1dd Fix a typo in relay.ex moduledoc
6 years ago
Ivan Tashkinov 6ed5044c4e [#394] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
rinpatch f7e23aee90 Oops
6 years ago
rinpatch f661813807 Add mix pleroma.user unsubscribe to mix doc
6 years ago
rinpatch 08e10a70ec Rename def to defval
6 years ago
Rin Toshaka 1d11c4cf11 add common.ex
6 years ago
Ivan Tashkinov 7a2162bbcb [#394] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Rin Toshaka 71d5cf9ed8 Remove unused vars from user.ex
6 years ago
Ivan Tashkinov 7bcb6a183a [#394] Refactoring.
6 years ago