projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'refactor/user' into 'develop'
[akkoma]
/
config
/
config.exs
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-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-26
lambda
Merge branch 'feature/807-bookmark-endpoint-extension...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-26
kaniini
Merge branch 'feature/mastoapi-new-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
kaniini
Merge branch 'feature/mediaproxy-whitelist' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-25
Mark Felder
Add mediaproxy whitelist capability
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-23
kaniini
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
kaniini
Merge branch 'add-healthcheck-setting-to-config' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-22
Alex S
added healthcheck setting to instance config
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-22
kaniini
Merge branch 'rework-emoji-management' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-21
Ekaterina Vaartis
Change the default manifest to pleroma's namespace
blob
|
commitdiff
|
raw
|
diff to current
2019-04-21
Roman Chvanikov
Move comments for email_notifications config to docs
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-20
Roman Chvanikov
Digest emails
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Remove most finmoji mentions where appropriate
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Make emoji default_manifest a config option
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Assume packs without emoji.txt only have emoji pictures...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-20
Ekaterina Vaartis
Remove finmoji and add a way to download emojis in...
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
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
Roman Chvanikov
Add Notification.for_user_since/2
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
lambda
Merge branch 'feature/805-server-rendered-rel-me-links...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-19
Alexander Strizhakov
typo fix
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-17
Roman Chvanikov
Resolve conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-04-17
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
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-16
kaniini
Merge branch 'fix/remote-follow-auth' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-16
Hakurei Reimu
add extra_cookie_attrs option to config
blob
|
commitdiff
|
raw
|
diff to current
2019-04-15
rinpatch
Merge branch 'remove-footguns' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-15
lain
Config.exs: Add big warning so that nobody ever edits it.
blob
|
commitdiff
|
raw
|
diff to current
2019-04-14
Roman Chvanikov
Merge branch 'develop' of git.pleroma.social:pleroma...
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
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
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
Alex S
adding notify_email setting for trigger emails
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
Haelwenn (lanodan...
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
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
lain
Merge branch 'features/mastoapi/2.6.0-conversations...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-08
lambda
Merge branch 'use-jobs-in-webpush' 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
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
Add scheduler for sending scheduled activities to the...
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
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
Egor Kislitsyn
Use PleromaJobQueue in Pleroma.Web.Push
blob
|
commitdiff
|
raw
|
diff to current
2019-04-05
Ivan Tashkinov
[#923] OAuth consumer mode refactoring, new tests,...
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
Mark Felder
Merge branch 'develop' into feature/prometheus
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
feld
Merge branch 'feature/quack' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
feld
Add ability to ship logs to a Slack channel
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Mark Felder
Clean merge crumbs
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
href
Serve metrics at `/api/pleroma/app_metrics`
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Egor Kislitsyn
[#1] fix telemetry
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
href
Set up telemetry and prometheus
blob
|
commitdiff
|
raw
|
diff to current
2019-04-04
Egor Kislitsyn
Improve Transmogrifier.upgrade_user_from_ap_id/2
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
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
[#923] Merge remote-tracking branch 'remotes/upstream...
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
little changes and typos
blob
|
commitdiff
|
raw
|
diff to current
2019-04-02
Alex S
refactoring of emoji tags config to use groups
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
lambda
Merge branch 'fix/default-mail-adapter' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-01
Alex S
Adding tag to emoji ets table
blob
|
commitdiff
|
raw
|
diff to current
next