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 develop
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
utils.ex
2019-05-22
kaniini
Merge branch 'mongooseim-support' into 'develop'
blob
|
commitdiff
|
raw
2019-05-20
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-05-18
rinpatch
Merge branch 'feature/mrf-always-nsfw' into 'develop'
blob
|
commitdiff
|
raw
2019-05-17
William Pitcock
add Changelog entry
blob
|
commitdiff
|
raw
2019-05-17
William Pitcock
also suppress link previews from posts marked #nsfw
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
lain
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
kaniini
Merge branch 'feature/890-add-report-uri' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
feld
Merge branch 'feature/admin-api-reports' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-16
Sergey Suprunenko
Add Reports to Admin API
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
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
lambda
Merge branch 'features/download-mastofe-build' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-30
Sachin Joshi
Merge branch 'develop' into bugfix/web-notification...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-29
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-27
kaniini
Merge branch 'feature/bbcode' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-26
William Pitcock
add support for bbcode
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
Egor Kislitsyn
Merge branch 'develop' into feature/disable-account
blob
|
commitdiff
|
raw
|
diff to current
2019-04-23
kaniini
Merge branch 'security/fix-html-class-scrubbing' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-23
kaniini
Merge branch 'mastoapi/add-in-reply-to-screen-name...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-23
kaniini
Merge branch 'fix/normalize-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
rinpatch
Replace Object.normalize(activity.data[object] with...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
kaniini
Merge branch 'get-cached-everywhere' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor
Use `User.get_cached*` everywhere
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
kaniini
Merge branch 'feature/database-compaction' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
lambda
Merge branch '923_oauth_consumer_refactoring_ci' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-18
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
oof
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Make credo happy
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-16
kaniini
Merge branch 'feature/788-separate-email-addresses...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-15
lambda
Merge branch 'fix/status-reblogged' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-15
lambda
Merge branch 'unfollow-oneself' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-15
lambda
Merge branch 'refactor/remove-inReplyToStatusId' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-15
rinpatch
Remove inReplyToStatusId
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-13
Haelwenn
Merge branch 'docs/changelog' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-13
Alex S
Merge develop to 788-separate-email-addresses
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
Haelwenn
Merge branch 'improve-formatter' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-12
Egor
Revert "simplify mentions escape"
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
lambda
Merge branch 'feature/user-status-subscriptions' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
Sadposter
Merge branch 'develop' into feature/user-status-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
kaniini
Merge branch 'notification-pleroma-settings' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-09
lambda
Merge branch 'bugfix/follower_count' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Sadposter
Used cached user resources in subscriptions
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-08
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'improve_upgrade_user_from_ap_id' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'twitter_oauth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'feature/770-add-emoji-tags' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-07
Sadposter
Add check on activity visibility in sub notification
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
Alex S
Merge develop to 770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sadposter
Change relationship direction of subscriptions
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sadposter
Make subscriptions the same direction as blocks
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sadposter
Add notification checks
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-03
lambda
Merge branch 'feature/robotstxt' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Haelwenn
Merge branch 'fix-slow-relationships' into 'develop'
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
lambda
Merge branch 'remove-user-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
Merge develop into feature/770-add-emoji-tags
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'features/mastoapi/2.6.0-force-login-optio...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
lambda
Merge branch 'get_by_id' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
change `Repo.get(User, id)` => `User.get_by_id(id)`
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
change `Repo.get(Activity, id)` => `Activity.get_by_id...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Sergey Suprunenko
Ignore dates in wrong formats
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Ivan Tashkinov
Merge remote-tracking branch 'remotes/upstream/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Sergey Suprunenko
Handle dates in the Unix timestamp format (Fixes #763)
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Alex S
Adding tag to emoji ets table
blob
|
commitdiff
|
raw
|
diff to current
2019-03-30
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-29
lambda
Merge branch 'feature/deploy-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-27
Ivan Tashkinov
Merge remote-tracking branch 'remotes/origin/develop...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-25
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'features/mrf-keyword-nil-summary' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
rinpatch
Merge branch 'fix/eldap-warnings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-24
kaniini
Merge branch 'feature/object-normalize-preload' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-23
William Pitcock
formatting
blob
|
commitdiff
|
raw
|
diff to current
2019-03-23
William Pitcock
common api: use the optimized Object.normalize whenever...
blob
|
commitdiff
|
raw
|
diff to current
next