summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-07-09Merge branch 'remove-avatar-header' into 'develop'kaniini
Ability to reset avatar, profile banner and backgroud See merge request pleroma/pleroma!1187
2019-07-09Merge branch 'fix/1019-correct-count-remote-users' into 'develop'kaniini
Fix/1019 correct count remote users Closes #1019 See merge request pleroma/pleroma!1376
2019-07-09Fix/1019 correct count remote usersAlexander Strizhakov
2019-07-09Merge branch 'remove-swift' into 'develop'kaniini
Remove Uploaders.Swift and `httpoison` dependency Closes #1051 See merge request pleroma/pleroma!1374
2019-07-09Merge branch 'test-coverage' into 'develop'kaniini
reverse proxy tests See merge request pleroma/pleroma!1385
2019-07-09reverse proxy testsAlexander Strizhakov
2019-07-09Merge branch 'features/sec-websocket-protocol-header' into 'develop'kaniini
Features: MastoAPI streaming Sec-WebSocket-Protocol header See merge request pleroma/pleroma!1381
2019-07-09Merge branch 'enable-ogp-by-default' into 'develop'Haelwenn
Do not crash if metadata fails to render and enable OGP and TwitterCard by default Closes #1034 See merge request pleroma/pleroma!1388
2019-07-09Merge branch 'proxy-error' into 'develop'feld
make sure the url used by proxy is same as original url See merge request pleroma/pleroma!1383
2019-07-09Add test for URLs with Unicode characters tooMark Felder
2019-07-09Merge branch 'test-speedup' into 'develop'Haelwenn
Testing: Don't federate in testing. See merge request pleroma/pleroma!1391
2019-07-09Remove duplicated test. New one is more comprehensive.Mark Felder
2019-07-09Merge branch 'develop' into proxy-errorMark Felder
2019-07-09CapitalizeMark Felder
2019-07-09Test that all ASCII encoded characters are preservedMark Felder
2019-07-09Merge branch '161-incoming-replies-depth-limit' into 'develop'rinpatch
[#161] Limited replies depth on incoming federation (memory leaks fix) Closes #161 See merge request pleroma/pleroma!1361
2019-07-09Apply suggestion to docs/config.mdIvan Tashkinov
2019-07-09Merge branch 'fix/966-local-user-search' into 'develop'lain
change for local user search Closes #966 See merge request pleroma/pleroma!1287
2019-07-09change for local user searchAlexander Strizhakov
2019-07-09Testing: Don't federate in testing.lain
2019-07-08Merge branch 'fix/relationships-in-statuses' into 'develop'Haelwenn
Mastodon API: Fix embedded relationships not being rendered inside of statuses See merge request pleroma/pleroma!1387
2019-07-08Add a changelog entry for changing the defaultsrinpatch
2019-07-08Formattingrinpatch
2019-07-08Improve wording in CHANGELOG.mdrinpatch
2019-07-08Enable OpenGraph and TwitterCard by defaultrinpatch
Closes #1034
2019-07-08FallbackRedirector: Do not crash on Metadata rendering errorsrinpatch
2019-07-08OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistentrinpatch
2019-07-08Mastodon API: Fix embedded relationships not being rendered inside of statusesrinpatch
2019-07-07make sure the url used by proxy is same as origin urlSachin Joshi
encoding or decoding it breaks some of the signed url
2019-07-07mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol headerHaelwenn (lanodan) Monnier
2019-07-07MastoAPI Streaming: Keep compatibility with access_tokenHaelwenn (lanodan) Monnier
2019-07-06MastoAPI streaming: Replace access_token with Sec-WebSocket-ProtocolKokaKiwi
2019-07-06Apply suggestion to CHANGELOG.mdIvan Tashkinov
2019-07-06Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
161-incoming-replies-depth-limit
2019-07-05Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'rinpatch
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir Closes #1058 See merge request pleroma/pleroma!1378
2019-07-05Merge branch 'issue/1043' into 'develop'Haelwenn
[#1043] fix search accounts. See merge request pleroma/pleroma!1372
2019-07-05[#1043] fix search accounts.Maksim
2019-07-05tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dirHaelwenn (lanodan) Monnier
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
2019-07-03Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'rinpatch
Expose `skip_thread_containment` in nodeinfo Closes #1030 See merge request pleroma/pleroma!1349
2019-07-03Expose `skip_thread_containment` in nodeinfoEugenij
2019-07-03Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop'feld
Fix occasional migration failures See merge request pleroma/pleroma!1373
2019-07-03Split alters rather than work with indexesRoman Chvanikov
2019-07-03Merge branch 'handle-search-timeout' into 'develop'rinpatch
Handle search timeouts for /api/v1/search and /api/v2/search Closes #994 See merge request pleroma/pleroma!1369
2019-07-03Use fallback values for search queriesEugenij
This is to make sure the entire request doesn't return a 500 error if user or status search times out.
2019-07-03Remove `httpoison` from dependenciesEgor Kislitsyn
2019-07-03Remove Uploaders.SwiftEgor Kislitsyn
2019-07-03Merge branch '1048-semver-format-compliance' into 'develop'Haelwenn
Resolved violations of SemVer version format Closes #1036 and #1048 See merge request pleroma/pleroma!1371
2019-07-03Fix migrationRoman Chvanikov
2019-07-02[#1048] Fixed version parsing in pleroma_ctl. Closes #1036.Ivan Tashkinov
2019-07-02[#1048] Resolved violations of SemVer version format. Refactoring.Ivan Tashkinov
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-11 13:23:35 +0000