projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-04-02
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-04-01
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2019-03-27
Ivan Tashkinov
[#923] OAuth consumer improvements, fixes, refactoring.
tree
|
commitdiff
2019-03-20
Ivan Tashkinov
[#923] Support for multiple OAuth consumer strategies.
tree
|
commitdiff
2019-03-20
Ivan Tashkinov
[#923] Nickname & email selection for external registra...
tree
|
commitdiff
2019-03-18
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-03-15
Ivan Tashkinov
[#923] OAuth: prototype of sign in / sign up with Twitter.
tree
|
commitdiff
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
tree
|
commitdiff
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
tree
|
commitdiff
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
tree
|
commitdiff
2019-03-11
rinpatch
Merge branch 'ci-switch-to-elixir-1-8-1' into 'develop'
tree
|
commitdiff
2019-03-11
Ivan Tashkinov
Sign in via Twitter (WIP).
tree
|
commitdiff
2019-03-11
lambda
Merge branch 'add-local-field-to-status' into 'develop'
tree
|
commitdiff
2019-03-11
lambda
Merge branch 'feat/style-oauth-login-page' into 'develop'
tree
|
commitdiff
2019-03-11
Shpuld Shpuldson
Remove chromium input hilight that clashes with our own
tree
|
commitdiff
2019-03-11
Shpuld Shpuldson
Style again the login page to fit pleroma more
tree
|
commitdiff
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
tree
|
commitdiff
2019-02-26
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2019-02-22
kaniini
Merge branch 'fix/twittercards' into 'develop'
tree
|
commitdiff
2019-02-20
lambda
Merge branch '468_oauth2_scopes' into 'develop'
tree
|
commitdiff
2019-02-20
Ivan Tashkinov
[#468] Merged `upstream/develop`.
tree
|
commitdiff
2019-02-19
href
Player: allow styles on CSP, loop videos
tree
|
commitdiff
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
tree
|
commitdiff
2019-02-19
href
Embed player suitable for Twitter Cards
tree
|
commitdiff
2019-02-19
Ivan Tashkinov
[#468] Merged `upstream/develop`.
tree
|
commitdiff
2019-02-19
lambda
Merge branch 'fix/check-follower-collection-in-is_priva...
tree
|
commitdiff
2019-02-19
lambda
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'patch-image-description' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/add-oauth-tokens-endpoint' into...
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'features/flavour-switching' into 'develop'
tree
|
commitdiff
2019-02-17
lambda
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
tree
|
commitdiff
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
tree
|
commitdiff
2019-02-17
Ivan Tashkinov
[#468] Refactored OAuth scopes' defaults & missing...
tree
|
commitdiff
2019-02-16
Haelwenn (lanodan...
[MastoAPI] Add switching of frontend flavours
tree
|
commitdiff
2019-02-15
Ivan Tashkinov
[#468] Defined OAuth restrictions for all applicable...
tree
|
commitdiff
2019-02-15
rinpatch
Merge branch 'hellthread-filter-fix' into 'develop'
tree
|
commitdiff
2019-02-14
lambda
Merge branch 'bugfix/activitypub-reserialization' into...
tree
|
commitdiff
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-02-14
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
tree
|
commitdiff
2019-02-14
kaniini
Merge branch 'feature/activitypub-oauth-endpoints'...
tree
|
commitdiff
2019-02-13
kaniini
Merge branch 'feature/better-login-errors' into 'develop'
tree
|
commitdiff
2019-02-13
Mark Felder
Improve login error for OAuth flow
tree
|
commitdiff
2019-02-13
Ivan Tashkinov
[#468] User UI for OAuth permissions restriction. Stand...
tree
|
commitdiff
2019-02-09
Ivan Tashkinov
[#468] Prototype of OAuth2 scopes support. TwitterAPI...
tree
|
commitdiff
2019-02-06
rinpatch
Merge branch 'fix/activitypub-user-view-badmap' into...
tree
|
commitdiff
2019-02-04
kaniini
Merge branch 'mime-riff' into 'develop'
tree
|
commitdiff
2019-02-04
rinpatch
Merge branch 'fix/rich-media-relative-path' into 'develop'
tree
|
commitdiff
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-02
rinpatch
Merge branch 'fix/oauth-page-responsiveness' into ...
tree
|
commitdiff
2019-02-02
Maxim Filippov
Add responsive features to layout
tree
|
commitdiff
2019-02-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
tree
|
commitdiff
2019-02-01
href
Merge branch '534_federation_targets_reachability'...
tree
|
commitdiff
2019-01-31
Haelwenn
Merge branch 'docs/pleroma-api-invite-token' into ...
tree
|
commitdiff
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
tree
|
commitdiff
2019-01-31
Haelwenn
Merge branch 'features/glitch-soc-frontend' into 'develop'
tree
|
commitdiff
2019-01-28
Haelwenn (lanodan...
/web/index template: Modify for glitch-soc
tree
|
commitdiff
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
tree
|
commitdiff
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
tree
|
commitdiff
2018-12-16
eal
Merge branch 'fix/masto-put-settings' into 'develop'
tree
|
commitdiff
2018-12-14
raeno
Merge branch 'develop' into oembed_provider
tree
|
commitdiff
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
tree
|
commitdiff
2018-12-14
href
Merge branch '114_user_registration_emails' into 'develop'
tree
|
commitdiff
2018-12-14
raeno
Fix tests. Remove oembed template
tree
|
commitdiff
2018-12-13
raeno
WIP. Implement oembed route and handle both json/xml...
tree
|
commitdiff
2018-12-13
Ivan Tashkinov
[#114] Refactored `password_reset` (moved to TwitterAPI...
tree
|
commitdiff
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
tree
|
commitdiff
2018-12-01
rinpatch
Attempt to resolve merge conflict
tree
|
commitdiff
2018-11-30
lain
Merge remote-tracking branch 'origin' into validate...
tree
|
commitdiff
2018-11-27
kaniini
Merge branch 'fix/version-string-force-git-abbrev-size...
tree
|
commitdiff
2018-11-27
kaniini
Merge branch 'ogg-theora-detection' into 'develop'
tree
|
commitdiff
2018-11-27
Haelwenn
Merge branch 'feature/mrf-user-allowlist' into 'develop'
tree
|
commitdiff
2018-11-26
kaniini
Merge branch 'fix/pleromafe-title' into 'develop'
tree
|
commitdiff
2018-11-26
Mark Felder
Replace this hardcoded <title>
tree
|
commitdiff
2018-11-15
Hakaba Hitoyo
Merge remote-tracking branch 'official/develop' into...
tree
|
commitdiff
2018-11-10
kaniini
Merge branch 'tests/prismo-url-map' into 'develop'
tree
|
commitdiff
2018-11-07
kaniini
Merge branch 'runtime-config' into 'develop'
tree
|
commitdiff
2018-11-06
kaniini
Merge branch 'patch-2' into 'develop'
tree
|
commitdiff
2018-11-06
kaniini
Merge branch 'unify-mastodon-oauth' into 'develop'
tree
|
commitdiff
2018-11-06
lain
Unify Mastodon Login with OAuth login.
tree
|
commitdiff
2018-09-02
kaniini
Merge branch 'hotfix_broken_likes' into 'develop'
tree
|
commitdiff
2018-08-27
lambda
Merge branch 'bugfix/announce-timeline-flooding' into...
tree
|
commitdiff
2018-08-26
kaniini
Merge branch 'feature/emoji-in-local-users' into 'develop'
tree
|
commitdiff
2018-08-26
kaniini
Merge branch 'develop' into 'feature/relay'
tree
|
commitdiff
2018-08-20
eal
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
tree
|
commitdiff
2018-08-16
kaniini
Merge branch 'patch-2' into 'develop'
tree
|
commitdiff
2018-08-16
kaniini
Merge branch 'dev-lanodan-url-regex' into 'develop'
tree
|
commitdiff
2018-08-16
kaniini
Merge branch 'mastofe/system-font' into 'develop'
tree
|
commitdiff
2018-07-03
Haelwenn (lanodan...
/web/* template: Add class system-font
tree
|
commitdiff
2018-05-13
lambda
Merge branch 'feature/unrepeats' into 'develop'
tree
|
commitdiff
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
tree
|
commitdiff
2018-04-28
lambda
Merge branch 'fix/blocked-user-boosts' into 'develop'
tree
|
commitdiff
2018-04-28
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2018-04-27
lambda
Merge branch 'bugfix/mrf-simple-media-stripping' into...
tree
|
commitdiff
2018-04-26
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2018-04-25
eal
Merge branch 'patch-1' into 'develop'
tree
|
commitdiff
next