summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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-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-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
2019-07-02Merge branch 'admin-report-view-user-fallback' into 'develop'kaniini
Handle deleted reported accounts in report admin API Closes #1046 See merge request pleroma/pleroma!1370
2019-07-02Add fallback value to the admin report view.Eugenij
This is to avoid 500 error when the reported user no longer exists in the database.
2019-07-01Merge branch 'fix/changelog' into 'develop'rinpatch
Move changelog entries See merge request pleroma/pleroma!1368
2019-07-01Move changelog entriesMaxim Filippov
2019-07-01Merge branch 'fix/docs-dry-run' into 'develop'Haelwenn
OTP Release install docs: Remove --dry-run in cron certbot command See merge request pleroma/pleroma!1366
2019-07-01Merge branch 'ci-improvements' into 'develop'Haelwenn
Add PLEROMA_BUILD_ENV to override env for the version generator and use it in the CI for building docs See merge request pleroma/pleroma!1360
2019-07-01Merge branch 'chore/changelog-update' into 'develop'Haelwenn
Update changelog and admin API docs with tags, display_name, avatar additions See merge request pleroma/pleroma!1367
2019-07-01Merge branch 'issue/1033' into 'develop'feld
[#1033] Fix database migrations See merge request pleroma/pleroma!1350
2019-07-01[#1033] Fix database migrationsMaksim
2019-07-01Update changelog and admin API docs with tags, display_name, avatar additionsMaxim Filippov
2019-06-30[#161] Merge remote-tracking branch 'remotes/upstream/develop' into ↵Ivan Tashkinov
161-incoming-replies-depth-limit # Conflicts: # CHANGELOG.md
2019-06-30[#161] Refactoring, documentation.Ivan Tashkinov
2019-06-30OTP Release install docs: Remove --dry-run in cron certbot commandrinpatch
2019-06-30Merge branch 'filter-user-statuses-by-hashtag' into 'develop'rinpatch
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses) Closes #974 See merge request pleroma/pleroma!1362
2019-06-30Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)Eugenij
2019-06-30Merge branch 'issues/1026' into 'develop'rinpatch
[#1026] Filter.AnonymizeFilename added ability to retain file extension with custom text Closes #1026 See merge request pleroma/pleroma!1363
2019-06-30[#1026] Filter.AnonymizeFilename added ability to retain file extension with ↵Maksim
custom text
2019-06-30Merge branch 'fix/pin-unlisted' into 'develop'Haelwenn
Fix not being able to pin unlisted posts Closes #1038 See merge request pleroma/pleroma!1364
2019-06-29Fix not being able to pin unlisted postsrinpatch
Closes #1038
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-05 09:48:09 +0000