projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first
⋅
prev
⋅
next
Merge branch 'legacy-fe-config' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
controllers
/
util_controller.ex
2019-03-14
link0ff
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
2019-03-13
kaniini
Merge branch 'mastofe-content-types' into 'develop'
blob
|
commitdiff
|
raw
2019-03-13
lambda
Merge branch 'features/add-credo-to-ci' into 'develop'
blob
|
commitdiff
|
raw
2019-03-13
Haelwenn (lanodan...
[Credo] fix Credo.Check.Readability.AliasOrder
blob
|
commitdiff
|
raw
2019-03-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-03-04
Egor Kislitsyn
allow users to disable their own account
blob
|
commitdiff
|
raw
|
diff to current
2019-02-17
Ivan Tashkinov
[#468] Merged `upstream/develop`, resolved conflicts.
blob
|
commitdiff
|
raw
|
diff to current
2019-02-14
Wim Vanderbauwhede
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'update-mastofe/glitch-soc-2019-02-10...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'feather_mention' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
kaniini
Merge branch 'fix/credo-issues' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
de-group alias/es
blob
|
commitdiff
|
raw
|
diff to current
2019-02-09
Haelwenn (lanodan...
Credo fixes: alias grouping/ordering
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
kaniini
Merge branch 'feature/split-hide-network' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-01
href
Merge branch '534_federation_targets_reachability'...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
kaniini
Merge branch 'spc-fix-3' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
Haelwenn
Merge branch 'features/glitch-soc-frontend' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
Egor Kislitsyn
Merge remote-tracking branch 'MAIN/develop' into featur...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
kaniini
Merge branch 'bugfix/fix-rejects' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-29
kaniini
Merge branch 'hj-happiness-improvement' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-28
lain
Return new-style config if old-style config is set...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-23
lain
New frontend configuration mechanism.
blob
|
commitdiff
|
raw
|
diff to current
2019-01-13
rinpatch
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2019-01-05
kaniini
Merge branch 'fix_486' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-03
rinpatch
Merge branch 'captcha' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lambda
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-01
lain
Merge remote-tracking branch 'origin/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'features/admin-api-user-views' into ...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'docs/admin-api' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
kaniini
Merge branch 'maintenance/copyright-2019' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-31
William Pitcock
update copyright years to 2019
blob
|
commitdiff
|
raw
|
diff to current
2018-12-30
Rin Toshaka
Resolve merge conflict
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
kaniini
Merge branch 'carrot-bullying' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
kaniini
Merge branch '483_blocks_import_export' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-29
Ivan Tashkinov
[#483] Refactored blocks and follows import, added...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
kaniini
Merge branch 'systemd-drop-sysadmin-privilege' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-28
Ivan Tashkinov
[#483] Blocked users list import (TwitterAPI).
blob
|
commitdiff
|
raw
|
diff to current
2018-12-27
kaniini
Merge branch 'feature/create-tombstone-instead-of-delet...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-25
lambda
Merge branch 'legal-boilerplate' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
William Pitcock
add license boilerplate to pleroma core
blob
|
commitdiff
|
raw
|
diff to current
2018-12-23
lambda
Merge branch 'hotfix/activity-without-content' into...
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
lambda
Merge branch 'ci-test-fix' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2018-12-20
kaniini
Merge branch '114_email_confirmation' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
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
next