moon/honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
honkoma/lib/pleroma
History
Egor Kislitsyn 305d219413 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs 
# Conflicts:
#	lib/pleroma/web/federator/federator.ex
#	lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
..
captcha
de-group alias/es
2019-02-09 16:31:17 +01:00
config
fix hellthread threshold deprecation warning
2019-02-04 18:26:56 +01:00
emails
de-group alias/es
2019-02-09 16:31:17 +01:00
gopher
de-group alias/es
2019-02-09 16:31:17 +01:00
http
Use multiple hackney pools
2019-01-30 15:06:46 +01:00
instances
de-group import/s
2019-02-09 16:31:17 +01:00
plugs
de-group alias/es
2019-02-09 16:31:17 +01:00
upload
Credo fixes: parameter consistency
2019-02-09 14:59:20 +01:00
uploaders
Credo fixes: parameter consistency
2019-02-09 14:59:20 +01:00
user
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
2019-02-06 22:34:44 +00:00
web
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
2019-02-11 13:54:21 +07:00
activity.ex
de-group alias/es
2019-02-09 16:31:17 +01:00
application.ex
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
2019-02-04 20:50:28 +07:00
clippy.ex
Fix clippy with one/five lines
2019-01-24 16:53:14 +01:00
config.ex
update copyright years to 2019
2018-12-31 15:41:47 +00:00
emoji.ex
update copyright years to 2019
2018-12-31 15:41:47 +00:00
filter.ex
de-group alias/es
2019-02-09 16:31:17 +01:00
flake_id.ex
Credo fixes: parameter consistency
2019-02-09 14:59:20 +01:00
formatter.ex
de-group alias/es
2019-02-09 16:31:17 +01:00
html.ex
HTML.Scrubber.Default: Consistency
2019-02-09 14:59:21 +01:00
instances.ex
[#534] Various tweaks. Tests for Instances and Instance.
2019-01-28 15:25:06 +03:00
jobs.ex
tiny improve
2019-01-30 22:56:59 +07:00
list.ex
de-group alias/es
2019-02-09 16:31:17 +01:00
mime.ex
Mime: detect RIFF formats (wave, webp, avi)
2019-02-04 17:44:41 +01:00
notification.ex
de-group alias/es
2019-02-09 16:31:17 +01:00
object_tombstone.ex
Revert Activity tombstones, add ObjectTombstone struct
2018-12-25 03:00:06 +03:00
object.ex
Merge branch 'fix/credo-issues' into 'develop'
2019-02-10 20:54:21 +00:00
PasswordResetToken.ex
de-group alias/es
2019-02-09 16:31:17 +01:00
repo.ex
update copyright years to 2019
2018-12-31 15:41:47 +00:00
reverse_proxy.ex
[#534] Made federation push sender be determined basing on content instead of referer header. Updated tests.
2019-01-29 13:12:28 +03:00
stats.ex
de-group alias/es
2019-02-09 16:31:17 +01:00
upload.ex
Credo fixes: parameter consistency
2019-02-09 14:59:20 +01:00
user_invite_token.ex
de-group alias/es
2019-02-09 16:31:17 +01:00
user.ex
Merge branch 'fix/credo-issues' into 'develop'
2019-02-10 20:54:21 +00:00