projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest...
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
controllers
/
util_controller.ex
2018-12-18
rinpatch
Merge branch 'develop' into fix/formatter-ignore-html...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
lambda
Merge branch 'feature/new-user-routes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
Ivan Tashkinov
[#114] Account confirmation email, registration as...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-18
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch '459_fix_user_profile_crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-17
lambda
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
Haelwenn
Merge branch 'develop' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-16
eal
Merge branch 'fix/masto-put-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
lambda
Merge branch 'fix/views-ignore-unhandled-activites...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
lambda
Merge branch 'tests-warning-as-errors' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-15
Ekaterina Vaartis
Add base CAPTCHA support (currently only kocaptcha)
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'fix/issue_433' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch '114_email_invites' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'fix/issue_272' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
raeno
Merge branch 'develop' into oembed_provider
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'pleroma-feature/compat/push-subscriptions...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Merge branch 'feature/file-size-checking' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
href
Properly disable Web Push if no VAPID key is set
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Ivan Tashkinov
[#114] Readded `invites_enabled` config setting, update...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-14
Ivan Tashkinov
[#114] Addressed MR comments. Removed functionality...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-13
Ivan Tashkinov
[#114] Initial implementation of user email invitations.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-12
Ivan Tashkinov
[#114] Routes and config for `confirm_email` and `email...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
scarlett
Merge branch 'new-fe-options' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
scarlett
Add new frontend options to server-side config.
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix_empty_bio_crash' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/config-md-typos' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'support/bugfix_272' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'fix/theora-detection-read-bytes' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'anonymize-filter-text' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'develop' into 'fix/mix-task-uploads-modul...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-10
lambda
Merge branch 'parallel588/pleroma-support/compile_warni...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-09
Maksim Pechnikov
fix compile warnings
blob
|
commitdiff
|
raw
|
diff to current
2018-12-08
Rin Toshaka
Make uploadlimit an object that stores upload limits...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
Rin Toshaka
Add uploadlimit to Twitter API config
blob
|
commitdiff
|
raw
|
diff to current
2018-12-07
lambda
Merge branch '394_user_tags' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Rin Toshaka
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 'fix/mastodon-api-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 'correct-and-improve-http-options' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 're-mrf' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
kaniini
Merge branch 'feature/compat/push-subscriptions' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Merge branch 'develop' into feature/compat/push-subscri...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-06
Egor Kislitsyn
Add web push support
blob
|
commitdiff
|
raw
|
diff to current
2018-12-01
rinpatch
Attempt to resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-11-30
lain
Merge remote-tracking branch 'origin' into validate...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-27
kaniini
Merge branch 'ogg-theora-detection' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-22
kaniini
Merge branch 'feature/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-21
kaniini
Merge branch 'feature/improve-version' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-20
href
Improved version string
blob
|
commitdiff
|
raw
|
diff to current
2018-11-15
Hakaba Hitoyo
Merge remote-tracking branch 'official/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-10
kaniini
Merge branch 'tests/prismo-url-map' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-08
lambda
Merge branch 'small-jsonld-refactor' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-07
kaniini
Merge branch 'feature/qvitter-notifications-dismiss...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-07
kaniini
Merge branch 'runtime-config' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
href
Runtime configuration
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'runtime-router' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-06
kaniini
Merge branch 'use-the-same-example-domain-and-use-it...
blob
|
commitdiff
|
raw
|
diff to current
2018-11-05
lambda
Merge branch 'runtime-emojis' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-11-05
href
Runtime configured emojis
blob
|
commitdiff
|
raw
|
diff to current
2018-10-23
kaniini
Merge branch 'bugfix/html-scrub-comments' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-23
kaniini
Merge branch 'new-frontend-options' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-21
scarlett
New frontend options
blob
|
commitdiff
|
raw
|
diff to current
2018-10-18
kaniini
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-17
Haelwenn
Merge branch 'import-maybe-direct-follow' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-17
scarlett
Use maybe_direct_follow for follow imports
blob
|
commitdiff
|
raw
|
diff to current
2018-10-07
kaniini
Merge branch 'patch-2' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-05
kaniini
Merge branch 'revert-d31bbb1c' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-10-05
William Pitcock
twitterapi: frontend config: add formattingOptionsEnabled
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'add-secure-and-samesite-cookie-flags...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-07
kaniini
Merge branch 'improve-server-config-examples' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-05
Haelwenn
Merge branch 'fix/sign-in-with-toot' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-03
kaniini
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-03
kaniini
Merge branch 'nil-bio-emojis' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-02
kaniini
Merge branch 'hotfix_broken_likes' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-09-01
kaniini
Merge branch 'security/activitypub-spoofing' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-01
Haelwenn
Merge branch 'feature/disable-config-management' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-09-01
William Pitcock
run `mix format`.
blob
|
commitdiff
|
raw
|
diff to current
2018-09-01
William Pitcock
config: add ability to disable Pleroma FE config manage...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
kaniini
Merge branch 'update/pleroma-fe-config-20180831' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-31
William Pitcock
config: chase pleroma-fe updates from MR pleroma-fe...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-27
lambda
Merge branch 'bugfix/announce-timeline-flooding' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'feature/emoji-in-local-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'login-with-email' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'develop' into 'feature/relay'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'update-pleroma-frontend' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'improve-example-caddyfile' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
kaniini
Merge branch 'remove-unused-settings' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-26
hakabahitoyo
remove unused settings from /api/statusnet/config
blob
|
commitdiff
|
raw
|
diff to current
2018-08-24
kaniini
Merge branch 'bugfix/formatter-single-char-nicks' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-24
kaniini
Merge branch 'config/fe-collapse-subject' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-24
William Pitcock
fe config: add collapse_message_with_subject fe option
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'dev-lanodan-url-regex' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'mastofe/system-font' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'develop' into 'patch-2'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'fix/put-repeats-at-activitypub-outbox...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-16
kaniini
Merge branch 'fix/normalize-file-extension' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-15
lambda
Merge branch 'feature/suggestions-api-with-third-party...
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
lambda
Merge branch 'feature/invites' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-08-12
lambda
Merge branch 'fix/remote-follow-errormessage' into...
blob
|
commitdiff
|
raw
|
diff to current
next