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
/
ostatus
/
ostatus_controller_test.exs
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
kaniini
Merge branch 'carrot-bullying' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
kaniini
Merge branch '471_invalid_accounts_rendering' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
kaniini
Merge branch 'fix/no-attachment-links' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
Haelwenn
Merge branch '396_elixir_1.7' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
Maxim Filippov
Add test to check /object/:id does not leak the tombsto...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
tests: add legal boilerplate
blob
|
commitdiff
|
raw
|
diff to current
2018-12-19
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Fix tests
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Fix tests. Remove oembed template
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
kaniini
Merge branch 'support/issue_442' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
Maksim Pechnikov
fix warnings
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/theora-detection-read-bytes' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch '210_twitter_api_uploads_alt_text' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
lain
Merge remote-tracking branch 'origin' into follower...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-05
Rin Toshaka
Merge develop to refactor/mix-tasks
blob
|
commitdiff
|
raw
|
diff to current
2018-12-04
kaniini
Merge branch 'optional-retry-queue' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-04
kaniini
Merge branch 'feature/integration_tesla' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-04
Maksim Pechnikov
update test
blob
|
commitdiff
|
raw
|
diff to current
2018-12-04
Maksim Pechnikov
update test
blob
|
commitdiff
|
raw
|
diff to current
2018-12-03
lambda
Merge branch 'fix-media-proxy-defaults' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-02
rinpatch
Merge branch 'develop' into fix/theora-detection-read...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
kaniini
Merge branch 'validate-user-info' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
lain
Merge remote-tracking branch 'origin' into validate...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
lain
More and more fixes.
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
kaniini
Merge branch 'ogg-theora-detection' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-22
kaniini
Merge branch 'feature/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-17
lambda
Merge branch 'bugfix/notice-urls-should-return-objects...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-17
William Pitcock
ostatus controller: respond with AS2 objects instead...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-27
lambda
Merge branch 'bugfix/announce-timeline-flooding' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'mastofe/system-font' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'develop' into 'patch-2'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'fix/put-repeats-at-activitypub-outbox...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'fix/normalize-file-extension' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
lambda
Merge branch 'feature/invites' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-07-20
Tristan Mahé
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-07-19
Hakaba Hitoyo
merge
blob
|
commitdiff
|
raw
|
diff to current
2018-07-19
lambda
Merge branch 'tests/plume' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-07-19
lambda
Merge branch 'bugfix/activitystreams-notice-urls' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-07-12
William Pitcock
test: ostatus controller: add AS2 fetching tests
blob
|
commitdiff
|
raw
|
diff to current
2018-06-12
lambda
Merge branch 'feature/list-streaming' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-06-11
eal
Merge branch 'fix/mix-task-caching' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-06-11
lambda
Merge branch 'feature/domain-blocks' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-06-06
lambda
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-06-05
eal
Merge branch 'fix/emoji-picker' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-06-03
lambda
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-06-03
lain
Better error handling for OstatusController.
blob
|
commitdiff
|
raw
|
diff to current
2018-06-01
eal
Merge branch 'fix/user-timeline-reading-user' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-06-01
lambda
Merge branch 'fix/twitterapi-incorrect-follows-you...
blob
|
commitdiff
|
raw
|
diff to current
2018-05-30
lain
Fix url guessing attacks.
blob
|
commitdiff
|
raw
|
diff to current
2018-05-30
lain
Fix url guessing attacks.
blob
|
commitdiff
|
raw
|
diff to current
2018-05-06
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-10
lambda
Merge branch 'feld-varnish' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-04-01
KANEKO Yoshitaka
Fix conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-03-30
lain
Format the code.
blob
|
commitdiff
|
raw
|
diff to current
2018-03-08
lambda
Merge branch 'feature/activitypub' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-03-08
lain
Merge branch 'develop' into feature/activitypub
blob
|
commitdiff
|
raw
|
diff to current
2018-03-06
lain
Don't use special query for feed.
blob
|
commitdiff
|
raw
|
diff to current
2018-02-12
lain
Merge branch 'develop' into feature/activitypub
blob
|
commitdiff
|
raw
|
diff to current
2018-02-12
lain
Make test output easier to read.
blob
|
commitdiff
|
raw
|
diff to current
2017-12-09
Roger Braun
Merge branch 'develop' into feature/activitypub
blob
|
commitdiff
|
raw
|
diff to current
2017-11-28
lambda
Merge branch 'salmon-native-keys' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2017-11-27
Lain Iwakura
Return xml notice at /notice path.
blob
|
commitdiff
|
raw
|
diff to current
2017-11-09
lambda
Merge branch 'fix-tootdon-image-uploads' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2017-11-09
Roger Braun
Re-fetch user data on salmon decode error.
blob
|
commitdiff
|
raw
|
diff to current
2017-05-19
Roger Braun
Also show activities in OStatus.
blob
|
commitdiff
|
raw
|
diff to current
2017-05-07
Roger Braun
Merge branch 'develop' into dtluna/pleroma-feature...
blob
|
commitdiff
|
raw
|
diff to current
2017-05-05
Roger Braun
Merge branch 'develop' into dtluna/pleroma-refactor/1
blob
|
commitdiff
|
raw
|
diff to current
2017-05-03
Roger Braun
Just give out the entry, not the whole feed.
blob
|
commitdiff
|
raw
|
diff to current
2017-05-03
Roger Braun
Return note objects as ostatus post activities.
blob
|
commitdiff
|
raw
|
diff to current
2017-04-28
dtluna
Merge branch 'develop' of ssh.gitgud.io:lambadalambda...
blob
|
commitdiff
|
raw
|
diff to current
2017-04-23
lambadalambda
Merge branch 'feature/follow-unfollow-by-screen-name...
blob
|
commitdiff
|
raw
|
diff to current
2017-04-23
Roger Braun
Merge branch 'ostatus' into develop
blob
|
commitdiff
|
raw
|
diff to current
2017-04-21
Roger Braun
Merge branch 'develop' of ssh.gitgud.io:lambadalambda...
blob
|
commitdiff
|
raw
|
diff to current
2017-04-18
Roger Braun
Add webfinger and basic feed support.
blob
|
commitdiff
|
raw
|
diff to current
projects / akkoma / history