projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
[#468] Merged `upstream/develop`, resolved conflicts.
[akkoma] / lib / pleroma / user /
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts. tree | commitdiff
2019-02-16 rinpatchMerge branch 'welcome-message' into 'develop' tree | commitdiff
2019-02-16 lainWelcomeMessage: Get rid of Ecto reference. tree | commitdiff
2019-02-16 lainAdd optional welcome message. tree | commitdiff
2019-02-08 lambdaMerge branch 'fix/do-split-migration-for-local-users... tree | commitdiff
2019-02-08 Karen KonouMerge branch 'develop' into feature/thread-muting tree | commitdiff
2019-02-08 rinpatchMerge branch 'develop' into feature/keyword-policy tree | commitdiff
2019-02-06 kaniiniMerge branch 'rename-followings' into 'develop' tree | commitdiff
2019-02-06 Mark Felderhide_followings was renamed to hide_followers in the... tree | commitdiff
2019-02-06 HaelwennMerge branch 'bugfix/rich-media-card' into 'develop' tree | commitdiff
2019-02-06 kaniiniMerge branch 'add-admin-and-moderator-fields' into... tree | commitdiff
2019-02-06 eugenijmAllow to configure visibility for admin and moderator... tree | commitdiff
2019-02-05 kaniiniMerge branch 'fix-dm-index' into 'develop' tree | commitdiff
2019-02-05 kaniiniMerge branch 'feature/ap-c2s-whoami' into 'develop' tree | commitdiff
2019-02-05 kaniiniMerge branch 'feature/split-hide-network-v2' into ... tree | commitdiff
2019-02-04 kaniiniMerge branch 'mime-riff' into 'develop' tree | commitdiff
2019-02-03 Maxim FilippovSplit hide_network into hide_followers & hide_following... tree | commitdiff
2019-02-01 kaniiniMerge branch 'revert-0a82a7e6' into 'develop' tree | commitdiff
2019-02-01 kaniiniRevert "Merge branch 'feature/split-hide-network' into... tree | commitdiff
2019-02-01 hrefMerge branch 'develop' into 'develop' tree | commitdiff
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop' tree | commitdiff
2019-01-31 kaniiniMerge branch 'spc-fix-3' into 'develop' tree | commitdiff
2019-01-29 kaniiniMerge branch 'hj-happiness-improvement' into 'develop' tree | commitdiff
2019-01-28 Maxim FilippovSplit hide_network into hide_followers & hide_followings tree | commitdiff
2019-01-28 Ivan Tashkinov[#534] Merged `upstream/develop`. tree | commitdiff
2019-01-25 kaniiniMerge branch 'fix/tusky-dm' into 'develop' tree | commitdiff
2019-01-25 kaniiniMerge branch 'develop' into 'oembed_provider' tree | commitdiff
2019-01-25 kaniiniMerge branch 'classic-flakeids' into 'develop' tree | commitdiff
2019-01-23 hrefTreat User.Info pinned ids as strings tree | commitdiff
2019-01-14 lambdaMerge branch 'load-all-dms' into 'develop' tree | commitdiff
2019-01-13 rinpatchResolve merge conflict tree | commitdiff
2019-01-10 kaniiniMerge branch 'activitypub-dereference-activity-id'... tree | commitdiff
2019-01-10 kaniiniMerge branch 'twapi-follower-pagination' into 'develop' tree | commitdiff
2019-01-10 HaelwennMerge branch 'bugfix/markdown-newline-codeblocks' into... tree | commitdiff
2019-01-10 kaniiniMerge branch 'feature/pinned-posts' into 'develop' tree | commitdiff
2019-01-09 lambdaMerge branch 'scarlett/pleroma-summary-html-api' into... tree | commitdiff
2019-01-09 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-01-09 kaniiniMerge branch 'hotfix/media-proxy-uri' into 'develop' tree | commitdiff
2019-01-09 William Pitcockuser: factor out illogical User.Info.superuser?/1. tree | commitdiff
2019-01-08 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-01-08 Egor Kislitsynrename `post` to `status` tree | commitdiff
2019-01-07 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2019-01-07 Egor Kislitsynadd pinned posts tree | commitdiff
2019-01-05 kaniiniMerge branch 'fix_486' into 'develop' tree | commitdiff
2019-01-03 rinpatchMerge branch 'captcha' into 'develop' tree | commitdiff
2019-01-01 lambdaMerge branch 'cleanup/admin-api-useless-if' into 'develop' tree | commitdiff
2019-01-01 lainMerge remote-tracking branch 'origin/develop' into... tree | commitdiff
2018-12-31 kaniiniMerge branch 'features/admin-api-user-views' into ... tree | commitdiff
2018-12-31 kaniiniMerge branch 'docs/admin-api' into 'develop' tree | commitdiff
2018-12-31 kaniiniMerge branch 'maintenance/copyright-2019' into 'develop' tree | commitdiff
2018-12-31 William Pitcockupdate copyright years to 2019 tree | commitdiff
2018-12-28 kaniiniMerge branch 'systemd-drop-sysadmin-privilege' into... tree | commitdiff
2018-12-27 kaniiniMerge branch 'feature/create-tombstone-instead-of-delet... tree | commitdiff
2018-12-25 lambdaMerge branch 'legal-boilerplate' into 'develop' tree | commitdiff
2018-12-23 William Pitcockadd license boilerplate to pleroma core tree | commitdiff
2018-12-23 lambdaMerge branch 'hotfix/activity-without-content' into... tree | commitdiff
2018-12-20 lambdaMerge branch 'ci-test-fix' into 'develop' tree | commitdiff
2018-12-20 kaniiniMerge branch '114_email_confirmation' into 'develop' tree | commitdiff
2018-12-19 Ivan Tashkinov[#114] Made MastodonAPI and TwitterAPI user show action... tree | commitdiff
2018-12-19 Ivan Tashkinov[#114] User.Info: renamed `confirmation_update` to... tree | commitdiff
2018-12-19 Ivan Tashkinov[#114] User.Info: renamed `confirmation_update` to... tree | commitdiff
2018-12-18 rinpatchMerge branch 'develop' into fix/formatter-ignore-html... tree | commitdiff
2018-12-18 lambdaMerge branch 'feature/new-user-routes' into 'develop' tree | commitdiff
2018-12-18 Ivan Tashkinov[#114] Account confirmation email, registration as... tree | commitdiff
2018-12-18 Ivan Tashkinov[#114] Email confirmation route, action, node setting... tree | commitdiff
2018-12-18 raenoMerge branch 'develop' into oembed_provider tree | commitdiff
2018-12-17 lambdaMerge branch 'captcha' into 'develop' tree | commitdiff
2018-12-17 lambdaMerge branch 'test-mix-tasks' into 'develop' tree | commitdiff
2018-12-17 lambdaMerge branch 'testfix/webfinger-jrd' into 'develop' tree | commitdiff
2018-12-16 HaelwennMerge branch 'develop' into 'develop' tree | commitdiff
2018-12-16 ealMerge branch 'fix/masto-put-settings' into 'develop' tree | commitdiff
2018-12-16 ealMastodon API: Fix PUT /api/web/settings tree | commitdiff
2018-12-10 lambdaMerge branch 'fix/theora-detection-read-bytes' into... tree | commitdiff
2018-12-07 lambdaMerge branch '394_user_tags' into 'develop' tree | commitdiff
2018-12-06 Rin ToshakaMerge develop tree | commitdiff
2018-12-06 kaniiniMerge branch 'fix/mastodon-api-settings' into 'develop' tree | commitdiff
2018-12-06 kaniiniMerge branch 're-mrf' into 'develop' tree | commitdiff
2018-12-06 rinpatchMastoAPI: Fix put_settings tree | commitdiff
2018-12-06 Egor KislitsynMerge branch 'develop' into feature/compat/push-subscri... tree | commitdiff
2018-12-06 kaniiniMerge branch '210_twitter_api_uploads_alt_text' into... tree | commitdiff
2018-12-06 Hakaba HitoyoMerge remote-tracking branch 'origin/debug-suggestions... tree | commitdiff
2018-12-05 kaniiniMerge branch 'follower-hiding' into 'develop' tree | commitdiff
2018-12-05 lainFix merge. tree | commitdiff
2018-12-05 lainMerge remote-tracking branch 'origin' into follower... tree | commitdiff
2018-12-05 lainTwitterAPI: Add network hiding. tree | commitdiff
2018-12-05 Rin ToshakaMerge develop to refactor/mix-tasks tree | commitdiff
2018-12-03 lambdaMerge branch 'fix/parse-user-bio' into 'develop' tree | commitdiff
2018-12-03 lambdaMerge branch 'fix-media-proxy-defaults' into 'develop' tree | commitdiff
2018-12-02 HaelwennMerge branch 'user_info_fixes_again' into 'develop' tree | commitdiff
2018-12-02 rinpatchMerge branch 'develop' into fix/theora-detection-read... tree | commitdiff
2018-12-02 lainHide network in ap. tree | commitdiff
2018-12-02 lainFix background updating / handling. tree | commitdiff
2018-12-01 kaniiniMerge branch 'validate-user-info' into 'develop' tree | commitdiff
2018-12-01 lainMore fixes for Info schema. tree | commitdiff
2018-12-01 lainTwitterAPI: Fix banner and background update. tree | commitdiff
2018-12-01 lainFix masto api user updating. tree | commitdiff
2018-12-01 lainMerge branch 'develop' of git.pleroma.social:pleroma... tree | commitdiff
2018-12-01 lainFix admin api. tree | commitdiff
2018-11-30 lainMerge remote-tracking branch 'origin' into validate... tree | commitdiff
2018-11-30 lainAssorted fixes. tree | commitdiff
next
Fork of https://akkoma.dev/AkkomaGang/akkoma.git