akkoma
5 years agoMerge branch 'admin-configure' into 'develop'
kaniini [Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)]
Merge branch 'admin-configure' into 'develop'

admin api configure changes

See merge request pleroma/pleroma!1345

5 years agoadmin api configure changes
Alexander Strizhakov [Thu, 11 Jul 2019 13:02:13 +0000 (13:02 +0000)]
admin api configure changes

5 years agoMerge branch 'fix/1019-refactor' into 'develop'
kaniini [Thu, 11 Jul 2019 13:01:11 +0000 (13:01 +0000)]
Merge branch 'fix/1019-refactor' into 'develop'

Fix/1019 refactor

See merge request pleroma/pleroma!1397

5 years agoMerge branch 'chore/mailmap' into 'develop'
kaniini [Thu, 11 Jul 2019 09:03:17 +0000 (09:03 +0000)]
Merge branch 'chore/mailmap' into 'develop'

add mailmap [ci skip]

See merge request pleroma/pleroma!1399

5 years agoadd mailmap [ci skip]
Ariadne Conill [Thu, 11 Jul 2019 08:57:30 +0000 (08:57 +0000)]
add mailmap [ci skip]

5 years agoenable synchronization by default
Alex S [Wed, 10 Jul 2019 15:55:11 +0000 (18:55 +0300)]
enable synchronization by default

5 years agoMerge branch 'fix/1005-idna-domains' into 'develop'
kaniini [Wed, 10 Jul 2019 15:23:25 +0000 (15:23 +0000)]
Merge branch 'fix/1005-idna-domains' into 'develop'

support for idna domains

Closes #1005

See merge request pleroma/pleroma!1330

5 years agosupport for idna domains
Alexander Strizhakov [Wed, 10 Jul 2019 15:23:25 +0000 (15:23 +0000)]
support for idna domains

5 years agoMerge branch 'features/mastoapi-emoji-categories' into 'develop'
Haelwenn [Wed, 10 Jul 2019 15:07:37 +0000 (15:07 +0000)]
Merge branch 'features/mastoapi-emoji-categories' into 'develop'

MastoAPI: Add categories to custom emojis

See merge request pleroma/pleroma!1365

5 years agoMastoAPI: Add categories to custom emojis
Haelwenn (lanodan) Monnier [Sat, 29 Jun 2019 23:05:28 +0000 (01:05 +0200)]
MastoAPI: Add categories to custom emojis

Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.

5 years agoremoving synchronization worker
Alex S [Wed, 10 Jul 2019 14:39:07 +0000 (17:39 +0300)]
removing synchronization worker

5 years agorobots txt test fix
Alex S [Wed, 10 Jul 2019 13:37:39 +0000 (16:37 +0300)]
robots txt test fix

5 years agosaving following_address for existing users
Alex S [Wed, 10 Jul 2019 13:02:22 +0000 (16:02 +0300)]
saving following_address for existing users

5 years agoadding following_address field to user
Alex S [Wed, 10 Jul 2019 13:01:32 +0000 (16:01 +0300)]
adding following_address field to user

5 years agoMerge branch 'feature/render-mentions-for-tags' into 'develop'
kaniini [Wed, 10 Jul 2019 13:29:50 +0000 (13:29 +0000)]
Merge branch 'feature/render-mentions-for-tags' into 'develop'

Create mentions only for explicitly mentioned users

Closes #999

See merge request pleroma/pleroma!1375

5 years agoCreate mentions only for explicitly mentioned users
Sergey Suprunenko [Wed, 10 Jul 2019 13:29:50 +0000 (13:29 +0000)]
Create mentions only for explicitly mentioned users

5 years agoMerge branch 'localization' into 'develop'
kaniini [Wed, 10 Jul 2019 13:27:59 +0000 (13:27 +0000)]
Merge branch 'localization' into 'develop'

Error Localization

See merge request pleroma/pleroma!1396

5 years agoFix unused import warning
Egor Kislitsyn [Wed, 10 Jul 2019 11:00:22 +0000 (18:00 +0700)]
Fix unused import warning

5 years agoAdd Russian translation
Egor Kislitsyn [Wed, 10 Jul 2019 10:58:15 +0000 (17:58 +0700)]
Add Russian translation

5 years agoFix response
Egor Kislitsyn [Wed, 10 Jul 2019 10:40:34 +0000 (17:40 +0700)]
Fix response

5 years agoFix credo warning
Egor Kislitsyn [Wed, 10 Jul 2019 09:28:24 +0000 (16:28 +0700)]
Fix credo warning

