projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Resolve merge conflicts
[akkoma]
/
test
/
web
/
twitter_api
/
2019-02-20
lambda
Merge branch '468_oauth2_scopes' into 'develop'
tree
|
commitdiff
2019-02-20
Ivan Tashkinov
[#468] Merged `upstream/develop`.
tree
|
commitdiff
2019-02-20
Ivan Tashkinov
[#468] More OAuth scopes-specific tests.
tree
|
commitdiff
2019-02-19
Ivan Tashkinov
[#468] Added OAuth scopes-specific tests.
tree
|
commitdiff
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
tree
|
commitdiff
2019-02-19
Ivan Tashkinov
[#468] Merged `upstream/develop`.
tree
|
commitdiff
2019-02-19
lambda
Merge branch 'fix/check-follower-collection-in-is_priva...
tree
|
commitdiff
2019-02-19
lambda
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'patch-image-description' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/add-oauth-tokens-endpoint' into...
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'features/flavour-switching' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'follow-request-count' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'csv-export' into 'develop'
tree
|
commitdiff
2019-02-17
Maxim Filippov
Fix test
tree
|
commitdiff
2019-02-17
lambda
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
tree
|
commitdiff
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
tree
|
commitdiff
2019-02-16
lain
Add option to return all friends in twitter api.
tree
|
commitdiff
2019-02-15
lambda
Merge branch 'bugfix/oauth-token-padding' into 'develop'
tree
|
commitdiff
2019-02-15
rinpatch
Merge branch 'hellthread-filter-fix' into 'develop'
tree
|
commitdiff
2019-02-15
eugenijm
Add logic for keeping follow_request_count up-to-date...
tree
|
commitdiff
2019-02-14
lambda
Merge branch 'bugfix/activitypub-reserialization' into...
tree
|
commitdiff
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-02-14
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
tree
|
commitdiff
2019-02-13
Maxim Filippov
Add revoke token
tree
|
commitdiff
2019-02-13
Maxim Filippov
Add OAuth tokens endpoint
tree
|
commitdiff
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-11
Haelwenn (lanodan...
test: de-group alias/es
tree
|
commitdiff
2019-02-08
lambda
Merge branch 'fix/do-split-migration-for-local-users...
tree
|
commitdiff
2019-02-08
Karen Konou
Merge branch 'develop' into feature/thread-muting
tree
|
commitdiff
2019-02-08
rinpatch
Merge branch 'develop' into feature/keyword-policy
tree
|
commitdiff
2019-02-06
kaniini
Merge branch 'rename-followings' into 'develop'
tree
|
commitdiff
2019-02-06
Mark Felder
hide_followings was renamed to hide_followers in the...
tree
|
commitdiff
2019-02-06
Haelwenn
Merge branch 'bugfix/rich-media-card' into 'develop'
tree
|
commitdiff
2019-02-06
kaniini
Merge branch 'add-admin-and-moderator-fields' into...
tree
|
commitdiff
2019-02-06
rinpatch
Merge branch 'fix/activitypub-user-view-badmap' into...
tree
|
commitdiff
2019-02-06
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-06
eugenijm
Allow to configure visibility for admin and moderator...
tree
|
commitdiff
2019-02-05
eugenijm
Add is_admin and is_moderator boolean fields to the...
tree
|
commitdiff
2019-02-05
kaniini
Merge branch 'fix-dm-index' into 'develop'
tree
|
commitdiff
2019-02-05
kaniini
Merge branch 'feature/ap-c2s-whoami' into 'develop'
tree
|
commitdiff
2019-02-05
kaniini
Merge branch 'testfix/twitter-api' into 'develop'
tree
|
commitdiff
2019-02-05
William Pitcock
test: twitterapi: fix another possible test failure...
tree
|
commitdiff
2019-02-05
kaniini
Merge branch 'feature/split-hide-network-v2' into ...
tree
|
commitdiff
2019-02-05
kaniini
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
tree
|
commitdiff
2019-02-05
William Pitcock
test: twitterapi: fix the test breakage for real
tree
|
commitdiff
2019-02-04
rinpatch
Merge branch 'hotfix/hellthread-deprecation-warning...
tree
|
commitdiff
2019-02-04
kaniini
Merge branch 'mime-riff' into 'develop'
tree
|
commitdiff
2019-02-04
rinpatch
Merge branch 'fix/rich-media-relative-path' into 'develop'
tree
|
commitdiff
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-04
rinpatch
Merge branch 'feature/hellthread-filter-improvements...
tree
|
commitdiff
2019-02-03
kaniini
Merge branch 'mogrify-orient' into 'develop'
tree
|
commitdiff
2019-02-03
Maxim Filippov
Split hide_network into hide_followers & hide_following...
tree
|
commitdiff
2019-02-03
lambda
Merge branch '589-fix-cache' into 'develop'
tree
|
commitdiff
2019-02-03
lain
Still do caching in tests.
tree
|
commitdiff
2019-02-01
kaniini
Merge branch 'revert-0a82a7e6' into 'develop'
tree
|
commitdiff
2019-02-01
kaniini
Revert "Merge branch 'feature/split-hide-network' into...
tree
|
commitdiff
2019-02-01
href
Merge branch 'develop' into 'develop'
tree
|
commitdiff
2019-02-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
tree
|
commitdiff
2019-02-01
href
Merge branch '534_federation_targets_reachability'...
tree
|
commitdiff
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
tree
|
commitdiff
2019-01-31
Haelwenn
Merge branch 'features/glitch-soc-frontend' into 'develop'
tree
|
commitdiff
2019-01-31
Egor Kislitsyn
Merge remote-tracking branch 'MAIN/develop' into featur...
tree
|
commitdiff
2019-01-29
kaniini
Merge branch 'bugfix/fix-rejects' into 'develop'
tree
|
commitdiff
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
tree
|
commitdiff
2019-01-29
Haelwenn
Merge branch 'feature/rich-media-part-2-electric-boogal...
tree
|
commitdiff
2019-01-28
Maxim Filippov
Format
tree
|
commitdiff
2019-01-28
Maxim Filippov
Split hide_network into hide_followers & hide_followings
tree
|
commitdiff
2019-01-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
tree
|
commitdiff
2019-01-28
lain
Return new-style config if old-style config is set...
tree
|
commitdiff
2019-01-28
William Pitcock
test: update twitterapi tests
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'develop' into 'oembed_provider'
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'classic-flakeids' into 'develop'
tree
|
commitdiff
2019-01-24
Maxim Filippov
Use correct logic to determine "attentions" list
tree
|
commitdiff
2019-01-23
kaniini
Merge branch 'fix/hide-network-setting' into 'develop'
tree
|
commitdiff
2019-01-23
Maxim Filippov
Send "hide_network" in user_view
tree
|
commitdiff
2019-01-23
kaniini
Merge branch 's3-namespace' into 'develop'
tree
|
commitdiff
2019-01-23
lambda
Merge branch 'rename/pleroma_activity_consistency'...
tree
|
commitdiff
2019-01-23
lain
Merge branch 'develop' into rename/pleroma_activity_con...
tree
|
commitdiff
2019-01-23
lain
New frontend configuration mechanism.
tree
|
commitdiff
2019-01-23
href
Flake Ids for Users and Activities
tree
|
commitdiff
2019-01-21
lambda
Merge branch 'feature/dm-sanity' into 'develop'
tree
|
commitdiff
2019-01-21
Haelwenn (lanodan...
Activity: get_create_activity_by_object_ap_id/1 → get_c...
tree
|
commitdiff
2019-01-20
lambda
Merge branch 'add-custom-emoji-test' into 'develop'
tree
|
commitdiff
2019-01-20
lambda
Merge branch '2019-1-20-update-frontend' into 'develop'
tree
|
commitdiff
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
tree
|
commitdiff
2019-01-19
Maxim Filippov
Format
tree
|
commitdiff
2019-01-19
Maxim Filippov
Add current user to mentioned
tree
|
commitdiff
2019-01-18
rinpatch
Fix merge conflict
tree
|
commitdiff
2019-01-18
Ivan Tashkinov
[#477] User: FTS and trigram search results mixing...
tree
|
commitdiff
2019-01-18
Ivan Tashkinov
[#491] Made full nicknames be preserved in user links...
tree
|
commitdiff
2019-01-17
Ivan Tashkinov
[#491] Made user bio preserve full nicknames (nick...
tree
|
commitdiff
2019-01-16
lambda
Merge branch 'feature/improve-microformats' into 'develop'
tree
|
commitdiff
2019-01-16
William Pitcock
tests: fixup
tree
|
commitdiff
2019-01-15
Ivan Tashkinov
[#477] Added FTS index for `users`. Fixed failing test.
tree
|
commitdiff
2019-01-14
lambda
Merge branch 'load-all-dms' into 'develop'
tree
|
commitdiff
2019-01-13
rinpatch
Resolve merge conflict
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'activitypub-dereference-activity-id'...
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'twapi-follower-pagination' into 'develop'
tree
|
commitdiff
next