projects / akkoma / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Fix merge conflicts with upstream
[akkoma] / lib / pleroma / web / templates / o_auth / o_auth / register.html.eex
2021-06-04 Sean KingFix merge conflicts with upstream blob | commitdiff | raw
2021-06-04 HaelwennMerge branch 'tests/openapi-everywhere' into 'develop' blob | commitdiff | raw
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-06-01 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-06-01 HaelwennMerge branch 'features/validators-note' into 'develop' blob | commitdiff | raw
2021-05-31 HaelwennMerge branch 'docs/goto-libera' into 'develop' blob | commitdiff | raw
2021-05-30 Alex GleasonMerge commit '07fed0fda2473fc4e1e3b01e863217391fd2902f... blob | commitdiff | raw
2021-05-30 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-05-29 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-05-28 feldMerge branch 'cycles-router-api-routes' into 'develop' blob | commitdiff | raw
2021-05-28 feldMerge branch 'simplepolicy-announce-leak' into 'develop' blob | commitdiff | raw
2021-05-28 feldMerge branch 'gitignore-runtime-exs' into 'develop' blob | commitdiff | raw
2021-05-28 feldMerge branch 'alias-router-helpers' into 'develop' blob | commitdiff | raw
2021-05-19 Alex GleasonMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw
2021-05-18 Alex GleasonSwitch to aliasing `Router.Helpers` instead of importing blob | commitdiff | raw
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-05-01 Mark FelderMerge branch 'develop' into update-oauth-template blob | commitdiff | raw | diff to current
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into... blob | commitdiff | raw | diff to current
2019-05-01 Alex SMerging with develop blob | commitdiff | raw | diff to current
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-04-19 kaniiniMerge branch 'feature/database-compaction' into 'develop' blob | commitdiff | raw | diff to current
2019-04-19 Roman ChvanikovMerge branch 'develop' of git.pleroma.social:pleroma... blob | commitdiff | raw | diff to current
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into... blob | commitdiff | raw | diff to current
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction blob | commitdiff | raw | diff to current
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination... blob | commitdiff | raw | diff to current
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop' blob | commitdiff | raw | diff to current
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop' blob | commitdiff | raw | diff to current
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-04-10 Ivan Tashkinov[#923] OAuth consumer params handling refactoring. blob | commitdiff | raw | diff to current
2019-04-10 lambdaMerge branch 'feature/767-multiple-use-invite-token... blob | commitdiff | raw | diff to current
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri... blob | commitdiff | raw | diff to current
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop' blob | commitdiff | raw | diff to current
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ... blob | commitdiff | raw | diff to current
2019-04-09 lambdaMerge branch 'bugfix/follower_count' into 'develop' blob | commitdiff | raw | diff to current
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into... blob | commitdiff | raw | diff to current
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into... blob | commitdiff | raw | diff to current
2019-04-08 lambdaMerge branch 'improve_upgrade_user_from_ap_id' into... blob | commitdiff | raw | diff to current
2019-04-08 lambdaMerge branch 'twitter_oauth' into 'develop' blob | commitdiff | raw | diff to current
2019-04-08 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream... blob | commitdiff | raw | diff to current
2019-04-07 Ivan Tashkinov[#923] Removed <br> elements from auth forms, adjusted... blob | commitdiff | raw | diff to current
2019-04-04 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream... blob | commitdiff | raw | diff to current
2019-04-04 Ivan Tashkinov[#923] OAuth consumer controller tests. Misc. improvements. blob | commitdiff | raw | diff to current
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop... blob | commitdiff | raw | diff to current
2019-04-02 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream... blob | commitdiff | raw | diff to current
2019-04-01 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream... blob | commitdiff | raw | diff to current
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop... blob | commitdiff | raw | diff to current
2019-03-20 Ivan Tashkinov[#923] Nickname & email selection for external registra... blob | commitdiff | raw | diff to current
Fork of https://akkoma.dev/AkkomaGang/akkoma.git