5 years agoWrap error messages into gettext helpers
Egor Kislitsyn [Wed, 10 Jul 2019 09:25:58 +0000 (16:25 +0700)]
Wrap error messages into gettext helpers

5 years agoAdd translation helpers
Egor Kislitsyn [Wed, 10 Jul 2019 07:52:41 +0000 (14:52 +0700)]
Add translation helpers

5 years agoUpdate `gettext` dependency
Egor Kislitsyn [Wed, 10 Jul 2019 07:01:57 +0000 (14:01 +0700)]
Update `gettext` dependency

5 years agoAdd SetLocalePlug
Egor Kislitsyn [Tue, 9 Jul 2019 11:30:15 +0000 (18:30 +0700)]
Add SetLocalePlug

5 years agoMerge branch 'tests/web/mastodon_api/search_controller' into 'develop'
kaniini [Wed, 10 Jul 2019 08:28:03 +0000 (08:28 +0000)]
Merge branch 'tests/web/mastodon_api/search_controller' into 'develop'

add test for search_controller/ 100% coverage

See merge request pleroma/pleroma!1377

5 years agoadd test for search_controller/ 100% coverage
Maksim [Wed, 10 Jul 2019 08:28:03 +0000 (08:28 +0000)]
add test for search_controller/ 100% coverage

5 years agoMerge branch 'hotfix/disable-email-changelog-fix' into 'develop'
rinpatch [Wed, 10 Jul 2019 08:18:12 +0000 (08:18 +0000)]
Merge branch 'hotfix/disable-email-changelog-fix' into 'develop'

Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance

See merge request pleroma/pleroma!1395

5 years agoAdd a breaking changelog entry for explicitly disabling the mailer and reorder change...
rinpatch [Wed, 10 Jul 2019 08:09:55 +0000 (11:09 +0300)]
Add a breaking changelog entry for explicitly disabling the mailer and reorder changelog sections in order of importance

5 years agoMerge branch 'feature/disable_send_emails' into 'develop'
kaniini [Wed, 10 Jul 2019 05:34:21 +0000 (05:34 +0000)]
Merge branch 'feature/disable_send_emails' into 'develop'

