projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Fix merge conflicts with upstream
[akkoma]
/
test
/
pleroma
/
web
/
common_api_test.exs
2021-06-04
Sean King
Fix merge conflicts with upstream
blob
|
commitdiff
|
raw
2021-06-04
Haelwenn
Merge branch 'tests/openapi-everywhere' into 'develop'
blob
|
commitdiff
|
raw
2021-06-02
feld
Merge branch 'Snow-develop-patch-01683' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
2021-06-01
feld
Merge branch 'cycles-frontend-static' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
feld
Merge branch 'cycles-base-url' into 'develop'
blob
|
commitdiff
|
raw
2021-06-01
Haelwenn
Merge branch 'features/validators-note' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-31
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-31
Alex Gleason
Deprecate Pleroma.Web.base_url/0
blob
|
commitdiff
|
raw
|
diff to current
2021-05-30
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-29
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-28
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-19
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-16
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-14
Alex Gleason
Merge remote-tracking branch 'upstream/attachment-meta...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-13
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-07
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-05-04
feld
Merge branch 'dont-crash-email-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-04
feld
Merge branch 'earmark' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-05-03
Alex Gleason
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-29
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-16
rinpatch
Merge branch 'features/ingestion-ecto-tag' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-04-16
rinpatch
Merge branch 'feature/521-pinned-post-federation' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-05
Haelwenn (lanodan...
test/pleroma/web/common_api_test.exs: Strip : around...
blob
|
commitdiff
|
raw
|
diff to current
2021-04-01
rinpatch
Merge branch 'refactor/object_validator_validate' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-25
Alexander Strizhakov
Let pins federate
blob
|
commitdiff
|
raw
|
diff to current
2021-03-23
feld
Merge branch 'fix/2585-config-migration-dir' into ...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-23
Haelwenn
Merge branch 'fix/copy-emoji-summary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-22
rinpatch
Copy emoji in the subject from parent post
blob
|
commitdiff
|
raw
|
diff to current
2021-03-21
rinpatch
Merge branch 'richmedia-workaround' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'mediaproxy-decode' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-19
rinpatch
Merge branch 'bugfix/bridgy-user-icon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-16
Haelwenn
Merge branch 'update_open_api_spex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-15
rinpatch
Merge branch 'feature/object-hashtags-rework' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-12
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-10
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-07
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
lain
Merge branch 'release/2.3.0' into 'stable'
blob
|
commitdiff
|
raw
|
diff to current
2021-03-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-26
feld
Merge branch 'ecto-rollback-in-test-env' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-23
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-16
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-12
rinpatch
Merge branch 'bugfix/answer-outbox' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-11
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
feld
Merge branch 'develop' into 'fix/2412-filters'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
feld
Merge branch 'feature/2438-users-posts-total-count...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
rinpatch
Merge branch 'feat/openapi-spec-export' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-02-03
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-02-02
feld
Merge branch 'develop' into 'fix/2411-mutes-api'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-31
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-27
lain
Merge branch 'chore/tests-use-clear_config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
feld
Merge branch 'service-worker-allowed-header' into ...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
Mark Felder
Convert tests to all use clear_config instead of Plerom...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
lain
Merge branch 'develop' into '2435-list-multiple-users'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-26
Haelwenn
Merge branch 'fix/missing-own_votes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Mark Felder
Merge branch 'develop' into docs/apache-config
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
feld
Merge branch 'refactor/deactivated_user_field' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-25
Mark Felder
Merge branch 'develop' into refactor/deactivated_user_field
blob
|
commitdiff
|
raw
|
diff to current
2021-01-22
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-21
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'copyright-fun' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'deprecate-public_endpoint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-20
feld
Merge branch 'update/oban' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-19
rinpatch
Merge branch 'stable' into mergeback/2.2.2
blob
|
commitdiff
|
raw
|
diff to current
2021-01-18
feld
Merge branch 'fix/reblog-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-18
Mark Felder
Merge branch 'develop' into refactor/deactivated_user_field
blob
|
commitdiff
|
raw
|
diff to current
2021-01-18
Egor Kislitsyn
Test that only author can reblog a private status
blob
|
commitdiff
|
raw
|
diff to current
2021-01-18
Egor Kislitsyn
Fix Reblog API
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Mark Felder
Change user.deactivated field to user.is_active
blob
|
commitdiff
|
raw
|
diff to current
2021-01-15
Haelwenn
Merge branch 'optimize-command_available' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Haelwenn
Merge branch 'chores/bump-copyright' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-13
Haelwenn (lanodan...
Bump Copyright to 2021
blob
|
commitdiff
|
raw
|
diff to current
2021-01-08
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-08
lain
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
lain
Merge branch 'cleanup/unused-proxy-opts' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
lain
Merge branch 'object-normalize-refactor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
lain
Merge branch 'adminapi-user-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2021-01-07
lain
Merge branch 'upstream/remote-emoji-support' into ...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-06
Roger Braun
allow external emoji
blob
|
commitdiff
|
raw
|
diff to current
2021-01-05
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2021-01-04
lain
Object: Rework how Object.normalize works
blob
|
commitdiff
|
raw
|
diff to current
2020-12-31
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-30
Alex Gleason
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2020-12-28
Haelwenn
Merge branch 'revert-b122b6ff' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2020-12-28
Haelwenn
Revert "Merge branch 'features/hashtag-column' into...
blob
|
commitdiff
|
raw
|
diff to current
next
projects / akkoma / history