projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
2019-02-19
Ivan Tashkinov
[#468] Merged `upstream/develop`.
tree
|
commitdiff
2019-02-19
lambda
Merge branch 'fix/check-follower-collection-in-is_priva...
tree
|
commitdiff
2019-02-19
lambda
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
tree
|
commitdiff
2019-02-18
kaniini
Merge branch 'patch-image-description' into 'develop'
tree
|
commitdiff
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
tree
|
commitdiff
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-02-14
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
tree
|
commitdiff
2019-02-11
rinpatch
Merge branch 'feature/thread-muting' into 'develop'
tree
|
commitdiff
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
tree
|
commitdiff
2019-02-11
Karen Konou
Refactor as per Rin's suggestions, add endpoint tests
tree
|
commitdiff
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
tree
|
commitdiff
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
tree
|
commitdiff
2019-02-09
Haelwenn (lanodan...
de-group alias/es
tree
|
commitdiff
2019-02-09
Haelwenn (lanodan...
Credo fixes: alias grouping/ordering
tree
|
commitdiff
2019-02-09
Haelwenn (lanodan...
Credo fixes: parameter consistency
tree
|
commitdiff
2019-02-09
Haelwenn (lanodan...
Make credo happy
tree
|
commitdiff
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
tree
|
commitdiff
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
tree
|
commitdiff
2019-01-28
Ivan Tashkinov
[#534] Merged `upstream/develop`.
tree
|
commitdiff
2019-01-25
rinpatch
Merge remote-tracking branch 'pl/develop' into oembed_p...
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'fix/tusky-dm' into 'develop'
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'develop' into 'oembed_provider'
tree
|
commitdiff
2019-01-25
kaniini
Merge branch 'classic-flakeids' into 'develop'
tree
|
commitdiff
2019-01-24
Maxim Filippov
Use correct logic to determine "attentions" list
tree
|
commitdiff
2019-01-23
kaniini
Merge branch 's3-namespace' into 'develop'
tree
|
commitdiff
2019-01-23
lambda
Merge branch 'rename/pleroma_activity_consistency'...
tree
|
commitdiff
2019-01-23
lain
Merge branch 'develop' into rename/pleroma_activity_con...
tree
|
commitdiff
2019-01-21
lambda
Merge branch '530_federator_user_info_overwrite_fix...
tree
|
commitdiff
2019-01-21
lambda
Merge branch 'feature/dm-sanity' into 'develop'
tree
|
commitdiff
2019-01-21
Haelwenn (lanodan...
Activity: get_create_activity_by_object_ap_id/1 → get_c...
tree
|
commitdiff
2019-01-20
lambda
Merge branch 'add-custom-emoji-test' into 'develop'
tree
|
commitdiff
2019-01-20
lambda
Merge branch '2019-1-20-update-frontend' into 'develop'
tree
|
commitdiff
2019-01-20
lambda
Merge branch 'i1t/pleroma-477_user_search_improvements...
tree
|
commitdiff
2019-01-20
William Pitcock
common api: set directMessage flag on our own posts
tree
|
commitdiff
2019-01-19
kaniini
Merge branch 'bugfix/improve-boost-targeting' into...
tree
|
commitdiff
2019-01-19
kaniini
Merge branch '491_full_mentions_in_user_bio' into ...
tree
|
commitdiff
2019-01-18
rinpatch
Fix merge conflict
tree
|
commitdiff
2019-01-18
rinpatch
Remove custom emojis and trailing whitespaces from...
tree
|
commitdiff
2019-01-18
Ivan Tashkinov
[#491] Made full nicknames be preserved in user links...
tree
|
commitdiff
2019-01-17
kaniini
Merge branch '502_instance_stats_active_users_count_fix...
tree
|
commitdiff
2019-01-17
kaniini
Merge branch 'bad-copy-paste' into 'develop'
tree
|
commitdiff
2019-01-17
kaniini
Merge branch 'attachment-links' into 'develop'
tree
|
commitdiff
2019-01-17
Mark Felder
formatting
tree
|
commitdiff
2019-01-17
Mark Felder
Default to disabled in the code in case the setting...
tree
|
commitdiff
2019-01-17
Mark Felder
Make attachment links configurable
tree
|
commitdiff
2019-01-14
lambda
Merge branch 'load-all-dms' into 'develop'
tree
|
commitdiff
2019-01-14
kaniini
Merge branch 'fix-nginx-caching' into 'develop'
tree
|
commitdiff
2019-01-13
rinpatch
Resolve merge conflict
tree
|
commitdiff
2019-01-11
kaniini
Merge branch 'bugfix/pinned-statuses' into 'develop'
tree
|
commitdiff
2019-01-11
Egor Kislitsyn
unpin when deleting a status
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'activitypub-dereference-activity-id'...
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'twapi-follower-pagination' into 'develop'
tree
|
commitdiff
2019-01-10
Haelwenn
Merge branch 'bugfix/markdown-newline-codeblocks' into...
tree
|
commitdiff
2019-01-10
William Pitcock
common api: utils: remove newline to <br> conversion...
tree
|
commitdiff
2019-01-10
William Pitcock
common api: fix newlines in markdown code blocks
tree
|
commitdiff
2019-01-10
kaniini
Merge branch 'feature/pinned-posts' into 'develop'
tree
|
commitdiff
2019-01-09
Egor Kislitsyn
only non-reblogs, self-authored, public statuses can...
tree
|
commitdiff
2019-01-09
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-01-08
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-01-07
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-01-07
Egor Kislitsyn
add pinned posts
tree
|
commitdiff
2019-01-05
kaniini
Merge branch 'fix/user-search-null-name' into 'develop'
tree
|
commitdiff
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
tree
|
commitdiff
2019-01-05
kaniini
Merge branch 'activitypub-tombstone-fix' into 'develop'
tree
|
commitdiff
2019-01-05
scarlett
Merge branch 'emoji-in-summary' into 'develop'
tree
|
commitdiff
2019-01-05
scarlett
add some brakets to the emoji list.
tree
|
commitdiff
2019-01-05
scarlett
Strip HTML in and allow emoji in summaries.
tree
|
commitdiff
2019-01-04
Wim Vanderbauwhede
Patch to support image descriptions in Pleroma FE
tree
|
commitdiff
2019-01-04
Wim Vanderbauwhede
Patch to support image descriptions in Pleroma FE
tree
|
commitdiff
2019-01-04
Wim Vanderbauwhede
Patch to support image descriptions in Pleroma FE
tree
|
commitdiff
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
tree
|
commitdiff
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
tree
|
commitdiff
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
tree
|
commitdiff
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
tree
|
commitdiff
2018-12-31
William Pitcock
update copyright years to 2019
tree
|
commitdiff
2018-12-30
Rin Toshaka
Resolve merge conflict
tree
|
commitdiff
2018-12-30
Rin Toshaka
Friendship ended with Postgresql now Cachex is my best...
tree
|
commitdiff
2018-12-30
Rin Toshaka
Friendship ended with Postgresql now Cachex is my best...
tree
|
commitdiff
2018-12-30
Rin Toshaka
Added get_stripped_html_for_object. Renamed a few things
tree
|
commitdiff
2018-12-30
Rin Toshaka
Tidy up the code. Rename key to signature
tree
|
commitdiff
2018-12-30
Rin Toshaka
Fix some stupid typos
tree
|
commitdiff
2018-12-30
Rin Toshaka
Use Object.change instead of Ecto.Changeset.change
tree
|
commitdiff
2018-12-29
Rin Toshaka
use Kernel.put_in instead of Map.merge
tree
|
commitdiff
2018-12-29
Rin Toshaka
I am not sure what's going on anymore so I'll just...
tree
|
commitdiff
2018-12-29
kaniini
Merge branch 'carrot-bullying' into 'develop'
tree
|
commitdiff
2018-12-29
kaniini
Merge branch '483_blocks_import_export' into 'develop'
tree
|
commitdiff
2018-12-29
kaniini
Merge branch '471_invalid_accounts_rendering' into...
tree
|
commitdiff
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
tree
|
commitdiff
2018-12-28
kaniini
Merge branch 'fix/no-attachment-links' into 'develop'
tree
|
commitdiff
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
tree
|
commitdiff
2018-12-27
Maxim Filippov
Treat only true and "true" as true
tree
|
commitdiff
2018-12-26
Maxim Filippov
Treat any present value in "no_attachment_links" as...
tree
|
commitdiff
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
tree
|
commitdiff
2018-12-25
Maxim Filippov
Revert unneeded changes
tree
|
commitdiff
2018-12-23
Maxim Filippov
Create tombstone instead of object deletion
tree
|
commitdiff
next