Resolve merge conflict
[akkoma] / lib / pleroma / user.ex
2019-01-13 rinpatchResolve merge conflict
2019-01-10 kaniiniMerge branch 'activitypub-dereference-activity-id'...
2019-01-10 kaniiniMerge branch 'twapi-follower-pagination' into 'develop'
2019-01-10 HaelwennMerge branch 'bugfix/markdown-newline-codeblocks' into...
2019-01-10 kaniiniMerge branch 'feature/pinned-posts' into 'develop'
2019-01-10 kaniiniMerge branch 'mass-follow' into 'develop'
2019-01-09 lainTwitterAPI: Add follower/following pagination.
2019-01-09 lambdaMerge branch 'scarlett/pleroma-summary-html-api' into...
2019-01-09 lainUse follow_all in autofollow.
2019-01-09 lainAdd User mass following function.
2019-01-09 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-01-09 kaniiniMerge branch 'hotfix/media-proxy-uri' into 'develop'
2019-01-09 William Pitcockuser: fix auth_active?/1 for remote users
2019-01-09 William Pitcockuser: factor out illogical User.Info.superuser?/1.
2019-01-09 William Pitcockuser: remove entirely redundant remote_or_auth_active?/1.
2019-01-09 William Pitcockuser: harden auth_active?/1, superuser?/1, visible_for?/1
2019-01-09 William Pitcockuser: use pattern matching to determine if user is...
2019-01-08 rinpatchMerge branch 'autofollow' into 'develop'
2019-01-08 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-01-08 lainAdd a setting for users to autofollow on sign up.
2019-01-07 kaniiniMerge branch 'features/syslog_logger' into 'develop'
2019-01-07 kaniiniMerge branch 'resilient-user-view' into 'develop'
2019-01-07 lainMake TwAPI UserView more resilient to issues.
2019-01-05 kaniiniMerge branch 'fix/user-search-null-name' into 'develop'
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop'
2019-01-05 cascodeMerge branch 'develop' of git.pleroma.social:cascode...
2019-01-04 kaniiniMerge branch 'fix/html-cache-content-collision' into...
2019-01-04 kaniiniMerge branch 'feature/rich-media' into 'develop'
2019-01-04 kaniiniMerge branch 'activitypub-c2s-delete-activity' into...
2019-01-04 cascodehandle null
2019-01-03 kaniiniMerge branch 'mr/retry-queue-remove-fold' into 'develop'
2019-01-03 kaniiniMerge branch 'fix/follow-requests-deleted-accounts...
2019-01-03 rinpatchMerge branch 'captcha' into 'develop'
2019-01-02 William Pitcockuser: check that the follow request actually has an...
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop'
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into...
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ...
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop'
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop'
2018-12-31 William Pitcockupdate copyright years to 2019
2018-12-31 lambdaMerge branch 'fix/scrubber-cache' into 'develop'
2018-12-30 Rin ToshakaResolve merge conflict
2018-12-29 Rin ToshakaI am not sure what's going on anymore so I'll just...
2018-12-29 kaniiniMerge branch 'carrot-bullying' into 'develop'
2018-12-29 kaniiniMerge branch '483_blocks_import_export' into 'develop'
2018-12-29 Ivan Tashkinov[#483] User.get_by_nickname/1: ensured case-insensitive...
2018-12-29 Ivan Tashkinov[#483] User.get_by_nickname/1: allowed retrieving user...
2018-12-29 Ivan Tashkinov[#483] Refactored blocks and follows import, added...
2018-12-29 kaniiniMerge branch '471_invalid_accounts_rendering' into...
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into...
2018-12-28 kaniiniMerge branch 'fix/no-attachment-links' into 'develop'
2018-12-28 Ivan Tashkinov[#483] Blocked users export for TwitterAPI.
2018-12-28 Ivan Tashkinov[#471] Factored out User.visible_for?/2.
2018-12-27 HaelwennMerge branch '396_elixir_1.7' into 'develop'
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet...
2018-12-27 kaniiniMerge branch 'reserve-user-names' into 'develop'
2018-12-27 Ivan Tashkinov[#471] Prevented rendering of inactive local accounts.
2018-12-25 lainReserve a few user names
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop'
2018-12-23 William Pitcockadd license boilerplate to pleroma core
2018-12-23 lambdaMerge branch 'hotfix/activity-without-content' into...
2018-12-20 lambdaMerge branch 'ci-test-fix' into 'develop'
2018-12-20 kaniiniMerge branch '114_email_confirmation' into 'develop'
2018-12-20 Ivan Tashkinov[#114] Allowed unconfirmed users to authenticate if...
2018-12-20 Ivan Tashkinov[#114] Added :user_id component to email confirmation...
2018-12-20 Ivan Tashkinov[#114] Stylistic adjustments.
2018-12-19 raenoMerge branch 'develop' into oembed_provider
2018-12-19 Ivan Tashkinov[#114] Made MastodonAPI and TwitterAPI user show action...
2018-12-19 Ivan Tashkinov[#114] User.register/1 tweak.
2018-12-19 Ivan Tashkinov[#114] User.Info: renamed `confirmation_update` to...
2018-12-19 Ivan Tashkinov[#114] User.Info: renamed `confirmation_update` to...
2018-12-18 rinpatchMerge branch 'develop' into fix/formatter-ignore-html...
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop'
2018-12-18 Ivan Tashkinov[#114] Added email confirmation resend action. Added...
2018-12-18 Ivan Tashkinov[#114] Refactored User.register_changeset to init confi...
2018-12-18 Ivan Tashkinov[#114] Account confirmation email, registration as...
2018-12-18 Ivan Tashkinov[#114] Email confirmation route, action, node setting...
2018-12-18 raenoMerge branch 'develop' into oembed_provider
2018-12-17 lambdaMerge branch '459_fix_user_profile_crash' into 'develop'
2018-12-17 lambdaMerge branch 'captcha' into 'develop'
2018-12-17 lambdaMerge branch 'fix-tags' into 'develop'
2018-12-17 lainFix tagging problems for existing instances.
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop'
2018-12-14 raenoMerge branch 'develop' into oembed_provider
2018-12-14 raenoHandle "users/:id" links as well. Fix comments in MR.
2018-12-14 hrefMerge branch 'feature/file-size-checking' into 'develop'
2018-12-14 hrefMerge branch '114_user_registration_emails' into 'develop'
2018-12-13 lambdaMerge branch 'username-underscores' into 'develop'
2018-12-12 hrefExtended nicknames: allow dashes.
2018-12-12 hrefAllow underscores in usernames.
2018-12-12 kaniiniMerge branch 'support/issue_442' into 'develop'
2018-12-12 Maksim Pechnikovfix warnings
2018-12-10 lambdaMerge branch '2018-12-10-update-frontend' into 'develop'
2018-12-10 lainFix warnings.
2018-12-10 lambdaMerge branch 'fix_empty_bio_crash' into 'develop'
2018-12-10 lambdaMerge branch 'fix/config-md-typos' into 'develop'
2018-12-10 lambdaMerge branch 'support/bugfix_272' into 'develop'
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into...
2018-12-10 lambdaMerge branch 'anonymize-filter-text' into 'develop'
2018-12-10 lambdaMerge branch 'develop' into 'fix/mix-task-uploads-modul...
next