projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅ next
Attempt to resolve merge conflict
[akkoma]
/
test
/
web
/
common_api
/
common_api_utils_test.exs
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
2018-09-02
kaniini
Merge branch 'hotfix_broken_likes' into 'develop'
blob
|
commitdiff
|
raw
2018-08-27
lambda
Merge branch 'feature/relay' into 'develop'
blob
|
commitdiff
|
raw
2018-08-27
lambda
Merge branch 'bugfix/announce-timeline-flooding' into...
blob
|
commitdiff
|
raw
2018-08-26
kaniini
Merge branch 'feature/emoji-in-local-users' into 'develop'
blob
|
commitdiff
|
raw
2018-08-26
William Pitcock
tests: fix formatting
blob
|
commitdiff
|
raw
2018-08-13
eal
Use Image type for emoji icons.
blob
|
commitdiff
|
raw
|
diff to current
2018-08-13
eal
CommonAPI: add emoji to user source data on update
blob
|
commitdiff
|
raw
|
diff to current
2018-05-26
lain
Merge branch 'develop' into csaurus/pleroma-feature...
blob
|
commitdiff
|
raw
|
diff to current
2018-05-24
lambda
Merge branch 'feature/lists' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-05-24
lambda
Merge branch 'feature/incoming-remote-unfollow' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-05-24
lambda
Merge branch 'feature/change-password' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-05-22
csaurus
Merge branch 'develop' into feature/mstdn-direct-api
blob
|
commitdiff
|
raw
|
diff to current
2018-05-21
Syldexia
Fixed test
blob
|
commitdiff
|
raw
|
diff to current
2018-05-20
Francis Dinh
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-05-20
lambda
Merge branch 'feature/account-deletion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-05-13
Syldexia
Fixed formatting and test
blob
|
commitdiff
|
raw
|
diff to current
2018-05-13
Syldexia
Added endpoint for user account deletion
blob
|
commitdiff
|
raw
|
diff to current
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
KANEKO Yoshitaka
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-03-30
lain
Format the code.
blob
|
commitdiff
|
raw
|
diff to current
2017-12-09
Roger Braun
Merge branch 'develop' into feature/activitypub
blob
|
commitdiff
|
raw
|
diff to current
2017-11-18
lambda
Merge branch 'formatting-fixes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2017-11-18
eal
Don't insert newlines to generated HTML.
blob
|
commitdiff
|
raw
|
diff to current
2017-09-15
Roger Braun
Refactor posting and make character limit configurable.
blob
|
commitdiff
|
raw
|
diff to current