projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge develop
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
2019-07-09
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
tree
|
commitdiff
2019-07-09
Mark Felder
Merge branch 'develop' into feature/allow-user-query...
tree
|
commitdiff
2019-07-09
kaniini
Merge branch 'remove-swift' into 'develop'
tree
|
commitdiff
2019-07-09
kaniini
Merge branch 'features/sec-websocket-protocol-header...
tree
|
commitdiff
2019-07-09
Haelwenn
Merge branch 'enable-ogp-by-default' into 'develop'
tree
|
commitdiff
2019-07-09
Haelwenn
Merge branch 'test-speedup' into 'develop'
tree
|
commitdiff
2019-07-09
Mark Felder
Merge branch 'develop' into proxy-error
tree
|
commitdiff
2019-07-09
rinpatch
Merge branch '161-incoming-replies-depth-limit' into...
tree
|
commitdiff
2019-07-08
Haelwenn
Merge branch 'fix/relationships-in-statuses' into ...
tree
|
commitdiff
2019-07-08
rinpatch
Mastodon API: Fix embedded relationships not being...
tree
|
commitdiff
2019-06-28
Roman Chvanikov
Resolve conflicts
tree
|
commitdiff
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
tree
|
commitdiff
2019-06-21
kaniini
Merge branch 'oauth_secure_redirect' into 'develop'
tree
|
commitdiff
2019-06-20
rinpatch
Merge branch 'feature/release-update-script' into ...
tree
|
commitdiff
2019-06-19
rinpatch
Merge branch 'begone-the-dot-hack' into 'develop'
tree
|
commitdiff
2019-06-19
lain
Merge branch 'fix/rich-media-hashtags-again' into ...
tree
|
commitdiff
2019-06-19
lain
Merge branch 'update-frontend-c4fcdc71' into 'develop'
tree
|
commitdiff
2019-06-18
lain
Merge branch 'deps/update-auto-linker' into 'develop'
tree
|
commitdiff
2019-06-18
lain
Merge branch 'fix/mastoapi-sanitize-display-name' into...
tree
|
commitdiff
2019-06-18
rinpatch
Mastodon API: Sanitize display names
tree
|
commitdiff
2019-06-16
rinpatch
Merge branch 'fix/991-version-generation' into 'develop'
tree
|
commitdiff
2019-06-15
lain
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
tree
|
commitdiff
2019-06-15
kaniini
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
tree
|
commitdiff
2019-06-15
rinpatch
Merge branch 'feature/add-chat-token-to-masto-api'...
tree
|
commitdiff
2019-06-15
lain
Mastodon API: Return the token needed for the chat.
tree
|
commitdiff
2019-06-14
rinpatch
Merge branch 'feature/add-background-image-to-mastoapi...
tree
|
commitdiff
2019-06-13
lain
AccountView: Add user background.
tree
|
commitdiff
2019-06-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
tree
|
commitdiff
2019-06-04
Roman Chvanikov
Fix conflict
tree
|
commitdiff
2019-06-04
Haelwenn
Merge branch 'remove-tag-warning' into 'develop'
tree
|
commitdiff
2019-06-04
Haelwenn
Merge branch 'bugfix/956-activity-id-nil-conversations...
tree
|
commitdiff
2019-06-04
lain
Merge branch 'issue/941' into 'develop'
tree
|
commitdiff
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
tree
|
commitdiff
2019-06-04
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
tree
|
commitdiff
2019-06-04
kaniini
Merge branch 'feature/mrf-subchain' into 'develop'
tree
|
commitdiff
2019-06-04
kaniini
Merge branch 'generic-fe-settings' into 'develop'
tree
|
commitdiff
2019-06-04
kaniini
Merge branch 'ueberauth_config_extension' into 'develop'
tree
|
commitdiff
2019-06-03
Mark Felder
Merge branch 'develop' into feature/digest-email
tree
|
commitdiff
2019-06-03
Maksim Pechnikov
update api to set skip_thread_containment
tree
|
commitdiff
2019-06-03
Mark Felder
Merge branch 'develop' into update-oauth-template
tree
|
commitdiff
2019-06-03
rinpatch
Merge branch 'feature/polls-2-electric-boogalo' into...
tree
|
commitdiff
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
tree
|
commitdiff
2019-06-03
rinpatch
Merge branch 'fix-dokku' into 'develop'
tree
|
commitdiff
2019-06-03
lambda
Merge branch 'align-mastodon-conversations' into 'develop'
tree
|
commitdiff
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
tree
|
commitdiff
2019-06-02
rinpatch
Remove a TODO comment as the tests for poll view were...
tree
|
commitdiff
2019-06-02
kaniini
Merge branch 'feature/notification-control-part-2'...
tree
|
commitdiff
2019-06-01
rinpatch
Mastodon API: actually check for poll votes
tree
|
commitdiff
2019-06-01
rinpatch
Resolve merge conflicts
tree
|
commitdiff
2019-06-01
kaniini
Merge branch 'bugfix/visibility-indicator-litepub-dm...
tree
|
commitdiff
2019-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
tree
|
commitdiff
2019-05-31
lambda
Merge branch 'hotfix/leaking-lists' into 'develop'
tree
|
commitdiff
2019-05-31
lain
AccountView: settings -> settings_store
tree
|
commitdiff
2019-05-31
lain
User: Add settings store to Info, AccountView
tree
|
commitdiff
2019-05-31
lain
Mastodon Conversation API: Don't return own account...
tree
|
commitdiff
2019-05-30
feld
Merge branch 'fix/ogp-missing-data' into 'develop'
tree
|
commitdiff
2019-05-30
Sergey Suprunenko
Replace missing non-nullable Card attributes with empty...
tree
|
commitdiff
2019-05-29
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-05-23
Sachin Joshi
fix merge conflict
tree
|
commitdiff
2019-05-22
rinpatch
Fix credo issues
tree
|
commitdiff
2019-05-22
lambda
Merge branch 'feature/object-pruning' into 'develop'
tree
|
commitdiff
2019-05-22
lambda
Merge branch 'refactor/keys' into 'develop'
tree
|
commitdiff
2019-05-22
rinpatch
Merge branch 'bugfix/account_view_source.note' into...
tree
|
commitdiff
2019-05-22
Haelwenn (lanodan...
MastoAPI AccountView: fill source.note with plaintext...
tree
|
commitdiff
2019-05-22
kaniini
Merge branch 'mongooseim-support' into 'develop'
tree
|
commitdiff
2019-05-21
rinpatch
Actual vote count in poll view
tree
|
commitdiff
2019-05-21
kaniini
Merge branch 'fix/prometheus-ecto-error-when-not-config...
tree
|
commitdiff
2019-05-20
kaniini
Merge branch 'refactor/add-virtual-thread-muted-field...
tree
|
commitdiff
2019-05-20
Aaron Tinio
Add virtual :thread_muted? field
tree
|
commitdiff
2019-05-19
rinpatch
Remove tags/mentions/rich text from poll options becaus...
tree
|
commitdiff
2019-05-18
rinpatch
Resolve merge conflicts and remove IO.inspects
tree
|
commitdiff
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-05-17
lambda
Merge branch 'ecto_sql_update' into 'develop'
tree
|
commitdiff
2019-05-17
lambda
Merge branch 'update-tzdata' into 'develop'
tree
|
commitdiff
2019-05-17
lambda
Merge branch 'bugfix/903-mastoapi-relationship-requeste...
tree
|
commitdiff
2019-05-17
lambda
Update account_view.ex
tree
|
commitdiff
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-05-17
rinpatch
Render polls in statuses
tree
|
commitdiff
2019-05-17
Haelwenn (lanodan...
MastoAPI account_view.ex: requested is false when follo...
tree
|
commitdiff
2019-05-15
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-05-15
kaniini
Merge branch 'fix/public-option-not-working' into ...
tree
|
commitdiff
2019-05-15
lambda
Merge branch 'chore/extricate-http-signatures' into...
tree
|
commitdiff
2019-05-15
kaniini
Merge branch 'prevent-public-answers' into 'develop'
tree
|
commitdiff
2019-05-15
lain
CommonAPI: Refactor visibility, forbid public to privat...
tree
|
commitdiff
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-05-13
lambda
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
tree
|
commitdiff
2019-05-08
Roman Chvanikov
Merge develop
tree
|
commitdiff
2019-05-07
kaniini
Merge branch 'refactor/preload-bookmarks-with-activitie...
tree
|
commitdiff
2019-05-07
rinpatch
Remove `bookmarks` assoc and add a fake `bookmark`...
tree
|
commitdiff
2019-05-07
rinpatch
- Actually use preloaded bookmarks in views
tree
|
commitdiff
2019-05-07
kaniini
Merge branch 'docs/MRF-modules' into 'develop'
tree
|
commitdiff
2019-05-07
lambda
Merge branch 'conversations_three' into 'develop'
tree
|
commitdiff
2019-05-07
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-05-01
Mark Felder
Merge branch 'develop' into update-oauth-template
tree
|
commitdiff
2019-05-01
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
next