Merge branch 'develop' into feature/polls-2-electric-boogalo
[akkoma] / lib / pleroma / web / templates /
2019-06-03 rinpatchMerge branch 'develop' into feature/polls-2-electric...
2019-06-02 kaniiniMerge branch 'feature/notification-control-part-2'...
2019-06-01 rinpatchResolve merge conflicts
2019-06-01 kaniiniMerge branch 'bugfix/visibility-indicator-litepub-dm...
2019-06-01 kaniiniMerge branch 'bugfix/remove-vanilla-flavour' into ...
2019-05-31 Haelwenn (lanodan... Remove now useless flavours switching
2019-05-31 HaelwennMerge branch 'dokku' into 'develop'
2019-05-31 lambdaMerge branch 'hotfix/leaking-lists' into 'develop'
2019-05-30 lambdaMerge branch 'use-pleroma-config' into 'develop'
2019-05-30 Egor KislitsynUse Pleroma.Config everywhere
2019-05-04 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lainMerge remote-tracking branch 'origin/develop' into...
2019-05-01 lambdaMerge branch 'features/download-mastofe-build' into...
2019-05-01 Alex SMerging with develop
2019-04-22 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-19 kaniiniMerge branch 'feature/database-compaction' into 'develop'
2019-04-19 lambdaMerge branch '923_oauth_consumer_refactoring_ci' into...
2019-04-17 rinpatchMerge branch 'develop' into feature/database-compaction
2019-04-13 Alex SMerge develop to 788-separate-email-addresses
2019-04-12 lambdaMerge branch 'bugfix/pleroma-email-naming' into 'develop'
2019-04-12 lambdaMerge branch 'features/mastoapi/2.6.0-min_id-pagination...
2019-04-12 lambdaMerge branch 'fix/732-password-align' into 'develop'
2019-04-12 lambdaMerge branch 'ssl_trusted_cert' into 'develop'
2019-04-11 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-10 Ivan Tashkinov[#923] OAuth consumer params handling refactoring.
2019-04-10 lambdaMerge branch 'feature/767-multiple-use-invite-token...
2019-04-10 SadposterMerge branch 'develop' into feature/user-status-subscri...
2019-04-10 kaniiniMerge branch 'hotfix/fix_undefined_summary' into 'develop'
2019-04-10 kaniiniMerge branch 'notification-pleroma-settings' into ...
2019-04-09 lambdaMerge branch 'bugfix/follower_count' into 'develop'
2019-04-08 lainMerge remote-tracking branch 'origin/develop' into...
2019-04-08 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-08 lambdaMerge branch 'improve_upgrade_user_from_ap_id' into...
2019-04-08 lambdaMerge branch 'twitter_oauth' into 'develop'
2019-04-08 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-07 Ivan Tashkinov[#923] Removed <br> elements from auth forms, adjusted...
2019-04-05 Ivan Tashkinov[#923] OAuth consumer mode refactoring, new tests,...
2019-04-04 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-04 Ivan Tashkinov[#923] OAuth consumer controller tests. Misc. improvements.
2019-04-02 lambdaMerge branch 'features/pleroma-tan' into 'develop'
2019-04-02 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-04-02 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-04-02 Egor KislitsynMerge remote-tracking branch 'pleroma/develop' into...
2019-04-01 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-27 Alex Spassword reset page labels align
2019-03-27 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-03-27 Ivan Tashkinov[#923] OAuth consumer improvements, fixes, refactoring.
2019-03-20 Ivan Tashkinov[#923] Support for multiple OAuth consumer strategies.
2019-03-20 Ivan Tashkinov[#923] Nickname & email selection for external registra...
2019-03-18 Ivan Tashkinov[#923] Merge remote-tracking branch 'remotes/upstream...
2019-03-15 Ivan TashkinovMerge remote-tracking branch 'remotes/upstream/develop...
2019-03-15 Ivan Tashkinov[#923] OAuth: prototype of sign in / sign up with Twitter.
2019-03-14 rinpatchMerge develop to bump elixir version in the CI so I...
2019-03-14 rinpatchMerge branch 'hotfix/delete-activities' into 'develop'
2019-03-14 link0ffMerge remote-tracking branch 'upstream/develop' into...
2019-03-13 kaniiniMerge branch 'mastofe-content-types' into 'develop'
2019-03-11 rinpatchMerge branch 'ci-switch-to-elixir-1-8-1' into 'develop'
2019-03-11 Ivan TashkinovSign in via Twitter (WIP).
2019-03-11 lambdaMerge branch 'add-local-field-to-status' into 'develop'
2019-03-11 lambdaMerge branch 'feat/style-oauth-login-page' into 'develop'
2019-03-11 Shpuld ShpuldsonRemove chromium input hilight that clashes with our own
2019-03-11 Shpuld ShpuldsonStyle again the login page to fit pleroma more
2019-03-04 Karen KonouMerge branch 'bugfix/delete-activity-audience' of git...
2019-02-26 Ivan TashkinovMerge remote-tracking branch 'remotes/origin/develop...
2019-02-22 kaniiniMerge branch 'fix/twittercards' into 'develop'
2019-02-20 lambdaMerge branch '468_oauth2_scopes' into 'develop'
2019-02-20 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 hrefPlayer: allow styles on CSP, loop videos
2019-02-19 Mark FelderMerge branch 'develop' into fix/twittercards
2019-02-19 hrefEmbed player suitable for Twitter Cards
2019-02-19 Ivan Tashkinov[#468] Merged `upstream/develop`.
2019-02-19 lambdaMerge branch 'fix/check-follower-collection-in-is_priva...
2019-02-19 lambdaMerge branch 'fix/ap_id-unique_constraint' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/jobs' into 'develop'
2019-02-18 kaniiniMerge branch 'patch-image-description' into 'develop'
2019-02-18 kaniiniMerge branch 'feature/add-oauth-tokens-endpoint' into...
2019-02-18 kaniiniMerge branch 'features/flavour-switching' into 'develop'
2019-02-17 lambdaMerge branch 'develop' into 'docs/add-clients-to-ex_doc'
2019-02-17 Ivan Tashkinov[#468] Merged `upstream/develop`, resolved conflicts.
2019-02-17 Ivan Tashkinov[#468] Refactored OAuth scopes' defaults & missing...
2019-02-16 Haelwenn (lanodan... [MastoAPI] Add switching of frontend flavours
2019-02-15 Ivan Tashkinov[#468] Defined OAuth restrictions for all applicable...
2019-02-15 rinpatchMerge branch 'hellthread-filter-fix' into 'develop'
2019-02-14 lambdaMerge branch 'bugfix/activitypub-reserialization' into...
2019-02-14 Wim VanderbauwhedeMerge remote-tracking branch 'upstream/develop' into...
2019-02-14 kaniiniMerge branch 'fix/credo-issues-test' into 'develop'
2019-02-14 kaniiniMerge branch 'feature/activitypub-oauth-endpoints'...
2019-02-13 kaniiniMerge branch 'feature/better-login-errors' into 'develop'
2019-02-13 Mark FelderImprove login error for OAuth flow
2019-02-13 Ivan Tashkinov[#468] User UI for OAuth permissions restriction. Stand...
2019-02-09 Ivan Tashkinov[#468] Prototype of OAuth2 scopes support. TwitterAPI...
2019-02-06 rinpatchMerge branch 'fix/activitypub-user-view-badmap' into...
2019-02-04 kaniiniMerge branch 'mime-riff' into 'develop'
2019-02-04 rinpatchMerge branch 'fix/rich-media-relative-path' into 'develop'
2019-02-04 Egor KislitsynMerge branch 'develop' of git.pleroma.social:pleroma...
2019-02-02 rinpatchMerge branch 'fix/oauth-page-responsiveness' into ...
2019-02-02 Maxim FilippovAdd responsive features to layout
2019-02-01 kaniiniMerge branch 'feature/split-hide-network' into 'develop'
2019-02-01 hrefMerge branch '534_federation_targets_reachability'...
2019-01-31 HaelwennMerge branch 'docs/pleroma-api-invite-token' into ...
next