projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Resolve merge conflict
[akkoma]
/
test
/
web
/
2018-12-07
lambda
Merge branch 'fix/gopher-respect-ip' into 'develop'
tree
|
commitdiff
2018-12-07
lambda
Merge branch 'media-proxy-follow-redirect' into 'develop'
tree
|
commitdiff
2018-12-07
lambda
Merge branch '394_user_tags' into 'develop'
tree
|
commitdiff
2018-12-07
Ivan Tashkinov
[#394] Refactoring (using Ecto.Multi; "untag" route...
tree
|
commitdiff
2018-12-06
Ivan Tashkinov
[#394] User view (Twitter & Mastadon API): wrapped...
tree
|
commitdiff
2018-12-06
Ivan Tashkinov
[#394] View tests fix.
tree
|
commitdiff
2018-12-06
Ivan Tashkinov
[#394] Formatting fix.
tree
|
commitdiff
2018-12-06
Rin Toshaka
Merge develop
tree
|
commitdiff
2018-12-06
Ivan Tashkinov
[#394] Added `users.tags` and admin routes to tag and...
tree
|
commitdiff
2018-12-06
kaniini
Merge branch 'correct-and-improve-http-options' into...
tree
|
commitdiff
2018-12-06
kaniini
Merge branch 're-mrf' into 'develop'
tree
|
commitdiff
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
tree
|
commitdiff
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
tree
|
commitdiff
2018-12-06
kaniini
Merge branch '210_twitter_api_uploads_alt_text' into...
tree
|
commitdiff
2018-12-06
Ivan Tashkinov
[#210] Mastodon: actor storing for media uploads, owner...
tree
|
commitdiff
2018-12-06
Hakaba Hitoyo
Merge remote-tracking branch 'origin/debug-suggestions...
tree
|
commitdiff
2018-12-05
kaniini
Merge branch 'follower-hiding' into 'develop'
tree
|
commitdiff
2018-12-05
kaniini
Merge branch 'dev_vald_fe/data_tag' into 'develop'
tree
|
commitdiff
2018-12-05
lain
Merge remote-tracking branch 'origin' into follower...
tree
|
commitdiff
2018-12-05
lain
MastodonAPI: Show users their own network.
tree
|
commitdiff
2018-12-05
Vald
resolved activity view test
tree
|
commitdiff
2018-12-05
Vald
lint
tree
|
commitdiff
2018-12-05
Vald
resolved api and controller test failures
tree
|
commitdiff
2018-12-05
lain
TwitterAPI: Show users their own network.
tree
|
commitdiff
2018-12-05
lain
TwitterAPI: Add network hiding.
tree
|
commitdiff
2018-12-05
Rin Toshaka
Merge develop to refactor/mix-tasks
tree
|
commitdiff
2018-12-05
Ivan Tashkinov
[#210] Formatting fix.
tree
|
commitdiff
2018-12-05
Ivan Tashkinov
[#210] [TwitterAPI] Made actor be stored for uploads...
tree
|
commitdiff
2018-12-05
Ivan Tashkinov
[#210] Test update (replaced bang- with non-bang method).
tree
|
commitdiff
2018-12-04
kaniini
Merge branch 'optional-retry-queue' into 'develop'
tree
|
commitdiff
2018-12-04
kaniini
Merge branch 'feature/integration_tesla' into 'develop'
tree
|
commitdiff
2018-12-04
Ivan Tashkinov
[#210] Refactoring.
tree
|
commitdiff
2018-12-04
Ivan Tashkinov
[#210] TwitterAPI: implemented /api/media/metadata...
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
formatting the code
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
all tests passed
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
update test
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
update test
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
update test
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
update test
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
add http requests mock
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
status_code -> status
tree
|
commitdiff
2018-12-04
Maksim Pechnikov
WebSub fix test
tree
|
commitdiff
2018-12-03
lambda
Merge branch 'fix/parse-user-bio' into 'develop'
tree
|
commitdiff
2018-12-03
lambda
Merge branch 'fix-media-proxy-defaults' into 'develop'
tree
|
commitdiff
2018-12-03
Maxim Filippov
Parse bio for MastodonAPI
tree
|
commitdiff
2018-12-02
Haelwenn
Merge branch 'user_info_fixes_again' into 'develop'
tree
|
commitdiff
2018-12-02
rinpatch
Merge branch 'develop' into fix/theora-detection-read...
tree
|
commitdiff
2018-12-02
Maxim Filippov
Format files
tree
|
commitdiff
2018-12-02
Maxim Filippov
Parse user's bio on register
tree
|
commitdiff
2018-12-02
lain
TwitterAPI: Implement hide_network.
tree
|
commitdiff
2018-12-02
lain
MastodonApi: Implement hide_network.
tree
|
commitdiff
2018-12-02
lain
Hide network in ap.
tree
|
commitdiff
2018-12-02
lain
Fix background updating / handling.
tree
|
commitdiff
2018-12-01
kaniini
Merge branch 'validate-user-info' into 'develop'
tree
|
commitdiff
2018-12-01
rinpatch
Attempt to resolve merge conflict
tree
|
commitdiff
2018-12-01
lain
More fixes for Info schema.
tree
|
commitdiff
2018-12-01
lain
TwitterAPI: Fix banner and background update.
tree
|
commitdiff
2018-12-01
lain
Fix masto api user updating.
tree
|
commitdiff
2018-12-01
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2018-12-01
lain
Fix admin api.
tree
|
commitdiff
2018-11-30
lain
Merge remote-tracking branch 'origin' into validate...
tree
|
commitdiff
2018-11-30
lain
Assorted fixes.
tree
|
commitdiff
2018-11-30
lain
Fix TwitterApiController.
tree
|
commitdiff
2018-11-30
lain
Remove "most recent notification" endpoint.
tree
|
commitdiff
2018-11-28
lain
More fixes
tree
|
commitdiff
2018-11-28
lambda
Merge branch 'fix-list-stream-privacy' into 'develop'
tree
|
commitdiff
2018-11-27
KokaKiwi
Streamer: Don't send unwanted DMs to list streams
tree
|
commitdiff
2018-11-27
lain
Fix ostatus test.
tree
|
commitdiff
2018-11-27
lain
Webfinger fixes.
tree
|
commitdiff
2018-11-27
lain
More and more fixes.
tree
|
commitdiff
2018-11-27
lain
More fixes.
tree
|
commitdiff
2018-11-27
kaniini
Merge branch 'fix/version-string-force-git-abbrev-size...
tree
|
commitdiff
2018-11-27
kaniini
Merge branch 'ogg-theora-detection' into 'develop'
tree
|
commitdiff
2018-11-27
lain
Fix CommonApi tests.
tree
|
commitdiff
2018-11-25
kaniini
Merge branch 'bugfix/public-mastoapi-websocket' into...
tree
|
commitdiff
2018-11-24
Haelwenn (lanodan...
Web.MastodonApi.MastodonSocketTest: Add test for unauth...
tree
|
commitdiff
2018-11-22
kaniini
Merge branch 'feature/admin-api' into 'develop'
tree
|
commitdiff
2018-11-21
kaniini
Merge branch 'feature/improve-version' into 'develop'
tree
|
commitdiff
2018-11-20
kaniini
Merge branch 'runtime-fixes' into 'develop'
tree
|
commitdiff
2018-11-20
lain
Merge branch 'validate-user-info' of git.pleroma.social...
tree
|
commitdiff
2018-11-20
lain
Fix most mastodon api bugs.
tree
|
commitdiff
2018-11-20
William Pitcock
tests: fix up some more broken mastodon api testcases
tree
|
commitdiff
2018-11-20
Haelwenn
Merge branch 'feature/retry-queue' into 'develop'
tree
|
commitdiff
2018-11-20
William Pitcock
mastodon api: account view: fix tests
tree
|
commitdiff
2018-11-19
eal
RetryQueue: tiny refractor, add tests
tree
|
commitdiff
2018-11-18
lain
Several twitter api fixes.
tree
|
commitdiff
2018-11-17
lambda
Merge branch 'security/as2-object-render-hardening...
tree
|
commitdiff
2018-11-17
William Pitcock
activitypub: object view: avoid leaking private details
tree
|
commitdiff
2018-11-17
lambda
Merge branch 'bugfix/notice-urls-should-return-objects...
tree
|
commitdiff
2018-11-17
William Pitcock
ostatus controller: respond with AS2 objects instead...
tree
|
commitdiff
2018-11-17
lambda
Merge branch 'security/spoofing-hardening' into 'develop'
tree
|
commitdiff
2018-11-17
William Pitcock
tests: federator: fix formatting
tree
|
commitdiff
2018-11-17
William Pitcock
activitypub: transmogrifier: make deletes secure
tree
|
commitdiff
2018-11-17
Haelwenn (lanodan...
Web.AdminAPI.AdminAPIControllerTest: New Test
tree
|
commitdiff
2018-11-17
William Pitcock
test: add sanity tests for federator handling of AP...
tree
|
commitdiff
2018-11-17
William Pitcock
tests: add a test to verify the general fake direction...
tree
|
commitdiff
2018-11-17
William Pitcock
tests: add a testcase for user collision
tree
|
commitdiff
2018-11-17
William Pitcock
tests: add tests for contain_origin_from_id()
tree
|
commitdiff
2018-11-17
lambda
Merge branch 'security/actor-containment' into 'develop'
tree
|
commitdiff
2018-11-17
William Pitcock
tests: add a second spoofing variant
tree
|
commitdiff
next