projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'migrate-legacy-tags' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
controllers
/
2019-04-25
Egor Kislitsyn
Merge branch 'develop' into feature/disable-account
tree
|
commitdiff
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
tree
|
commitdiff
2019-04-23
kaniini
Merge branch 'mastoapi/add-in-reply-to-screen-name...
tree
|
commitdiff
2019-04-23
kaniini
Merge branch 'fix/normalize-activities' into 'develop'
tree
|
commitdiff
2019-04-23
kaniini
Merge branch 'develop' into 'develop'
tree
|
commitdiff
2019-04-22
kaniini
Merge branch 'add-healthcheck-setting-to-config' into...
tree
|
commitdiff
2019-04-22
Alex S
added healthcheck setting to instance config
tree
|
commitdiff
2019-04-22
kaniini
Merge branch 'get-cached-everywhere' into 'develop'
tree
|
commitdiff
2019-04-22
Egor
Use `User.get_cached*` everywhere
tree
|
commitdiff
2019-04-22
kaniini
Merge branch 'feature/826-healthcheck-endpoint' into...
tree
|
commitdiff
2019-04-22
Alexander Strizhakov
Feature/826 healthcheck endpoint
tree
|
commitdiff
2019-04-22
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-04-22
kaniini
Merge branch 'rework-emoji-management' into 'develop'
tree
|
commitdiff
2019-04-20
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-04-20
Ekaterina Vaartis
Fix incorrect multiple emoji tag handling introduced...
tree
|
commitdiff
2019-04-19
kaniini
Merge branch 'feature/database-compaction' into 'develop'
tree
|
commitdiff
2019-04-19
lambda
Merge branch '923_oauth_consumer_refactoring_ci' into...
tree
|
commitdiff
2019-04-18
rinpatch
Merge branch 'develop' into feature/database-compaction
tree
|
commitdiff
2019-04-17
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
tree
|
commitdiff
2019-04-17
rinpatch
Merge branch 'develop' into feature/database-compaction
tree
|
commitdiff
2019-04-16
kaniini
Merge branch 'feature/788-separate-email-addresses...
tree
|
commitdiff
2019-04-16
kaniini
Merge branch 'fix/remote-follow-auth' into 'develop'
tree
|
commitdiff
2019-04-16
Haelwenn
Merge branch 'bugfix/relax-spam-protection' into 'develop'
tree
|
commitdiff
2019-04-16
kaniini
Merge branch 'patch-2' into 'develop'
tree
|
commitdiff
2019-04-16
kaniini
Merge branch 'fix/follow-imports' into 'develop'
tree
|
commitdiff
2019-04-16
Normandy
Handle new-style mastodon follow lists
tree
|
commitdiff
2019-04-12
lambda
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
tree
|
commitdiff
2019-04-12
lambda
Merge branch 'features/mastoapi/2.6.0-min_id-pagination...
tree
|
commitdiff
2019-04-12
lambda
Merge branch 'fix/732-password-align' into 'develop'
tree
|
commitdiff
2019-04-12
lambda
Merge branch 'ssl_trusted_cert' into 'develop'
tree
|
commitdiff
2019-04-11
kaniini
Merge branch 'fix/hackney_max_body_param' into 'develop'
tree
|
commitdiff
2019-04-11
Egor Kislitsyn
move user disable into deactivation
tree
|
commitdiff
2019-04-11
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-04-10
Alex S
Merge branch 'develop' into feature/788-separate-email...
tree
|
commitdiff
2019-04-10
lambda
Merge branch 'feature/767-multiple-use-invite-token...
tree
|
commitdiff
2019-04-10
Sadposter
Merge branch 'develop' into feature/user-status-subscri...
tree
|
commitdiff
2019-04-10
lambda
Merge branch 'fix/emoji-api-nonsense' into 'develop'
tree
|
commitdiff
2019-04-10
kaniini
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
tree
|
commitdiff
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
tree
|
commitdiff
2019-04-09
rinpatch
Change response format of /api/pleroma/emoji to the...
tree
|
commitdiff
2019-04-09
lambda
Merge branch 'bugfix/follower_count' into 'develop'
tree
|
commitdiff
2019-04-08
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-04-08
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-04-08
lambda
Merge branch 'improve_upgrade_user_from_ap_id' into...
tree
|
commitdiff
2019-04-08
lambda
Merge branch 'twitter_oauth' into 'develop'
tree
|
commitdiff
2019-04-08
lambda
Merge branch 'feature/770-add-emoji-tags' into 'develop'
tree
|
commitdiff
2019-04-06
Alex S
Merge develop to 770-add-emoji-tags
tree
|
commitdiff
2019-04-04
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'bugfix/wrong-date-format' into 'develop'
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'feature/fake-statuses' into 'develop'
tree
|
commitdiff
2019-04-02
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-04-02
Alex S
Merging develop into feature/770-add-emoji-tags
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'bugfix/share-mastodon' into 'develop'
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'remove-user-activities' into 'develop'
tree
|
commitdiff
2019-04-02
Alex S
Merge develop into feature/770-add-emoji-tags
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
tree
|
commitdiff
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'features/mastoapi/2.6.0-force-login-optio...
tree
|
commitdiff
2019-04-02
lambda
Merge branch 'get_by_id' into 'develop'
tree
|
commitdiff
2019-04-02
Egor Kislitsyn
change `Repo.get(User, id)` => `User.get_by_id(id)`
tree
|
commitdiff
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-04-02
Sachin Joshi
add support for all status type (ostatus) and replase...
tree
|
commitdiff
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-04-02
Sachin Joshi
fetch url for OStatus to know if it is a/c or status
tree
|
commitdiff
2019-04-01
Sachin Joshi
[OStatus] adds status to pleroma instance if the url...
tree
|
commitdiff
2019-04-01
Alex S
Adding tag to emoji ets table
tree
|
commitdiff
2019-03-28
eugenijm
Add PUT /api/pleroma/notification_settings endpoint
tree
|
commitdiff
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
tree
|
commitdiff
2019-03-25
lain
Merge remote-tracking branch 'origin/develop' into...
tree
|
commitdiff
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
tree
|
commitdiff
2019-03-22
kaniini
Merge branch 'safe-mentions' into 'develop'
tree
|
commitdiff
2019-03-21
lain
UtilController: Return state of safe dm mentions.
tree
|
commitdiff
2019-03-18
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
tree
|
commitdiff
2019-03-16
kaniini
Merge branch 'feature/federated-flags' into 'develop'
tree
|
commitdiff
2019-03-16
lambda
Merge branch 'feature/oauth-me' into 'develop'
tree
|
commitdiff
2019-03-16
kaniini
Merge branch 'feature/reblog-muting' into 'develop'
tree
|
commitdiff
2019-03-16
kaniini
Merge branch 'mark-notifications-as-read' into 'develop'
tree
|
commitdiff
2019-03-15
eugenijm
Allow to mark a single notification as read
tree
|
commitdiff
2019-03-15
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
tree
|
commitdiff
2019-03-14
rinpatch
Merge develop to bump elixir version in the CI so I...
tree
|
commitdiff
2019-03-14
rinpatch
Merge branch 'hotfix/delete-activities' into 'develop'
tree
|
commitdiff
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
tree
|
commitdiff
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
tree
|
commitdiff
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
tree
|
commitdiff
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.AliasOrder
tree
|
commitdiff
2019-03-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
tree
|
commitdiff
2019-03-04
Egor Kislitsyn
allow users to disable their own account
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-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
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-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
tree
|
commitdiff
2019-02-01
href
Merge branch '534_federation_targets_reachability'...
tree
|
commitdiff
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
tree
|
commitdiff
2019-01-31
Haelwenn
Merge branch 'features/glitch-soc-frontend' into 'develop'
tree
|
commitdiff
next