AkkomaGang/akkoma
AkkomaGang/akkoma
13
63
Fork 84
Code Issues 162 Pull requests 12 Packages Projects 2 Releases 14 Wiki Activity
5744 commits 24 branches 107 tags 316 MiB
Commit graph

5744 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaniini 1179a13533 Merge branch 'features/sec-websocket-protocol-header' into 'develop' 
Features: MastoAPI streaming Sec-WebSocket-Protocol header

See merge request pleroma/pleroma!1381
 2019-07-09 16:52:22 +00:00
Haelwenn 1ab4e35f27 Merge branch 'enable-ogp-by-default' into 'develop' 
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-09 16:07:20 +00:00
feld 167f810ff1 Merge branch 'proxy-error' into 'develop' 
make sure the url used by proxy is same as original url

See merge request pleroma/pleroma!1383
 2019-07-09 16:00:44 +00:00
Mark Felder e143747445 Add test for URLs with Unicode characters too 2019-07-09 10:55:36 -05:00
Haelwenn 95c085174d Merge branch 'test-speedup' into 'develop' 
Testing: Don't federate in testing.

See merge request pleroma/pleroma!1391
 2019-07-09 15:35:28 +00:00
Mark Felder ce3ffad13a Remove duplicated test. New one is more comprehensive. 2019-07-09 10:23:22 -05:00
Mark Felder 31a59d6f23 Merge branch 'develop' into proxy-error 2019-07-09 10:18:30 -05:00
Mark Felder 98f13eac9e Capitalize 2019-07-09 10:11:42 -05:00
Mark Felder 4213a4e2aa Test that all ASCII encoded characters are preserved 2019-07-09 09:43:33 -05:00
rinpatch 376a55c97f Merge branch '161-incoming-replies-depth-limit' into 'develop' 
[#161] Limited replies depth on incoming federation (memory leaks fix)

Closes #161

See merge request pleroma/pleroma!1361
 2019-07-09 14:15:10 +00:00
Ivan Tashkinov dd5a41e2a4 Apply suggestion to docs/config.md 2019-07-09 10:39:36 +00:00
lain 8574ebfc12 Merge branch 'fix/966-local-user-search' into 'develop' 
change for local user search

Closes #966

See merge request pleroma/pleroma!1287
 2019-07-09 08:52:49 +00:00
Alexander Strizhakov 23d4781e73 change for local user search 2019-07-09 08:52:49 +00:00
lain abe2e8881f Testing: Don't federate in testing. 2019-07-09 15:30:51 +09:00
Haelwenn 3a406db430 Merge branch 'fix/relationships-in-statuses' into 'develop' 
Mastodon API: Fix embedded relationships not being rendered inside of statuses

See merge request pleroma/pleroma!1387
 2019-07-08 20:40:59 +00:00
rinpatch f3cc2acb0f Add a changelog entry for changing the defaults 2019-07-08 14:13:30 +03:00
rinpatch 44b2e1fdad Formatting 2019-07-08 14:05:57 +03:00
rinpatch f5b91bc157 Improve wording in CHANGELOG.md 2019-07-08 13:05:46 +03:00
rinpatch 682f1897b7 Enable OpenGraph and TwitterCard by default 
Closes #1034
 2019-07-08 13:00:45 +03:00
rinpatch 9e58d3c624 FallbackRedirector: Do not crash on Metadata rendering errors 2019-07-08 12:59:49 +03:00
rinpatch 7f609ee8f4 OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent 2019-07-08 12:16:32 +03:00
rinpatch 72b88c82bc Mastodon API: Fix embedded relationships not being rendered inside of statuses 2019-07-08 12:07:08 +03:00
Sachin Joshi f5ad430974 make sure the url used by proxy is same as origin url 
encoding or decoding it breaks some of the signed url
 2019-07-07 14:13:40 +05:45
Haelwenn (lanodan) Monnier b5ba41a725
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header 2019-07-07 08:58:24 +02:00
Haelwenn (lanodan) Monnier e174614eb9
MastoAPI Streaming: Keep compatibility with access_token 2019-07-07 08:49:29 +02:00
KokaKiwi a7885748c7
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol 2019-07-06 20:29:17 +02:00
Ivan Tashkinov e2f4135a8c Apply suggestion to CHANGELOG.md 2019-07-06 07:18:26 +00:00
Ivan Tashkinov ad8d86e7c6 Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit 2019-07-06 10:17:06 +03:00
rinpatch 3589b30ddc Merge branch 'fix/1058-uploads-dir-consistency' into 'develop' 
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir

Closes #1058

See merge request pleroma/pleroma!1378
 2019-07-05 18:55:27 +00:00
Haelwenn c1c0091441 Merge branch 'issue/1043' into 'develop' 
[#1043] fix search accounts.

See merge request pleroma/pleroma!1372
 2019-07-05 04:22:09 +00:00
Maksim 6dadf5d6f4 [#1043] fix search accounts. 2019-07-05 04:22:08 +00:00
Haelwenn (lanodan) Monnier 977c2d0448
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
 2019-07-05 06:19:27 +02:00
rinpatch 497788a3cc Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop' 
Expose `skip_thread_containment` in nodeinfo

Closes #1030

See merge request pleroma/pleroma!1349
 2019-07-03 18:35:57 +00:00
Eugenij 15eb1235ed Expose skip_thread_containment in nodeinfo 2019-07-03 18:35:57 +00:00
feld 9b45feae9b Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop' 
Fix occasional migration failures

See merge request pleroma/pleroma!1373
 2019-07-03 16:54:47 +00:00
Roman Chvanikov efefee8241 Split alters rather than work with indexes 2019-07-03 14:56:02 +03:00
rinpatch 079266d406 Merge branch 'handle-search-timeout' into 'develop' 
Handle search timeouts for /api/v1/search and /api/v2/search

Closes #994

See merge request pleroma/pleroma!1369
 2019-07-03 10:19:51 +00:00
Eugenij 5184b0f41a Use fallback values for search queries 
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
 2019-07-03 10:19:51 +00:00
Haelwenn dcadf34471 Merge branch '1048-semver-format-compliance' into 'develop' 
Resolved violations of SemVer version format

Closes #1036 and #1048

See merge request pleroma/pleroma!1371
 2019-07-03 01:34:16 +00:00
Roman Chvanikov 291d95dcc3 Fix migration 2019-07-03 01:14:40 +03:00
Ivan Tashkinov 8c7d7cc936 [#1048] Fixed version parsing in pleroma_ctl. Closes #1036. 2019-07-02 18:47:53 +03:00
Ivan Tashkinov a02f52d12a [#1048] Resolved violations of SemVer version format. Refactoring. 2019-07-02 09:04:59 +03:00
kaniini a565dbde4f Merge branch 'admin-report-view-user-fallback' into 'develop' 
Handle deleted reported accounts in report admin API

Closes #1046

See merge request pleroma/pleroma!1370
 2019-07-02 01:27:00 +00:00
Eugenij ab50c6b3ca Add fallback value to the admin report view. 
This is to avoid 500 error when the reported user no longer exists
in the database.
 2019-07-02 01:27:00 +00:00
rinpatch 79c88a257f Merge branch 'fix/changelog' into 'develop' 
Move changelog entries

See merge request pleroma/pleroma!1368
 2019-07-01 11:46:07 +00:00
Maxim Filippov 0b3561ae72 Move changelog entries 2019-07-01 14:04:24 +03:00
Haelwenn 3b05f834f4 Merge branch 'fix/docs-dry-run' into 'develop' 
OTP Release install docs: Remove --dry-run in cron certbot command

See merge request pleroma/pleroma!1366
 2019-07-01 04:52:42 +00:00
Haelwenn ce827a1626 Merge branch 'ci-improvements' into 'develop' 
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-01 04:51:56 +00:00
Haelwenn 47efe52c50 Merge branch 'chore/changelog-update' into 'develop' 
Update changelog and admin API docs with tags, display_name, avatar additions

See merge request pleroma/pleroma!1367
 2019-07-01 04:45:00 +00:00
feld 5f1dd4fe80 Merge branch 'issue/1033' into 'develop' 
[#1033] Fix database migrations

See merge request pleroma/pleroma!1350
 2019-07-01 01:08:07 +00:00