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]
/
test
/
support
/
factory.ex
2019-07-09
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
2019-07-09
rinpatch
Merge branch '878-activity-object-decoupling-in-tests...
blob
|
commitdiff
|
raw
2019-07-09
Ivan Tashkinov
[#878] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
2019-07-09
kaniini
Merge branch 'remove-avatar-header' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-08
Ivan Tashkinov
[#878] Formatting fix.
blob
|
commitdiff
|
raw
2019-07-08
Ivan Tashkinov
[#878] Refactored assumptions on embedded object presen...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
lain
Merge branch 'release-docs' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-26
rinpatch
Merge branch 'update-mastofe/glitch-soc-2019-06-26...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-25
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
kaniini
Merge branch 'bind-to-localhost' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
kaniini
Merge branch 'rich_media_titles_two' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
kaniini
Merge branch 'admin-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Alex S
support for config groups
blob
|
commitdiff
|
raw
|
diff to current
2019-06-23
Sachin Joshi
Merge branch 'develop' into 'remove-avatar-header'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-16
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
lain
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-15
kaniini
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
rinpatch
Merge branch 'feature/add-background-image-to-mastoapi...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
kaniini
Merge branch 'feature/905-dynamic-configuration-in...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-14
Alexander Strizhakov
it is changed in compile time
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-05-20
sadposter
Merge branch 'develop' of https://git.pleroma.social...
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-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
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-14
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
lambda
Merge branch 'mascot/pleroma-tan-shy' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-13
sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-07
kaniini
Merge branch 'docs/MRF-modules' into '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-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
Alex S
Merging with develop
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
lain
Participations: Add marking as read and unread.
blob
|
commitdiff
|
raw
|
diff to current
2019-04-10
lain
Conversation: Add Conversations and Participations.
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
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
2019-04-08
lambda
Merge branch 'feature/770-add-emoji-tags' into 'develop'
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
Egor Kislitsyn
Merge branch 'develop' into use-jobs-in-webpush
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
Ivan Tashkinov
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'develop' into 'improve_upgrade_user_from_...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'scheduled-activities' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
feld
Merge branch 'fix/deactivated-user-error' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
eugenijm
Added limits and media attachments for scheduled activi...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
eugenijm
Add scheduled activities
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
feld
Merge branch 'fix/failed-legacy-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-06
feld
Merge branch 'feature/prometheus' into 'develop'
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
Haelwenn
Merge branch 'feature/mastofe-redurect-to-referer-after...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Sergey Suprunenko
Redirect to the referer url after mastofe authorization
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
Ivan Tashkinov
[#923] OAuth consumer controller tests. Misc. improvements.
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-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
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
lambda
Merge branch 'get_by_id' 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
Ivan Tashkinov
Added "GET /oauth/authorize" tests.
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-03-18
Sadposter
Merge branch 'develop' of https://git.pleroma.social...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-08
kaniini
Merge branch 'fix-tlsv1.3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-07
rinpatch
Merge branch 'bugfix/delete-activity-audience' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
kaniini
Merge branch 'chore/merge-search-into-list-users' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
kaniini
Merge branch 'bugfix/connect-src-https' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
kaniini
Merge branch 'bugfix/rel-me_list' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
kaniini
Merge branch 'feature/647' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
Maksim
[#647] tests for web push
blob
|
commitdiff
|
raw
|
diff to current
2019-03-06
Haelwenn
Merge branch 'fix/escape-reserved-chars-in-filenames...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-05
rinpatch
Merge branch 'add-admin-to-node-info' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
kaniini
Merge branch 'feature/add-status-text-to-notifications...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Maxim Filippov
Add status text to notifications (mentions and reposts)
blob
|
commitdiff
|
raw
|
diff to current
next