projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Merge branch 'develop' into oembed_provider
[akkoma]
/
lib
/
pleroma
/
web
/
templates
/
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
2018-04-24
Normandy
Fix typo in MastoFE login page.
tree
|
commitdiff
2018-04-24
lambda
Merge branch 'feature/message-rewrite-facility' into...
tree
|
commitdiff
2018-04-24
lambda
Merge branch 'favicon_tag' into 'develop'
tree
|
commitdiff
2018-04-20
Francis Dinh
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2018-04-18
lambda
Merge branch 'fix/rm-user-task' into 'develop'
tree
|
commitdiff
2018-04-18
lambda
Merge branch 'fix/login-with-username-or-email' into...
tree
|
commitdiff
2018-04-18
eal
MastoAPI and OAuth: allow login with either email or...
tree
|
commitdiff
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
tree
|
commitdiff
2018-04-02
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2018-04-01
KANEKO Yoshitaka
Fix conflict
tree
|
commitdiff
2018-03-31
lambda
Merge branch 'new-mastofe' into 'develop'
tree
|
commitdiff
2018-03-31
Morgan Bazalgette
Remove pl-dark-masto-fe, add preloading for common...
tree
|
commitdiff
2018-03-20
lambda
Merge branch 'patch-README' into 'develop'
tree
|
commitdiff
2018-03-13
lain
Merge branch 'andarna/pleroma-develop' into develop
tree
|
commitdiff
2018-03-13
lain
Move stuff around.
tree
|
commitdiff
2018-03-13
Wim Vanderbauwhede
A small patch to show the instance name and favicon...
tree
|
commitdiff
2018-02-12
lain
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed...
tree
|
commitdiff
2018-02-11
Hakaba Hitoyo
Merge remote-tracking branch 'hakabahitoyo/feature...
tree
|
commitdiff
2018-02-11
Roger Braun
Merge branch 'develop' into feature/activitypub
tree
|
commitdiff
2018-02-09
lambda
Merge branch 'develop' into 'develop'
tree
|
commitdiff
2018-02-08
lambda
Merge branch 'fix/config-disable-chat' into 'develop'
tree
|
commitdiff
2018-02-08
Calv Collins
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2018-02-08
Calv Collins
Create action_fallback for username/password incorrect...
tree
|
commitdiff
2018-02-03
lambda
Merge branch 'move-backend-images' into 'develop'
tree
|
commitdiff
2018-02-02
Roger Braun
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2018-02-02
lambda
Merge branch 'feature/remote-follow' into 'develop'
tree
|
commitdiff
2018-02-01
eal
Add remote following of local profiles.
tree
|
commitdiff
2018-01-30
Roger Braun
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed...
tree
|
commitdiff
2018-01-30
lambda
Merge branch 'feature/caddyfile' into 'develop'
tree
|
commitdiff
2018-01-27
lambda
Merge branch 'feature/longfox' into 'develop'
tree
|
commitdiff
2018-01-26
lambda
Merge branch 'feature/cross-origin' into 'develop'
tree
|
commitdiff
2018-01-24
Jeff Becker
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2018-01-20
lambda
Merge branch 'feature/remote-follow' into 'develop'
tree
|
commitdiff
2018-01-18
eal
Revert "Revert "Add remote follow pages.""
tree
|
commitdiff
2018-01-18
eal
Revert "Add remote follow pages."
tree
|
commitdiff
2018-01-18
eal
Add remote follow pages.
tree
|
commitdiff
2017-12-09
Roger Braun
Merge branch 'develop' into feature/activitypub
tree
|
commitdiff
2017-11-23
Roger Braun
MastodonUI login: Show error message on error.
tree
|
commitdiff
2017-11-22
lambda
Merge branch 'develop' into 'develop'
tree
|
commitdiff
2017-11-19
Hyper! (Stitch)
Add Custom Pleroma-dark theme
tree
|
commitdiff
2017-11-16
lambda
Merge branch 'feature/masto-styled-login-page' into...
tree
|
commitdiff
2017-11-16
Roger Braun
Small css fix.
tree
|
commitdiff
2017-11-16
Shpuld Shpuldson
Add styles to make login page resemble mastodon's
tree
|
commitdiff
2017-11-12
Roger Braun
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2017-11-12
Roger Braun
Add Mastodon frontend.
tree
|
commitdiff
2017-10-19
Roger Braun
Add password reset.
tree
|
commitdiff
2017-09-14
Roger Braun
Preserve state in oauth
tree
|
commitdiff
2017-09-11
lambadalambda
Merge branch 'oauth2' into 'develop'
tree
|
commitdiff
2017-09-11
Roger Braun
Merge branch 'develop' into oauth2
tree
|
commitdiff
2017-09-06
Roger Braun
Add very basic oauth and mastodon api support.
tree
|
commitdiff