projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature...
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
utils.ex
2019-02-20
Egor
Reports
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Mark Felder
Merge branch 'develop' into fix/twittercards
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
Ivan Tashkinov
[#468] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
lambda
Merge branch 'fix/check-follower-collection-in-is_priva...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-19
lambda
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'patch-image-description' into 'develop'
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-09
Haelwenn (lanodan...
Credo fixes: parameter consistency
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
Make credo happy
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-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-25
rinpatch
Merge remote-tracking branch 'pl/develop' into oembed_p...
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-24
Maxim Filippov
Use correct logic to determine "attentions" list
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
kaniini
Merge branch 's3-namespace' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
lambda
Merge branch 'rename/pleroma_activity_consistency'...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
lain
Merge branch 'develop' into rename/pleroma_activity_con...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-21
Haelwenn (lanodan...
Activity: get_create_activity_by_object_ap_id/1 → get_c...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
lambda
Merge branch 'add-custom-emoji-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
lambda
Merge branch '2019-1-20-update-frontend' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-19
kaniini
Merge branch 'bugfix/improve-boost-targeting' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-19
kaniini
Merge branch '491_full_mentions_in_user_bio' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-18
Ivan Tashkinov
[#491] Made full nicknames be preserved in user links...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-14
lambda
Merge branch 'load-all-dms' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
kaniini
Merge branch 'activitypub-dereference-activity-id'...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
kaniini
Merge branch 'twapi-follower-pagination' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
Haelwenn
Merge branch 'bugfix/markdown-newline-codeblocks' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
William Pitcock
common api: utils: remove newline to <br> conversion...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-10
William Pitcock
common api: fix newlines in markdown code blocks
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-04
Wim Vanderbauwhede
Patch to support image descriptions in Pleroma FE
blob
|
commitdiff
|
raw
|
diff to current
2019-01-04
Wim Vanderbauwhede
Patch to support image descriptions in Pleroma FE
blob
|
commitdiff
|
raw
|
diff to current
2019-01-04
Wim Vanderbauwhede
Patch to support image descriptions in Pleroma FE
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
William Pitcock
update copyright years to 2019
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Friendship ended with Postgresql now Cachex is my best...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Friendship ended with Postgresql now Cachex is my best...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Added get_stripped_html_for_object. Renamed a few things
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Tidy up the code. Rename key to signature
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Fix some stupid typos
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Use Object.change instead of Ecto.Changeset.change
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
Rin Toshaka
use Kernel.put_in instead of Map.merge
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
Rin Toshaka
I am not sure what's going on anymore so I'll just...
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-27
Maxim Filippov
Treat only true and "true" as true
blob
|
commitdiff
|
raw
|
diff to current
2018-12-26
Maxim Filippov
Treat any present value in "no_attachment_links" as...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
Maxim Filippov
Revert unneeded changes
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
Maxim Filippov
Create tombstone instead of object deletion
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
add license boilerplate to pleroma core
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-16
Haelwenn
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
eal
Merge branch 'fix/masto-put-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
lambda
Merge branch 'fix/views-ignore-unhandled-activites...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
lambda
Merge branch 'tests-warning-as-errors' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'fix/issue_433' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Maksim Pechnikov
fix markdown formatting
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-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_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-09
Maksim Pechnikov
fix compile warnings
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-04
William Pitcock
common api: utils: access inReplyTo object ID correctly
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-11-15
Hakaba Hitoyo
Merge remote-tracking branch 'official/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
kaniini
Merge branch 'bugfix/local-jsonld-context' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
kaniini
Merge branch 'tests/prismo-url-map' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-09
lambda
Merge branch 'bugfix/no-cc-mentions' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-08
William Pitcock
common api: utils: flip to/cc for mentions
blob
|
commitdiff
|
raw
|
diff to current
2018-11-02
lambda
Merge branch 'fix_hashtag_search' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-02
lambda
Merge branch 'bugfix/dont-break-on-empty-in-reply-to...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-02
lain
Check for empty string in_reply_to ids.
blob
|
commitdiff
|
raw
|
diff to current
next