projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge remote-tracking branch 'origin/develop' into reactions
[akkoma]
/
lib
/
pleroma
/
web
/
common_api
/
common_api.ex
2019-06-06
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
2019-06-05
kaniini
Merge branch 'bugfix/377-stuck-follow-request' into...
blob
|
commitdiff
|
raw
2019-06-05
lain
Utils: Use update_follow_state_for_all when appropriate.
blob
|
commitdiff
|
raw
2019-06-05
lain
User: Remove superfluous `maybe_follow`.
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
kaniini
Merge branch 'explicit-addressing' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-05
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Roman Chvanikov
Fix conflict
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
Haelwenn
Merge branch 'emoji-loader-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
lain
Merge branch 'fix/fetch-votes-restrict-create' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
rinpatch
Fix CommonAPI.vote returning tuples inside of the activ...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
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 '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 feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
lain
CommonAPI: Add explicit addressing.
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
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
rinpatch
Merge branch 'develop' into feature/polls-2-electric...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-02
rinpatch
Make error message about author's inability to vote...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-02
rinpatch
Refresh the object in CommonAPI.vote instead of MastoAP...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Add poll votes
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-29
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-24
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-23
Sachin Joshi
fix merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-05-22
kaniini
Merge branch 'mongooseim-support' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-19
rinpatch
Remove tags/mentions/rich text from poll options becaus...
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-18
rinpatch
Mastodon API: Add support for posting polls
blob
|
commitdiff
|
raw
|
diff to current
2019-05-18
rinpatch
Merge branch 'feature/mrf-always-nsfw' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
William Pitcock
also suppress link previews from posts marked #nsfw
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
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
lambda
Merge branch 'bugfix/903-mastoapi-relationship-requeste...
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
rinpatch
Merge branch 'fix/902-random-compile-failing' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-17
Alexander Strizhakov
Fix/902 random compile failing
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
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-16
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
kaniini
Merge branch 'fix/public-option-not-working' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
lambda
Merge branch 'chore/extricate-http-signatures' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
kaniini
Merge branch 'prevent-public-answers' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
lain
CommonAPI: Visibility refactor.
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
lain
CommonAPI: Refactor visibility, forbid public to privat...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-15
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
Egor Kislitsyn
Use pseudo ap id of a list in BCC
blob
|
commitdiff
|
raw
|
diff to current
2019-05-08
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
lambda
Merge branch 'conversations_three' into 'develop'
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-03
rinpatch
Merge branch 'fix/embeded-relationship-in-follows'...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
rinpatch
Merge branch 'fix-search-speed' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
lambda
Merge branch 'bugfix/emoji-size' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-03
Haelwenn (lanodan...
formatter.ex: Add get_emoji_map/1
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Mark Felder
Merge branch 'develop' into update-oauth-template
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
Egor Kislitsyn
Add addressable lists
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-30
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-04-29
rinpatch
Merge branch 'fix/add-default-scope-mastoapi' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-28
kaniini
Merge branch 'regression/rights-only-for-admin' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-28
kaniini
Merge branch 'fix/bookmark-depend-on-embeded-object...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-27
rinpatch
Fix bookmarks depending on embeded object and move...
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-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-20
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
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-18
rinpatch
Merge branch 'develop' into feature/database-compaction
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Added some more normalization calls all in mastodon...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
rinpatch
Fix pinned posts relying on embded objects
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 '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
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
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
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
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
next