projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
2019-05-06
sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-05-06
lambda
Merge branch 'issue_800' into 'develop'
tree
|
commitdiff
2019-05-06
Maksim
fix format
tree
|
commitdiff
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-05-01
lambda
Merge branch 'features/download-mastofe-build' into...
tree
|
commitdiff
2019-05-01
Alex S
Merging with develop
tree
|
commitdiff
2019-04-30
Sachin Joshi
Merge branch 'develop' into bugfix/web-notification...
tree
|
commitdiff
2019-04-29
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
tree
|
commitdiff
2019-04-22
kaniini
Merge branch 'get-cached-everywhere' into 'develop'
tree
|
commitdiff
2019-04-22
Egor
Use `User.get_cached*` everywhere
tree
|
commitdiff
2019-04-22
kaniini
Merge branch 'rework-emoji-management' into 'develop'
tree
|
commitdiff
2019-04-21
rinpatch
Merge branch 'docs/posting_formatted' into 'develop'
tree
|
commitdiff
2019-04-21
lambda
Merge branch '923_oauth_controller_refactoring_p2'...
tree
|
commitdiff
2019-04-21
Ivan Tashkinov
[#923] Refactored OAuthController#authorize definitions...
tree
|
commitdiff
2019-04-19
kaniini
Merge branch 'feature/database-compaction' into 'develop'
tree
|
commitdiff
2019-04-19
lambda
Merge branch '923_oauth_consumer_refactoring_ci' into...
tree
|
commitdiff
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
tree
|
commitdiff
2019-04-17
Ivan Tashkinov
[#923] Minor semantic adjustment.
tree
|
commitdiff
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
tree
|
commitdiff
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
tree
|
commitdiff
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
tree
|
commitdiff
2019-04-10
Ivan Tashkinov
[#923] OAuth consumer params handling refactoring.
tree
|
commitdiff
2019-04-10
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-04-10
lambda
Merge branch 'feature/767-multiple-use-invite-token...
tree
|
commitdiff
2019-04-10
Sadposter
Merge branch 'develop' into feature/user-status-subscri...
tree
|
commitdiff
2019-04-10
kaniini
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
tree
|
commitdiff
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
tree
|
commitdiff
2019-04-09
lambda
Merge branch 'bugfix/follower_count' into 'develop'
tree
|
commitdiff
2019-04-08
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-04-08
lambda
Merge branch 'improve_upgrade_user_from_ap_id' into...
tree
|
commitdiff
2019-04-08
lambda
Merge branch 'twitter_oauth' into 'develop'
tree
|
commitdiff
2019-04-08
lambda
Merge branch 'feature/770-add-emoji-tags' into 'develop'
tree
|
commitdiff
2019-04-08
Egor Kislitsyn
Merge branch 'develop' into use-jobs-in-webpush
tree
|
commitdiff
2019-04-08
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-04-08
lambda
Merge branch 'develop' into 'improve_upgrade_user_from_...
tree
|
commitdiff
2019-04-08
lambda
Merge branch 'scheduled-activities' into 'develop'
tree
|
commitdiff
2019-04-06
feld
Merge branch 'fix/deactivated-user-error' into 'develop'
tree
|
commitdiff
2019-04-06
eugenijm
Return 403 on oauth token exchange for a deactivated...
tree
|
commitdiff
2019-04-05
Ivan Tashkinov
[#923] OAuth consumer mode refactoring, new tests,...
tree
|
commitdiff
2019-04-05
Ivan Tashkinov
[#923] OAuthController#callback adjustments (with tests).
tree
|
commitdiff
2019-04-04
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-04-04
Ivan Tashkinov
[#923] OAuth consumer controller tests. Misc. improvements.
tree
|
commitdiff
2019-04-04
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'bugfix/wrong-date-format' into 'develop'
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'feature/fake-statuses' into 'develop'
tree
|
commitdiff
2019-04-02
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'bugfix/share-mastodon' into 'develop'
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'remove-user-activities' into 'develop'
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'get_by_id' into 'develop'
tree
|
commitdiff
2019-04-02
Alex S
Merge develop into feature/770-add-emoji-tags
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
tree
|
commitdiff
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'features/mastoapi/2.6.0-force-login-optio...
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'get_by_id' into 'develop'
tree
|
commitdiff
2019-04-02
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-04-02
Egor Kislitsyn
change `Repo.get(User, id)` => `User.get_by_id(id)`
tree
|
commitdiff
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-04-01
Ivan Tashkinov
Fixed local MastoFE authentication / `force_login`...
tree
|
commitdiff
2019-04-01
Ivan Tashkinov
Added `force_login` authentication option (previously...
tree
|
commitdiff
2019-04-01
Ivan Tashkinov
[#923] Deps config adjustment (no `override` for `httpo...
tree
|
commitdiff
2019-04-01
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-03-30
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-03-29
lambda
Merge branch 'feature/deploy-docs' into 'develop'
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-27
lambda
Merge branch 'feature/more-user-filters' into 'develop'
tree
|
commitdiff
2019-03-26
lambda
Merge branch 'fix/ap-icon' into 'develop'
tree
|
commitdiff
2019-03-26
lambda
Merge branch 'features/mastoapi/2.7.2-instance-attribut...
tree
|
commitdiff
2019-03-26
lambda
Merge branch 'features/mastoapi/2.7.0-auth-error-messag...
tree
|
commitdiff
2019-03-26
Ivan Tashkinov
Comments split.
tree
|
commitdiff
2019-03-26
Ivan Tashkinov
Mastodon-based auth error messages. Defaulted User...
tree
|
commitdiff
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
tree
|
commitdiff
2019-03-22
lambda
Merge branch 'safe-mentions' into 'develop'
tree
|
commitdiff
2019-03-22
kaniini
Merge branch 'safe-mentions' into 'develop'
tree
|
commitdiff
2019-03-21
rinpatch
Merge branch 'ecto-3-migration' into 'develop'
tree
|
commitdiff
2019-03-20
Ivan Tashkinov
[#923] Support for multiple OAuth consumer strategies.
tree
|
commitdiff
2019-03-20
rinpatch
Ecto 3.0.5 migration
tree
|
commitdiff
2019-03-20
Ivan Tashkinov
[#923] Nickname & email selection for external registra...
tree
|
commitdiff
2019-03-18
Ivan Tashkinov
[#923] Support for multiple (external) registrations...
tree
|
commitdiff
2019-03-18
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
tree
|
commitdiff
2019-03-18
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-03-16
kaniini
Merge branch 'feature/federated-flags' into 'develop'
tree
|
commitdiff
2019-03-16
lambda
Merge branch 'feature/oauth-me' into 'develop'
tree
|
commitdiff
2019-03-16
kaniini
Merge branch 'feature/reblog-muting' into 'develop'
tree
|
commitdiff
2019-03-16
William Pitcock
oauth: add me property to token responses
tree
|
commitdiff
2019-03-15
kaniini
Merge branch 'fix/mediaproxy-capture-content-dispositio...
tree
|
commitdiff
2019-03-15
kaniini
Merge branch 'feature/openldap-support' into 'develop'
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-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
tree
|
commitdiff
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.AliasOrder
tree
|
commitdiff
2019-03-11
Ivan Tashkinov
Sign in via Twitter (WIP).
tree
|
commitdiff
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
tree
|
commitdiff
2019-03-03
link0ff
Move LDAP code to LDAPAuthenticator. Use Authenticator...
tree
|
commitdiff
2019-03-03
rinpatch
Merge branch 'remove-todo-txt' into 'develop'
tree
|
commitdiff
next