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
/
ostatus
/
ostatus.ex
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
2019-09-23
rinpatch
Merge branch 'better-emoji-packs' into 'develop'
blob
|
commitdiff
|
raw
2019-09-19
Haelwenn
Merge branch 'docs/clients-update' into 'develop'
blob
|
commitdiff
|
raw
2019-09-18
Haelwenn
Merge branch 'issue/733' into 'develop'
blob
|
commitdiff
|
raw
2019-09-17
Maksim Pechnikov
Merge branch 'develop' into issue/733
blob
|
commitdiff
|
raw
2019-09-17
Maksim Pechnikov
Merge branch 'develop' into issue/733
blob
|
commitdiff
|
raw
2019-09-16
Maksim Pechnikov
Merge branch 'develop' into issue/733
blob
|
commitdiff
|
raw
2019-09-12
Maksim Pechnikov
added test for Ostatus
blob
|
commitdiff
|
raw
2019-08-24
lain
Merge branch 'admin-create-users' 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-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-08-02
lain
Merge branch 'feature/hide-follows-remote' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-31
kaniini
Merge branch 'hardening/disallow-ostatus-downgrade...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-31
Ariadne Conill
ostatus: explicitly disallow protocol downgrade from...
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-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
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-06
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-30
Ivan Tashkinov
[#161] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-29
Ivan Tashkinov
[#161] Limited replies depth on incoming federation...
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-03
Mark Felder
Merge branch 'develop' into update-oauth-template
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
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-26
lambda
Merge branch 'refactor/die-httpoison-die' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-25
William Pitcock
kill @httpoison
blob
|
commitdiff
|
raw
|
diff to current
2019-05-18
rinpatch
Resolve merge conflicts and remove IO.inspects
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
lambda
Merge branch 'feature/federator-behaviours' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-12
William Pitcock
ostatus: only as:Public activities are representable
blob
|
commitdiff
|
raw
|
diff to current
2019-05-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Mark Felder
Merge branch 'develop' into update-oauth-template
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
lambda
Merge branch 'features/download-mastofe-build' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Sachin Joshi
Merge branch 'develop' into bugfix/web-notification...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
Egor Kislitsyn
Merge branch 'develop' into feature/disable-account
blob
|
commitdiff
|
raw
|
diff to current
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
kaniini
Merge branch 'get-cached-everywhere' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor
Use `User.get_cached*` everywhere
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-29
lambda
Merge branch 'feature/deploy-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-25
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'features/mrf-keyword-nil-summary' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
kaniini
Merge branch 'feature/object-normalize-preload' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-23
William Pitcock
ostatus: use preload objects with Object.normalize...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.AliasOrder
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
de-group alias/es
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
Credo fixes: alias grouping/ordering
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'fix/rich-media-relative-path' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch '534_federation_targets_reachability'...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
Ivan Tashkinov
[#534] Made federation push sender be determined basing...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'develop' into 'oembed_provider'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
kaniini
Merge branch 'classic-flakeids' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
kaniini
Merge branch 's3-namespace' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next