projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
merge
[akkoma]
/
test
/
support
/
http_request_mock.ex
2019-06-19
sadposter
merge
blob
|
commitdiff
|
raw
2019-06-17
rinpatch
Merge branch 'removing-test-errors' into 'develop'
blob
|
commitdiff
|
raw
2019-06-16
Alex S
salmon fix
blob
|
commitdiff
|
raw
2019-06-05
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Maksim Pechnikov
Merge branch 'develop' into issue/941
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'feature/mrf-subchain' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'fix/mock-errors-in-tests' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Sergey Suprunenko
Add missing HTTP Request mocks
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'generic-fe-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
kaniini
Merge branch 'ueberauth_config_extension' into 'develop'
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-03
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
rinpatch
Merge branch 'feature/polls-2-electric-boogalo' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
lambda
Merge branch 'align-mastodon-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
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
kaniini
Merge branch 'bugfix/visibility-indicator-litepub-dm...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
lambda
Merge branch 'hotfix/leaking-lists' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
feld
Merge branch 'fix/ogp-missing-data' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
Sergey Suprunenko
Replace missing non-nullable Card attributes with empty...
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-15
rinpatch
Handle incoming Question objects
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
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
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 'bugfix/pleroma-email-naming' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
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
kaniini
Merge branch 'fix/hackney_max_body_param' 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-10
Alex S
Merge branch 'develop' into feature/788-separate-email...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lambda
Merge branch 'feature/767-multiple-use-invite-token...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
Alex S
twitter api registration
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'bugfix/wrong-date-format' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'feature/fake-statuses' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
Merging develop into feature/770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'bugfix/share-mastodon' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Sachin Joshi
fetch url for OStatus to know if it is a/c or status
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Sachin Joshi
[OStatus] adds status to pleroma instance if the url...
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-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
Haelwenn
Merge branch 'docs/pleroma-api-invite-token' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
lambda
Merge branch 'bugfix/rich-media-non-unicode' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
William Pitcock
test: http mocks: formatting
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
William Pitcock
test: add malformed OGP data fixture
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-31
Egor Kislitsyn
Merge remote-tracking branch 'MAIN/develop' into featur...
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-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Ivan Tashkinov
[#534] Various tweaks. Tests for Instances and Instance.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
Haelwenn
Merge branch 'safe-render-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
lambda
Merge branch 'safe-render-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
kaniini
Merge branch 'discard-invalid-likes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
kaniini
Merge branch 'flake-random-worker-id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-27
kaniini
Merge branch 'features/mastoapi-multi-hashtag' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'webpush-endpoint-size' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'flake-from-int' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'join-in-preloads' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
kaniini
Merge branch 'features/mastoapi-cards' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-26
Haelwenn (lanodan...
Move definitions of RichMedia fixtures to test/support...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
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-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
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-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
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-10
lambda
Merge branch 'fix_empty_bio_crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/config-md-typos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'support/bugfix_272' into 'develop'
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-10
lambda
Merge branch 'anonymize-filter-text' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'develop' into 'fix/mix-task-uploads-modul...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'parallel588/pleroma-support/compile_warni...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lain
Treat warnings as errors outside of tests.
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
next