projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' into tests/mastodon_api_controller.ex
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
status_view.ex
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/return-total-for...
blob
|
commitdiff
|
raw
2019-09-15
Maksim Pechnikov
Merge branch 'develop' into support/tests
blob
|
commitdiff
|
raw
2019-09-14
rinpatch
Merge branch 'fix/truncate-remote-user-fields' into...
blob
|
commitdiff
|
raw
2019-09-14
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
2019-09-13
lain
Merge branch 'refactor/add_link_headers' into 'develop'
blob
|
commitdiff
|
raw
2019-09-13
rinpatch
Merge branch 'admin-config-description' into 'develop'
blob
|
commitdiff
|
raw
2019-09-11
Haelwenn
Merge branch 'patch-5' into 'develop'
blob
|
commitdiff
|
raw
2019-09-11
lain
Merge branch 'fix/oom-parallel-rendering' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-10
rinpatch
Revert "Parallelize template rendering"
blob
|
commitdiff
|
raw
|
diff to current
2019-09-07
shadowfacts
Mastodon API: URI encode hashtag name in generated...
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
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-09-05
Haelwenn
Merge branch 'feature/mastoapi-accounts-external' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-05
rinpatch
Merge branch 'fix/endless-poll-handling' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-05
rinpatch
Mastodon API Poll view: Fix handling of polls without...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-05
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-05
rinpatch
Merge branch 'fix/safe-render-notifications' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
rinpatch
Merge branch 'dockerfile-touchups' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
Haelwenn
Merge branch 'feat/mastoapi-status-threadmuted' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-09-04
rinpatch
Mastodon API: Add `pleroma.thread_muted` to Status...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-31
Ivan Tashkinov
[#1149] Added Oban job for "activity_expiration". Merge...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-25
kaniini
Merge branch 'issue/1177' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-25
kaniini
Merge branch 'fix-all-custom-fields-deleted' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
kaniini
Merge branch 'activity-expiration' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-24
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-22
Ivan Tashkinov
[#1149] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'fix/admin-api-user-deletion' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'digest-template' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-20
lain
Merge branch 'feature/custom-fields' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-19
lain
Merge branch 'develop' into 'fix/reverse-proxy-body...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-19
lain
Merge branch 'hotfix/user_unfollow' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-18
kaniini
Merge branch 'feature/hide-muted-threads-from-timeline...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-16
lain
Merge branch 'pleroma-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-15
kaniini
Merge branch 'features/formatting-sub_sup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-15
lain
Merge branch 'feature/parallel-rendering' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-15
rinpatch
Parallelize template rendering
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Maxim Filippov
Merge branch 'develop' into 'fix/admin-api-user-deletion'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-14
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-13
rinpatch
Merge branch 'feature/mrf-vocabulary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-13
kaniini
Merge branch 'feature/mrf-describe' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-13
rinpatch
Merge branch 'length-limit-bio' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-13
Haelwenn
Merge branch 'fix/mastoapi-more-object-preloads' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-13
rinpatch
Mastodon API: Preloading and normalization optimizations
blob
|
commitdiff
|
raw
|
diff to current
2019-08-10
kaniini
Merge branch 'develop' into 'fix/hide-follows-counters'
blob
|
commitdiff
|
raw
|
diff to current
2019-08-10
kaniini
Merge branch 'fix/mastoapi-threadmute-detection' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-08-10
rinpatch
Mastodon API: Fix thread mute detection
blob
|
commitdiff
|
raw
|
diff to current
2019-08-08
lain
Merge remote-tracking branch 'origin/develop' into...
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-07-31
lain
StatusView: Return direct conversation id.
blob
|
commitdiff
|
raw
|
diff to current
2019-07-25
rinpatch
Merge branch 'develop' into feature/hide-follows-remote
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'fix-remote-follow-from-ostatus-subscribe...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'fix/put-correct-activity-url' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Sergey Suprunenko
Show the url advertised in the Activity in the Status...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Mike Verdone
Revert "squash! Expose expires_at datetime in mastoAPI...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Mike Verdone
squash! Expose expires_at datetime in mastoAPI only...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Mike Verdone
Expose expires_at datetime in mastoAPI only for the...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
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-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-16
lain
Status View: Poll ids are strings.
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-12
Roman Chvanikov
merge develop
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-10
kaniini
Merge branch 'feature/render-mentions-for-tags' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
Sergey Suprunenko
Create mentions only for explicitly mentioned users
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
kaniini
Merge branch 'tests/web/mastodon_api/search_controller...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-10
Maksim
add test for search_controller/ 100% coverage
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 'remove-avatar-header' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Mark Felder
Merge branch 'develop' into feature/allow-user-query...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'remove-swift' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
kaniini
Merge branch 'features/sec-websocket-protocol-header...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Haelwenn
Merge branch 'enable-ogp-by-default' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Haelwenn
Merge branch 'test-speedup' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
Mark Felder
Merge branch 'develop' into proxy-error
blob
|
commitdiff
|
raw
|
diff to current
2019-07-09
rinpatch
Merge branch '161-incoming-replies-depth-limit' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-08
Haelwenn
Merge branch 'fix/relationships-in-statuses' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-08
rinpatch
Mastodon API: Fix embedded relationships not being...
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-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-04
kaniini
Merge branch 'feature/mrf-subchain' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'generic-fe-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'ueberauth_config_extension' into 'develop'
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
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
rinpatch
Merge branch 'feature/polls-2-electric-boogalo' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
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-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-02
rinpatch
Remove a TODO comment as the tests for poll view were...
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
Mastodon API: actually check for poll votes
blob
|
commitdiff
|
raw
|
diff to current
next