[#1062] added option to disable send email

See merge request pleroma/pleroma!1389

5 years ago[#1062] added option to disable send email
Maksim [Wed, 10 Jul 2019 05:34:21 +0000 (05:34 +0000)]
[#1062] added option to disable send email

5 years agoMerge branch 'feature/send-delete-user-activity' into 'develop'
kaniini [Wed, 10 Jul 2019 05:16:08 +0000 (05:16 +0000)]
Merge branch 'feature/send-delete-user-activity' into 'develop'

Send and handle "Delete" activity for deleted users

Closes #1071 and #1059

See merge request pleroma/pleroma!1384

5 years agoSend and handle "Delete" activity for deleted users
Sergey Suprunenko [Wed, 10 Jul 2019 05:16:08 +0000 (05:16 +0000)]
Send and handle "Delete" activity for deleted users

5 years agoMerge branch 'release/listener' into 'develop'
kaniini [Wed, 10 Jul 2019 05:14:08 +0000 (05:14 +0000)]
Merge branch 'release/listener' into 'develop'

add listener port and ip option for 'pleroma.instance gen' and enable its test

See merge request pleroma/pleroma!1393

5 years agoMerge branch 'fix/license-attribution' into 'develop'
kaniini [Wed, 10 Jul 2019 05:13:23 +0000 (05:13 +0000)]
Merge branch 'fix/license-attribution' into 'develop'

Add license/copyright to all project files

See merge request pleroma/pleroma!1394

5 years agoAdd license/copyright to all project files
feld [Wed, 10 Jul 2019 05:13:23 +0000 (05:13 +0000)]
Add license/copyright to all project files

5 years agoMerge branch 'tests/mrf_policy' into 'develop'
kaniini [Wed, 10 Jul 2019 05:12:21 +0000 (05:12 +0000)]
Merge branch 'tests/mrf_policy' into 'develop'

tests MRF filters

See merge request pleroma/pleroma!1379

5 years agotests MRF filters
Maksim [Wed, 10 Jul 2019 05:12:21 +0000 (05:12 +0000)]
tests MRF filters

5 years agoadd listener port and ip option for 'pleroma.instance gen' and enable its test
Sachin Joshi [Tue, 9 Jul 2019 19:57:41 +0000 (01:42 +0545)]
add listener port and ip option for 'pleroma.instance gen' and enable its test

5 years agoMerge branch '878-activity-object-decoupling-in-tests' into 'develop'
rinpatch [Tue, 9 Jul 2019 20:00:37 +0000 (20:00 +0000)]
Merge branch '878-activity-object-decoupling-in-tests' into 'develop'

[#878] Refactored assumptions on embedded object presence in tests

Closes #878

See merge request pleroma/pleroma!1390

5 years ago[#878] Tests improvements per code review.
Ivan Tashkinov [Tue, 9 Jul 2019 19:37:59 +0000 (22:37 +0300)]
[#878] Tests improvements per code review.

5 years ago[#878] Uncommented test statement.
Ivan Tashkinov [Tue, 9 Jul 2019 19:28:04 +0000 (22:28 +0300)]
[#878] Uncommented test statement.

5 years ago[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity...
Ivan Tashkinov [Tue, 9 Jul 2019 18:46:16 +0000 (21:46 +0300)]
[#878] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests

# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs

5 years agoMerge branch 'docs/more-mastodon-api' into 'develop'
kaniini [Tue, 9 Jul 2019 18:20:36 +0000 (18:20 +0000)]
Merge branch 'docs/more-mastodon-api' into 'develop'

Docs/more mastodon api

See merge request pleroma/pleroma!1392

5 years agoDocs/more mastodon api
feld [Tue, 9 Jul 2019 18:20:36 +0000 (18:20 +0000)]
Docs/more mastodon api

5 years agoMerge branch 'feature/allow-user-query-via-id' into 'develop'
kaniini [Tue, 9 Jul 2019 17:53:41 +0000 (17:53 +0000)]
Merge branch 'feature/allow-user-query-via-id' into 'develop'

Admin API: Allow querying user by ID

See merge request pleroma/pleroma!1380

5 years agoMerge branch 'remove-avatar-header' into 'develop'
kaniini [Tue, 9 Jul 2019 17:51:41 +0000 (17:51 +0000)]
Merge branch 'remove-avatar-header' into 'develop'

Ability to reset avatar, profile banner and backgroud

See merge request pleroma/pleroma!1187

5 years agoMerge branch 'develop' into feature/allow-user-query-via-id
Mark Felder [Tue, 9 Jul 2019 17:49:04 +0000 (12:49 -0500)]
Merge branch 'develop' into feature/allow-user-query-via-id

5 years agoMerge branch 'fix/1019-correct-count-remote-users' into 'develop'
kaniini [Tue, 9 Jul 2019 17:36:35 +0000 (17:36 +0000)]
Merge branch 'fix/1019-correct-count-remote-users' into 'develop'

Fix/1019 correct count remote users

Closes #1019

See merge request pleroma/pleroma!1376

5 years agoFix/1019 correct count remote users
Alexander Strizhakov [Tue, 9 Jul 2019 17:36:35 +0000 (17:36 +0000)]
Fix/1019 correct count remote users

5 years agoMerge branch 'remove-swift' into 'develop'
kaniini [Tue, 9 Jul 2019 16:54:32 +0000 (16:54 +0000)]
Merge branch 'remove-swift' into 'develop'

Remove Uploaders.Swift and `httpoison` dependency

Closes #1051

See merge request pleroma/pleroma!1374

5 years agoMerge branch 'test-coverage' into 'develop'
kaniini [Tue, 9 Jul 2019 16:54:14 +0000 (16:54 +0000)]
Merge branch 'test-coverage' into 'develop'

reverse proxy tests

See merge request pleroma/pleroma!1385

5 years agoreverse proxy tests
Alexander Strizhakov [Tue, 9 Jul 2019 16:54:13 +0000 (16:54 +0000)]
reverse proxy tests

5 years agoMerge branch 'features/sec-websocket-protocol-header' into 'develop'
kaniini [Tue, 9 Jul 2019 16:52:22 +0000 (16:52 +0000)]
Merge branch 'features/sec-websocket-protocol-header' into 'develop'

Features: MastoAPI streaming Sec-WebSocket-Protocol header

See merge request pleroma/pleroma!1381

5 years agoMerge branch 'enable-ogp-by-default' into 'develop'
Haelwenn [Tue, 9 Jul 2019 16:07:20 +0000 (16:07 +0000)]
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

5 years agoMerge branch 'proxy-error' into 'develop'
feld [Tue, 9 Jul 2019 16:00:44 +0000 (16:00 +0000)]
Merge branch 'proxy-error' into 'develop'

make sure the url used by proxy is same as original url

See merge request pleroma/pleroma!1383

5 years agoAdd test for URLs with Unicode characters too
Mark Felder [Tue, 9 Jul 2019 15:55:36 +0000 (10:55 -0500)]
Add test for URLs with Unicode characters too

5 years agoMerge branch 'test-speedup' into 'develop'
Haelwenn [Tue, 9 Jul 2019 15:35:28 +0000 (15:35 +0000)]
Merge branch 'test-speedup' into 'develop'

Testing: Don't federate in testing.

See merge request pleroma/pleroma!1391

5 years agoRemove duplicated test. New one is more comprehensive.
Mark Felder [Tue, 9 Jul 2019 15:23:22 +0000 (10:23 -0500)]
Remove duplicated test. New one is more comprehensive.

5 years agoMerge branch 'develop' into proxy-error
Mark Felder [Tue, 9 Jul 2019 15:18:30 +0000 (10:18 -0500)]
Merge branch 'develop' into proxy-error

5 years agoCapitalize
Mark Felder [Tue, 9 Jul 2019 15:11:42 +0000 (10:11 -0500)]
Capitalize

5 years agoTest that all ASCII encoded characters are preserved
Mark Felder [Tue, 9 Jul 2019 14:41:41 +0000 (09:41 -0500)]
Test that all ASCII encoded characters are preserved

5 years agoMerge branch '161-incoming-replies-depth-limit' into 'develop'
rinpatch [Tue, 9 Jul 2019 14:15:10 +0000 (14:15 +0000)]
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

5 years agoApply suggestion to docs/config.md
Ivan Tashkinov [Tue, 9 Jul 2019 10:39:36 +0000 (10:39 +0000)]
Apply suggestion to docs/config.md

5 years agoMerge branch 'fix/966-local-user-search' into 'develop'
lain [Tue, 9 Jul 2019 08:52:49 +0000 (08:52 +0000)]
Merge branch 'fix/966-local-user-search' into 'develop'

change for local user search

Closes #966

See merge request pleroma/pleroma!1287

5 years agochange for local user search
Alexander Strizhakov [Tue, 9 Jul 2019 08:52:49 +0000 (08:52 +0000)]
change for local user search

5 years agoTesting: Don't federate in testing.
lain [Tue, 9 Jul 2019 06:30:51 +0000 (15:30 +0900)]
Testing: Don't federate in testing.

5 years agoMerge branch 'fix/relationships-in-statuses' into 'develop'
Haelwenn [Mon, 8 Jul 2019 20:40:59 +0000 (20:40 +0000)]
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

5 years ago[#878] Formatting fix.
Ivan Tashkinov [Mon, 8 Jul 2019 17:05:02 +0000 (20:05 +0300)]
[#878] Formatting fix.

5 years ago[#878] Refactored assumptions on embedded object presence in tests. Adjusted note...
Ivan Tashkinov [Mon, 8 Jul 2019 16:53:02 +0000 (19:53 +0300)]
[#878] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.

5 years agoAdd a changelog entry for changing the defaults
rinpatch [Mon, 8 Jul 2019 11:13:30 +0000 (14:13 +0300)]
Add a changelog entry for changing the defaults

5 years agoFormatting
rinpatch [Mon, 8 Jul 2019 11:05:57 +0000 (14:05 +0300)]
Formatting

5 years agoImprove wording in CHANGELOG.md
rinpatch [Mon, 8 Jul 2019 10:04:14 +0000 (13:04 +0300)]
Improve wording in CHANGELOG.md

5 years agoEnable OpenGraph and TwitterCard by default
rinpatch [Mon, 8 Jul 2019 10:00:45 +0000 (13:00 +0300)]
Enable OpenGraph and TwitterCard by default

Closes #1034

5 years agoFallbackRedirector: Do not crash on Metadata rendering errors
rinpatch [Mon, 8 Jul 2019 09:59:49 +0000 (12:59 +0300)]
FallbackRedirector: Do not crash on Metadata rendering errors

5 years agoOGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent
rinpatch [Mon, 8 Jul 2019 09:16:32 +0000 (12:16 +0300)]
OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent

5 years agoMastodon API: Fix embedded relationships not being rendered inside of statuses
rinpatch [Mon, 8 Jul 2019 08:47:40 +0000 (11:47 +0300)]
Mastodon API: Fix embedded relationships not being rendered inside of statuses

5 years agomake sure the url used by proxy is same as origin url
Sachin Joshi [Sun, 7 Jul 2019 08:28:40 +0000 (14:13 +0545)]
make sure the url used by proxy is same as origin url
encoding or decoding it breaks some of the signed url

5 years agomastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header
Haelwenn (lanodan) Monnier [Sun, 7 Jul 2019 06:58:24 +0000 (08:58 +0200)]
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header

5 years agoMastoAPI Streaming: Keep compatibility with access_token
Haelwenn (lanodan) Monnier [Sat, 6 Jul 2019 18:26:08 +0000 (20:26 +0200)]
MastoAPI Streaming: Keep compatibility with access_token

5 years agoMastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol
KokaKiwi [Sat, 22 Jun 2019 17:45:21 +0000 (19:45 +0200)]
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol

5 years agoFix docs
Maxim Filippov [Sat, 6 Jul 2019 12:16:56 +0000 (15:16 +0300)]
Fix docs

5 years agoApply suggestion to CHANGELOG.md
Ivan Tashkinov [Sat, 6 Jul 2019 07:18:26 +0000 (07:18 +0000)]
Apply suggestion to CHANGELOG.md

5 years agoMerge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies...
Ivan Tashkinov [Sat, 6 Jul 2019 07:17:06 +0000 (10:17 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit

5 years agoMerge branch 'fix/1058-uploads-dir-consistency' into 'develop'
rinpatch [Fri, 5 Jul 2019 18:55:27 +0000 (18:55 +0000)]
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

5 years agoAdmin API: Allow querying user by ID
Maxim Filippov [Fri, 5 Jul 2019 16:33:53 +0000 (19:33 +0300)]
Admin API: Allow querying user by ID

5 years agoMerge branch 'issue/1043' into 'develop'
Haelwenn [Fri, 5 Jul 2019 04:22:09 +0000 (04:22 +0000)]
Merge branch 'issue/1043' into 'develop'

[#1043] fix search accounts.

See merge request pleroma/pleroma!1372

5 years ago[#1043] fix search accounts.
Maksim [Fri, 5 Jul 2019 04:22:08 +0000 (04:22 +0000)]
[#1043] fix search accounts.

5 years agotasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Haelwenn (lanodan) Monnier [Fri, 5 Jul 2019 04:19:27 +0000 (06:19 +0200)]
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir

Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
5 years agoMerge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'
rinpatch [Wed, 3 Jul 2019 18:35:57 +0000 (18:35 +0000)]
Merge branch 'expose_skip_thread_containment_in_nodeinfo' into 'develop'

Expose `skip_thread_containment` in nodeinfo

Closes #1030

See merge request pleroma/pleroma!1349

5 years agoExpose `skip_thread_containment` in nodeinfo
Eugenij [Wed, 3 Jul 2019 18:35:57 +0000 (18:35 +0000)]
Expose `skip_thread_containment` in nodeinfo

5 years agoMerge branch 'fix/migration-alter-citext-field-with-key' into 'develop'
feld [Wed, 3 Jul 2019 16:54:47 +0000 (16:54 +0000)]
Merge branch 'fix/migration-alter-citext-field-with-key' into 'develop'

Fix occasional migration failures

See merge request pleroma/pleroma!1373

5 years agoSplit alters rather than work with indexes
Roman Chvanikov [Wed, 3 Jul 2019 11:56:02 +0000 (14:56 +0300)]
Split alters rather than work with indexes

5 years agoMerge branch 'handle-search-timeout' into 'develop'
rinpatch [Wed, 3 Jul 2019 10:19:51 +0000 (10:19 +0000)]
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

5 years agoUse fallback values for search queries
Eugenij [Wed, 3 Jul 2019 10:19:51 +0000 (10:19 +0000)]
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.

5 years agoRemove `httpoison` from dependencies
Egor Kislitsyn [Wed, 3 Jul 2019 07:42:24 +0000 (14:42 +0700)]
Remove `httpoison` from dependencies

5 years agoRemove Uploaders.Swift
Egor Kislitsyn [Wed, 3 Jul 2019 07:11:04 +0000 (14:11 +0700)]
Remove Uploaders.Swift

5 years agoMerge branch '1048-semver-format-compliance' into 'develop'
Haelwenn [Wed, 3 Jul 2019 01:34:16 +0000 (01:34 +0000)]
Merge branch '1048-semver-format-compliance' into 'develop'

Resolved violations of SemVer version format

Closes #1036 and #1048

See merge request pleroma/pleroma!1371

5 years agoFix migration
Roman Chvanikov [Tue, 2 Jul 2019 22:14:40 +0000 (01:14 +0300)]
Fix migration

5 years ago[#1048] Fixed version parsing in pleroma_ctl. Closes #1036.
Ivan Tashkinov [Tue, 2 Jul 2019 15:47:53 +0000 (18:47 +0300)]
[#1048] Fixed version parsing in pleroma_ctl. Closes #1036.