projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat...
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
twitter_api_controller.ex
2019-11-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-11-04
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
2019-10-27
Maxim Filippov
Merge branch 'develop' into feature/store-statuses...
blob
|
commitdiff
|
raw
2019-10-24
Egor Kislitsyn
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-10-23
feld
Merge branch '1304-user-info-deprecation' into 'develop'
blob
|
commitdiff
|
raw
2019-10-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
2019-10-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
2019-10-20
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
2019-10-20
Ivan Tashkinov
[#1304] Moved remaining fields from User.Info to User.
blob
|
commitdiff
|
raw
2019-10-19
rinpatch
Merge branch 'mix-emoji-task-pack-json' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-10-16
Ivan Tashkinov
[#1304] Moved all non-mutes / non-blocks fields from...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-10
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
Maxim Filippov
Merge branch 'develop' into feature/reports-groups...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
kaniini
Merge branch 'mrf/simple_policy/check_actor' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-07
Haelwenn
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-10-02
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kPherox
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
Ivan Tashkinov
[#1260] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-30
kaniini
Merge branch 'features/apc2s-media-upload' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-27
kaniini
Merge branch 'update/docs-jp' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/notification-controller' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'feature/return-link-for-password-reset...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-26
kaniini
Merge branch 'refactor/user' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Egor Kislitsyn
Fix Credo warnings
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Egor Kislitsyn
Cleanup Pleroma.User
blob
|
commitdiff
|
raw
|
diff to current
2019-09-24
Egor Kislitsyn
Add User.change_info/2 and User.update_info/2
blob
|
commitdiff
|
raw
|
diff to current
2019-09-19
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-18
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-17
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/return-total-for...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-15
Ivan Tashkinov
[#1234] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-15
Ivan Tashkinov
[#1234] Permissions-related fixes / new functionality...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-14
rinpatch
Merge branch 'fix/truncate-remote-user-fields' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-13
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-09
Maxim Filippov
Merge branch 'develop' into feature/moderation-log...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-07
Maksim Pechnikov
Merge branch 'develop' into support/tests
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
Maksim Pechnikov
Merge branch 'develop' into issue/1218
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-06
rinpatch
Merge branch 'so-long-twitterapi' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-31
rinpatch
credo fixes
blob
|
commitdiff
|
raw
|
diff to current
2019-08-31
rinpatch
Add back /api/qvitter/statuses/notifications/read.json
blob
|
commitdiff
|
raw
|
diff to current
2019-08-30
Maksim Pechnikov
added Emoji.Formatter
blob
|
commitdiff
|
raw
|
diff to current
2019-08-27
rinpatch
Remove most of TwitterAPIController
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
kaniini
Merge branch 'feature/richmedia-ttl' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-18
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-17
kaniini
Merge branch 'feature/instance-fetch-actor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-17
kaniini
Merge branch 'feature/http-signatures-keyid' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-17
kaniini
Merge branch 'password-reset-fix-for-non-test-env'...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-17
Eugenij
Fix password reset for non-test env
blob
|
commitdiff
|
raw
|
diff to current
2019-07-17
kaniini
Merge branch 'feature/mention-mrf' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
kaniini
Merge branch 'feature/1078-password-reset' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
Alexander Strizhakov
mastoapi password reset
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Sachin Joshi
Merge branch 'develop' into match-file-name
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
kaniini
Merge branch 'bugfix/llal-object-containment' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
kaniini
Merge branch 'feature/1072-muting-notifications' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
Alexander Strizhakov
Feature/1072 muting notifications
blob
|
commitdiff
|
raw
|
diff to current
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Ivan Tashkinov
[#878] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'feature/allow-user-query-via-id' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Roman Chvanikov
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Haelwenn
Merge branch 'remove-tag-warning' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Haelwenn
Merge branch 'bugfix/956-activity-id-nil-conversations...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
lain
Merge branch 'issue/941' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Maksim Pechnikov
update api to set skip_thread_containment
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
lambda
Merge branch 'align-mastodon-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-02
kaniini
Merge branch 'feature/notification-control-part-2'...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
kaniini
Merge branch 'bugfix/visibility-indicator-litepub-dm...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
lambda
Merge branch 'hotfix/leaking-lists' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
lambda
Merge branch 'use-pleroma-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
Egor Kislitsyn
Use Pleroma.Config everywhere
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-23
Sachin Joshi
fix merge conflict
blob
|
commitdiff
|
raw
|
diff to current
next