projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
A feature for shareable emoji packs, use it in download_from & tests
[akkoma]
/
test
/
web
/
common_api
/
common_api_utils_test.exs
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-08-22
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
2019-08-20
lain
Merge branch 'fix/admin-api-user-deletion' into 'develop'
blob
|
commitdiff
|
raw
2019-08-20
lain
Merge branch 'digest-template' into 'develop'
blob
|
commitdiff
|
raw
2019-08-20
lain
Merge branch 'feature/custom-fields' into 'develop'
blob
|
commitdiff
|
raw
2019-08-19
lain
Merge branch 'develop' into 'fix/reverse-proxy-body...
blob
|
commitdiff
|
raw
2019-08-19
lain
Merge branch 'hotfix/user_unfollow' into 'develop'
blob
|
commitdiff
|
raw
2019-08-18
kaniini
Merge branch 'feature/hide-muted-threads-from-timeline...
blob
|
commitdiff
|
raw
2019-08-16
lain
Merge branch 'pleroma-conversations' into 'develop'
blob
|
commitdiff
|
raw
2019-08-14
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-08-13
rinpatch
Merge branch 'length-limit-bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-09
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge branch 'feature/digest-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
2019-08-06
Haelwenn
Merge branch 'fix/object-reembeds' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-05
kaniini
Merge branch 'test/common_api_utils.ex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-05
Maksim
tests for CommonApi/Utils
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
lain
Pleroma API: Add endpoint to get conversation statuses.
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-08-02
lain
Merge branch 'feature/hide-follows-remote' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-31
kaniini
Merge branch 'fix/disallow-ostatus-follows-locked'...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-31
kaniini
Merge branch 'test/web_common_api_utils' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-31
Maksim
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
blob
|
commitdiff
|
raw
|
diff to current
2019-07-29
kaniini
Merge branch 'revert-83508418' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-29
kaniini
Revert "Merge branch 'bugfix/clean-up-markdown-renderin...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-29
Haelwenn
Merge branch 'bugfix/clean-up-markdown-rendering' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-29
Ariadne Conill
markdown: clean up html generated by earmark
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
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-16
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
rinpatch
Merge branch 'bugfix/poll-id-as-string' into 'develop'
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
feld
Merge branch 'match-file-name' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
kaniini
Merge branch 'tests/mastodon-common-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Sergey Suprunenko
Add more tests for MastodonAPIController and CommonAPI
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-06
Roman Chvanikov
Resolve conflicts
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-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
lain
CommonAPI.Utils: Add tests.
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lambda
Merge branch 'features/download-mastofe-build' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Sachin Joshi
Merge branch 'develop' into bugfix/web-notification...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-27
kaniini
Merge branch 'feature/bbcode' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-26
William Pitcock
tests: fix up for changed bbcode library output and...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-26
William Pitcock
add support for bbcode
blob
|
commitdiff
|
raw
|
diff to current
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
kaniini
Merge branch 'rework-emoji-management' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Fix tests that used finmoji
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
Alex S
Merge develop to 770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-03
lambda
Merge branch 'feature/robotstxt' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Haelwenn
Merge branch 'fix-slow-relationships' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'bugfix/wrong-date-format' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Sergey Suprunenko
Ignore dates in wrong formats
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Sergey Suprunenko
Handle dates in the Unix timestamp format (Fixes #763)
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-25
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
lambda
Merge branch 'safe-mentions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
kaniini
Merge branch 'safe-mentions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-22
kaniini
Merge branch 'feature/mastoapi-ext-conversation-id...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-21
William Pitcock
tests: fixup
blob
|
commitdiff
|
raw
|
diff to current
2019-03-21
William Pitcock
common api: move context functions from twitterapi
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.AliasOrder
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Karen Konou
Merge branch 'bugfix/delete-activity-audience' of git...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-03
lambda
Merge branch 'fix/dont-show-dms-in-mentions-timeline...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-02
rinpatch
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-01
lambda
Merge branch 'bugfix/236-ambiguous-route-for-numerical...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
href
Merge branch 'customizable_auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-28
href
Merge branch 'customizable_auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-27
kaniini
Merge branch 'fix/formatter' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-27
Egor Kislitsyn
fix formatter
blob
|
commitdiff
|
raw
|
diff to current
2019-02-26
kaniini
Merge branch 'auto_linker' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next