projects
/
akkoma
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge branch 'develop' into tests/mastodon_api_controller.ex
[akkoma]
/
lib
/
pleroma
/
web
/
rich_media
/
parser.ex
2019-09-23
Maksim Pechnikov
Merge branch 'develop' into tests/mastodon_api_controll...
blob
|
commitdiff
|
raw
2019-09-18
feld
Merge branch 'restore-tests' into 'develop'
blob
|
commitdiff
|
raw
2019-09-17
Maksim Pechnikov
Merge branch 'develop' into issue/733
blob
|
commitdiff
|
raw
2019-09-17
rinpatch
Merge branch 'support/tests' into 'develop'
blob
|
commitdiff
|
raw
2019-09-16
Maxim Filippov
Merge branch 'develop' into feature/return-total-for...
blob
|
commitdiff
|
raw
2019-09-16
kaniini
Merge branch 'feature/delivery-tracking' into 'develop'
blob
|
commitdiff
|
raw
2019-09-16
kaniini
Merge branch 'feature/optimize_rich_media_parser' into...
blob
|
commitdiff
|
raw
2019-09-15
Maksim Pechnikov
added prepare html for RichMedia.Parser
blob
|
commitdiff
|
raw
2019-08-24
lain
Merge branch 'admin-create-users' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-25
rinpatch
Merge branch 'develop' into feature/hide-follows-remote
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'fix-remote-follow-from-ostatus-subscribe...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-24
kaniini
Merge branch 'Fix-static-dir-doc' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-23
kaniini
Merge branch 'feature/admin-api-user-statuses' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-23
kaniini
Merge branch 'bugfix/rich-media-splice-url' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-23
Ariadne Conill
rich media: parser: splice the given URL into the result
blob
|
commitdiff
|
raw
|
diff to current
2019-07-23
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-21
kaniini
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-21
rinpatch
Fix rich media parser failing when no TTL can be found...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-20
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Roman Chvanikov
Merge develop
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
feld
Merge branch 'feature/matstodon-statuses-by-name' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
kaniini
Merge branch 'feature/richmedia-ttl' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-07-19
Sachin Joshi
change the structure of image ttl parsar
blob
|
commitdiff
|
raw
|
diff to current
2019-07-18
Maxim Filippov
Merge branch 'develop' into feature/admin-api-user...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-16
Sachin Joshi
add the rich media ttl based on image exp time
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Mark Felder
Merge branch 'develop' into feature/matstodon-statuses...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Sachin Joshi
Merge branch 'develop' into match-file-name
blob
|
commitdiff
|
raw
|
diff to current
2019-07-15
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
Roman Chvanikov
Merge branch 'develop' into feature/digest-email
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
kaniini
Merge branch 'rich_media_parsers_configurable' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-07-14
Alex S
parsers configurable
blob
|
commitdiff
|
raw
|
diff to current
2019-07-11
Egor Kislitsyn
Merge branch 'develop' into feature/addressable-lists
blob
|
commitdiff
|
raw
|
diff to current
2019-06-28
Roman Chvanikov
Resolve conflicts
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-11
lain
Merge branch 'feature/rate-limiter' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-07
kaniini
Merge branch 'fix/replace-mix-env' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-06
rinpatch
Replace Mix.env with Pleroma.Config.get(:env)
blob
|
commitdiff
|
raw
|
diff to current
2019-06-04
Egor Kislitsyn
Merge remote-tracking branch 'pleroma/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-03
Mark Felder
Merge branch 'develop' into feature/digest-email
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-06-03
lambda
Merge branch 'align-mastodon-conversations' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-06-02
kaniini
Merge branch 'feature/notification-control-part-2'...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
rinpatch
Resolve merge conflicts
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
Sachin Joshi
Merge remote-tracking branch 'upstream/develop' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-06-01
kaniini
Merge branch 'bugfix/visibility-indicator-litepub-dm...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
Haelwenn
Merge branch 'dokku' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-31
lambda
Merge branch 'hotfix/leaking-lists' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
feld
Merge branch 'fix/ogp-missing-data' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-05-30
Sergey Suprunenko
Replace missing non-nullable Card attributes with empty...
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
Mark Felder
Merge branch 'develop' into update-oauth-template
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
lambda
Merge branch 'features/download-mastofe-build' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-05-01
Alex S
Merging with develop
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-19
lambda
Merge branch '923_oauth_consumer_refactoring_ci' into...
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-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
kaniini
Merge branch 'fix/hackney_max_body_param' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-04-11
Roman Chvanikov
Add `with_body: true` to requests relying on `max_body...
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-02
lambda
Merge branch 'features/pleroma-tan' into 'develop'
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-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 'bugfix/tesla-safety' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-03-08
William Pitcock
http: rework connection timeouts to match hackney docs...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-18
kaniini
Merge branch 'feature/jobs' into 'develop'
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-14
kaniini
Merge branch 'fix/credo-issues-test' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-13
Karen Konou
Merge branch 'develop' into hellthread-filter-fix
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
rinpatch
Merge branch 'feature/thread-muting' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-11
lambda
Merge branch 'feature/rich-media-limits' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-10
William Pitcock
rich media: tighten fetching timeouts and size limits
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
Karen Konou
Merge branch 'develop' into feature/thread-muting
blob
|
commitdiff
|
raw
|
diff to current
2019-02-08
rinpatch
Merge branch 'develop' into feature/keyword-policy
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
rinpatch
Merge branch 'fix/activitypub-user-view-badmap' into...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-06
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
rinpatch
Merge branch 'bugfix/rich-media-non-unicode-nuclear...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-05
William Pitcock
rich media: parser: reject any data which cannot be...
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
rinpatch
Merge branch 'fix/rich-media-relative-path' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-02-04
Egor Kislitsyn
Merge branch 'develop' of git.pleroma.social:pleroma...
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
Haelwenn
Merge branch 'docs/pleroma-api-invite-token' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
lambda
Merge branch 'bugfix/rich-media-non-unicode' into ...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
William Pitcock
rich media: parser: only try to validate strings, not...
blob
|
commitdiff
|
raw
|
diff to current
2019-01-31
William Pitcock
rich media: parser: reject OGP fields we cannot safely...
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-30
lambda
Merge branch 'multiple-hackney-pools' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
2019-01-30
href
Fix 4aff4efa typos
blob
|
commitdiff
|
raw
|
diff to current
2019-01-30
kaniini
Merge branch 'multiple-hackney-pools' into 'develop'
blob
|
commitdiff
|
raw
|
diff to current
next