akkoma
5 years agoMerge branch 'update-readme' into 'develop'
rinpatch [Mon, 1 Apr 2019 16:25:02 +0000 (16:25 +0000)]
Merge branch 'update-readme' into 'develop'

Fix dead links in README.md and add note about new docs site

See merge request pleroma/pleroma!1000

5 years agoLink to docs page instead of to clients.md
Karen Konou [Mon, 1 Apr 2019 16:13:42 +0000 (18:13 +0200)]
Link to docs page instead of to clients.md

5 years agoFix dead links and add note about new docs site
Karen Konou [Mon, 1 Apr 2019 16:02:58 +0000 (18:02 +0200)]
Fix dead links and add note about new docs site

5 years agoMerge branch 'fix/job-queue-doc' into 'develop'
lambda [Fri, 29 Mar 2019 13:43:07 +0000 (13:43 +0000)]
Merge branch 'fix/job-queue-doc' into 'develop'

Improve PleromaJobQeue config documentation

See merge request pleroma/pleroma!993

5 years agoqs
rinpatch [Fri, 29 Mar 2019 13:38:18 +0000 (16:38 +0300)]
qs

5 years agoImprove PleromaJobQeue config documentation
rinpatch [Fri, 29 Mar 2019 13:11:22 +0000 (16:11 +0300)]
Improve PleromaJobQeue config documentation

5 years agoMerge branch 'pleroma_job_queue' into 'develop'
lambda [Fri, 29 Mar 2019 12:46:05 +0000 (12:46 +0000)]
Merge branch 'pleroma_job_queue' into 'develop'

Replace Pleroma.Jobs with `pleroma_job_queue`

See merge request pleroma/pleroma!992

5 years agoReplace Pleroma.Jobs with `pleroma_job_queue`
Egor [Fri, 29 Mar 2019 12:46:05 +0000 (12:46 +0000)]
Replace Pleroma.Jobs with `pleroma_job_queue`

5 years agoMerge branch 'sayonara-gitlab-wiki' into 'develop'
lambda [Fri, 29 Mar 2019 10:24:52 +0000 (10:24 +0000)]
Merge branch 'sayonara-gitlab-wiki' into 'develop'

Move out of Gitlab Wiki

See merge request pleroma/pleroma!990

5 years agoMerge branch 'feature/deploy-docs' into 'develop'
lambda [Fri, 29 Mar 2019 09:57:15 +0000 (09:57 +0000)]
Merge branch 'feature/deploy-docs' into 'develop'

Add automatic documentation build and deploy for master and develop branches

Closes #478

See merge request pleroma/pleroma!965

5 years agoMerge branch 'bugfix/migration-less_replies_count' into 'develop'
kaniini [Fri, 29 Mar 2019 07:32:24 +0000 (07:32 +0000)]
Merge branch 'bugfix/migration-less_replies_count' into 'develop'

Revert awfully long migration from 568e34858

See merge request pleroma/pleroma!991

5 years agoRevert awfully long migration from 568e34858
Haelwenn (lanodan) Monnier [Fri, 29 Mar 2019 00:57:02 +0000 (01:57 +0100)]
Revert awfully long migration from 568e34858

5 years agoRemove duplicated header from i2p.md
rinpatch [Thu, 28 Mar 2019 17:29:46 +0000 (20:29 +0300)]
Remove duplicated header from i2p.md

5 years agodid it really take me 4 commits to fix this?
rinpatch [Thu, 28 Mar 2019 17:27:01 +0000 (20:27 +0300)]
did it really take me 4 commits to fix this?

5 years agoRemove duplicated header from admin_api.md
rinpatch [Thu, 28 Mar 2019 17:16:59 +0000 (20:16 +0300)]
Remove duplicated header from admin_api.md

5 years agoremove admin tasks as they have their page in mix tasks category already
rinpatch [Thu, 28 Mar 2019 17:16:14 +0000 (20:16 +0300)]
remove admin tasks as they have their page in mix tasks category already

5 years agocringe
rinpatch [Thu, 28 Mar 2019 17:13:22 +0000 (20:13 +0300)]
cringe

5 years agoMove out of Gitlab Wiki
rinpatch [Thu, 28 Mar 2019 16:46:30 +0000 (19:46 +0300)]
Move out of Gitlab Wiki

I understand that this change is quite unreadable and hard to review, sorry for forgetting to do atomic commits. This patch does not change too much content wise, it just
* Gets everything from gitlab wiki
* Removes some specific gitlab hacks
* Formats all documentation file names to be in snake case so they look the same way as our code does

5 years agoMerge branch 'admin-api-user-show' into 'develop'
lambda [Thu, 28 Mar 2019 12:19:44 +0000 (12:19 +0000)]
Merge branch 'admin-api-user-show' into 'develop'

Admin API user show

Closes #766

See merge request pleroma/pleroma!987

5 years agoAdd user show endpoint for Pleroma admin API
eugenijm [Wed, 27 Mar 2019 18:19:00 +0000 (21:19 +0300)]
Add user show endpoint for Pleroma admin API

5 years agoMerge branch 'feature/more-user-filters' into 'develop'
lambda [Wed, 27 Mar 2019 11:33:13 +0000 (11:33 +0000)]
Merge branch 'feature/more-user-filters' into 'develop'

Add more user filters + move search to its own module

See merge request pleroma/pleroma!982

5 years agoMerge branch 'fix-reblog-tests' into 'develop'
lambda [Wed, 27 Mar 2019 11:30:07 +0000 (11:30 +0000)]
Merge branch 'fix-reblog-tests' into 'develop'

Fix muting reblogs tests

See merge request pleroma/pleroma!984

5 years agoFix muting reblogs tests
rinpatch [Wed, 27 Mar 2019 10:43:43 +0000 (13:43 +0300)]
Fix muting reblogs tests

5 years agoMerge branch 'hotfix/missing-announce-mastoapi' into 'develop'
rinpatch [Wed, 27 Mar 2019 09:37:08 +0000 (09:37 +0000)]
Merge branch 'hotfix/missing-announce-mastoapi' into 'develop'

Fix missing announces in MastoAPI home timeline

Closes #762

See merge request pleroma/pleroma!983

5 years agoFix missing announces in MastoAPI home timeline
rinpatch [Wed, 27 Mar 2019 09:28:53 +0000 (12:28 +0300)]
Fix missing announces in MastoAPI home timeline

Closes #762

5 years agoMerge branch 'apps-verify-credentials' into 'develop'
lambda [Wed, 27 Mar 2019 09:16:00 +0000 (09:16 +0000)]
Merge branch 'apps-verify-credentials' into 'develop'

MastodonAPI: Add GET /api/v1/apps/verify_credentials

See merge request pleroma/pleroma!981

5 years agoAdd more user filters + move search to its own module
Maxim Filippov [Tue, 26 Mar 2019 22:51:59 +0000 (03:51 +0500)]
Add more user filters + move search to its own module

5 years agoAdd vapid_key to the `POST /api/v1/apps` response
eugenijm [Tue, 26 Mar 2019 20:21:31 +0000 (23:21 +0300)]
Add vapid_key to the `POST /api/v1/apps` response

5 years agoAdd GET /api/v1/apps/verify_credentials
eugenijm [Tue, 26 Mar 2019 18:42:03 +0000 (21:42 +0300)]
Add GET /api/v1/apps/verify_credentials

5 years agoMerge branch 'fix/ap-icon' into 'develop'
lambda [Tue, 26 Mar 2019 16:12:50 +0000 (16:12 +0000)]
Merge branch 'fix/ap-icon' into 'develop'

Do not federate instance avatar

Closes #759

See merge request pleroma/pleroma!977

5 years agoMerge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
lambda [Tue, 26 Mar 2019 16:01:52 +0000 (16:01 +0000)]
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'

Mastodon 2.7.2 instance attributes (registrations, languages)

See merge request pleroma/pleroma!979

5 years agoAP UserView: Refactor banner / avatar display code, add test.
lain [Tue, 26 Mar 2019 15:40:09 +0000 (16:40 +0100)]
AP UserView: Refactor banner / avatar display code, add test.

5 years agoTest for MastoAPI /api/v1/instance response structure (formatting fix).
Ivan Tashkinov [Tue, 26 Mar 2019 15:18:36 +0000 (18:18 +0300)]
Test for MastoAPI /api/v1/instance response structure (formatting fix).

5 years agoMerge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
lambda [Tue, 26 Mar 2019 15:13:55 +0000 (15:13 +0000)]
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'

Mastodon-based auth error messages. User#auth_active?/1 refactoring.

See merge request pleroma/pleroma!978

5 years agoTest for MastoAPI /api/v1/instance response structure.
Ivan Tashkinov [Tue, 26 Mar 2019 15:13:24 +0000 (18:13 +0300)]
Test for MastoAPI /api/v1/instance response structure.

5 years agoMerge branch 'replies-count' into 'develop'
lambda [Tue, 26 Mar 2019 14:49:09 +0000 (14:49 +0000)]
Merge branch 'replies-count' into 'develop'

Increment replies_count (MastoAPI)

Closes #756

See merge request pleroma/pleroma!974

5 years agoMerge branch 'refactor/remove-activity-representer' into 'develop'
lambda [Tue, 26 Mar 2019 14:46:01 +0000 (14:46 +0000)]
Merge branch 'refactor/remove-activity-representer' into 'develop'

Remove ActivityRepresenter

See merge request pleroma/pleroma!980

5 years agoCredo is upset about me not remembering the alphabet
rinpatch [Tue, 26 Mar 2019 14:35:45 +0000 (17:35 +0300)]
Credo is upset about me not remembering the alphabet

5 years agoFix formatting
rinpatch [Tue, 26 Mar 2019 14:18:18 +0000 (17:18 +0300)]
Fix formatting

5 years agoRemove ActivityRepresenter
rinpatch [Tue, 26 Mar 2019 14:16:21 +0000 (17:16 +0300)]
Remove ActivityRepresenter

5 years agoMastodon 2.7.2 instance attributes (registrations, languages).
Ivan Tashkinov [Tue, 26 Mar 2019 13:27:17 +0000 (16:27 +0300)]
Mastodon 2.7.2 instance attributes (registrations, languages).

5 years agoIncrement replies_count on replies (MastoAPI)
eugenijm [Mon, 25 Mar 2019 17:21:48 +0000 (20:21 +0300)]
Increment replies_count on replies (MastoAPI)

5 years agoComments split.
Ivan Tashkinov [Tue, 26 Mar 2019 12:24:29 +0000 (15:24 +0300)]
Comments split.

5 years agoMastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
Ivan Tashkinov [Tue, 26 Mar 2019 12:09:06 +0000 (15:09 +0300)]
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.

5 years agoTry sending an empty map
Mark Felder [Tue, 26 Mar 2019 00:00:35 +0000 (19:00 -0500)]
Try sending an empty map

5 years agoAttempt to fix incorrect federation of default instance avatars
Mark Felder [Mon, 25 Mar 2019 23:47:04 +0000 (18:47 -0500)]
Attempt to fix incorrect federation of default instance avatars

5 years agoMerge branch 'fix/notification-id-index' into 'develop'
rinpatch [Mon, 25 Mar 2019 19:07:15 +0000 (19:07 +0000)]
Merge branch 'fix/notification-id-index' into 'develop'

Add an `id desc nulls last` index to notifications

See merge request pleroma/pleroma!975

5 years agoAdd an id index to notifications
rinpatch [Mon, 25 Mar 2019 18:59:52 +0000 (21:59 +0300)]
Add an id index to notifications

5 years agoMerge branch 'bugfix/missing-announces' into 'develop'
rinpatch [Mon, 25 Mar 2019 09:24:08 +0000 (09:24 +0000)]
Merge branch 'bugfix/missing-announces' into 'develop'

fix up missing announcements with preloads

See merge request pleroma/pleroma!972

5 years agofix up missing announcements with preloads
William Pitcock [Mon, 25 Mar 2019 03:32:19 +0000 (03:32 +0000)]
fix up missing announcements with preloads

5 years agoMerge branch 'features/s3-uploader-digital-ocean' into 'develop'
kaniini [Mon, 25 Mar 2019 02:25:59 +0000 (02:25 +0000)]
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'

add overriding truncated_namespace condition for truncating paths for digital ocean

See merge request pleroma/pleroma!969

5 years agoMerge branch 'fix/mastoapi-liked' into 'develop'
kaniini [Mon, 25 Mar 2019 02:24:27 +0000 (02:24 +0000)]
Merge branch 'fix/mastoapi-liked' into 'develop'

Serve non-public activities in /api/v1/favourites

Closes #648

See merge request pleroma/pleroma!970

5 years agoServe non-public activities in /api/v1/favourites
rinpatch [Sun, 24 Mar 2019 23:15:45 +0000 (02:15 +0300)]
Serve non-public activities in /api/v1/favourites

Fixes #648

5 years agoadd overriding truncated_namespace condition for truncating paths for digital ocean
Austin Lanari [Sun, 24 Mar 2019 18:32:09 +0000 (11:32 -0700)]
add overriding truncated_namespace condition for truncating paths for digital ocean

5 years agoMerge branch 'features/mrf-keyword-nil-summary' into 'develop'
rinpatch [Sun, 24 Mar 2019 15:02:13 +0000 (15:02 +0000)]
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'

mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil

See merge request pleroma/pleroma!968

5 years agomrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
Haelwenn (lanodan) Monnier [Sun, 24 Mar 2019 14:47:50 +0000 (15:47 +0100)]
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil

5 years agoMerge branch 'fix/eldap-warnings' into 'develop'
rinpatch [Sun, 24 Mar 2019 11:17:40 +0000 (11:17 +0000)]
Merge branch 'fix/eldap-warnings' into 'develop'

Ignore compilation warnings for undefined module :eldap

See merge request pleroma/pleroma!956

5 years agoMerge branch 'feature/object-normalize-preload' into 'develop'
kaniini [Sun, 24 Mar 2019 02:31:56 +0000 (02:31 +0000)]
Merge branch 'feature/object-normalize-preload' into 'develop'

preloaded object normalization

See merge request pleroma/pleroma!967

5 years agoRemove useless echo
rinpatch [Sat, 23 Mar 2019 07:19:13 +0000 (10:19 +0300)]
Remove useless echo

5 years agotests: fix up activity collision test
William Pitcock [Sat, 23 Mar 2019 03:16:50 +0000 (03:16 +0000)]
tests: fix up activity collision test

5 years agoactivity: use left join instead of inner join when fetching activities that may or...
William Pitcock [Sat, 23 Mar 2019 03:13:19 +0000 (03:13 +0000)]
activity: use left join instead of inner join when fetching activities that may or may not have a child object

5 years agouser: use preloads when deleting accounts
William Pitcock [Sat, 23 Mar 2019 03:04:42 +0000 (03:04 +0000)]
user: use preloads when deleting accounts

5 years agoostatus: use preload objects with Object.normalize() when opportunistic
William Pitcock [Sat, 23 Mar 2019 03:03:06 +0000 (03:03 +0000)]
ostatus: use preload objects with Object.normalize() when opportunistic

5 years agoobject: downgrade normalize warning to debug severity
William Pitcock [Sat, 23 Mar 2019 03:00:04 +0000 (03:00 +0000)]
object: downgrade normalize warning to debug severity

5 years agoactivitypub: object view: use preloaded object when possible
William Pitcock [Sat, 23 Mar 2019 02:49:40 +0000 (02:49 +0000)]
activitypub: object view: use preloaded object when possible

5 years agoactivity: add get_by_ap_id_with_object()
William Pitcock [Sat, 23 Mar 2019 02:49:10 +0000 (02:49 +0000)]
activity: add get_by_ap_id_with_object()

5 years agoactivitypub: when fetching objects, use the preloaded object from the synthesized...
William Pitcock [Sat, 23 Mar 2019 02:38:59 +0000 (02:38 +0000)]
activitypub: when fetching objects, use the preloaded object from the synthesized activity

5 years agonotification: formatting
William Pitcock [Sat, 23 Mar 2019 02:30:53 +0000 (02:30 +0000)]
notification: formatting

5 years agostreamer: use the preloaded object if possible
William Pitcock [Sat, 23 Mar 2019 02:27:52 +0000 (02:27 +0000)]
streamer: use the preloaded object if possible

5 years agorich media: helpers: only crawl Create activities
William Pitcock [Sat, 23 Mar 2019 02:26:49 +0000 (02:26 +0000)]
rich media: helpers: only crawl Create activities

5 years agonotification: preload child objects
William Pitcock [Sat, 23 Mar 2019 02:19:34 +0000 (02:19 +0000)]
notification: preload child objects

5 years agorelay: use preloaded object since we always have it
William Pitcock [Sat, 23 Mar 2019 01:33:41 +0000 (01:33 +0000)]
relay: use preloaded object since we always have it

5 years agorelay test: don't do preloading (since follow objects are activities, it's a mess)
William Pitcock [Sat, 23 Mar 2019 01:23:02 +0000 (01:23 +0000)]
relay test: don't do preloading (since follow objects are activities, it's a mess)

5 years agoostatus: fetch preloaded object in note handler for testsuite
William Pitcock [Sat, 23 Mar 2019 01:17:26 +0000 (01:17 +0000)]
ostatus: fetch preloaded object in note handler for testsuite

5 years agoactivitypub: allow skipping preload in some cases (like certain tests where the prelo...
William Pitcock [Sat, 23 Mar 2019 01:09:12 +0000 (01:09 +0000)]
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)

5 years agoactivitypub: add missing with_preloaded_object()
William Pitcock [Sat, 23 Mar 2019 00:53:35 +0000 (00:53 +0000)]
activitypub: add missing with_preloaded_object()

5 years agoactivitypub: splice in the child object if we have one
William Pitcock [Sat, 23 Mar 2019 00:40:08 +0000 (00:40 +0000)]
activitypub: splice in the child object if we have one

5 years agoformatting
William Pitcock [Sat, 23 Mar 2019 00:28:16 +0000 (00:28 +0000)]
formatting

5 years agoactivity: fix credo nitpick
William Pitcock [Sat, 23 Mar 2019 00:24:23 +0000 (00:24 +0000)]
activity: fix credo nitpick

5 years agorich media: use optimized Object.normalize()
William Pitcock [Sat, 23 Mar 2019 00:22:57 +0000 (00:22 +0000)]
rich media: use optimized Object.normalize()

5 years agocommon api: use the optimized Object.normalize whenever possible
William Pitcock [Sat, 23 Mar 2019 00:22:14 +0000 (00:22 +0000)]
common api: use the optimized Object.normalize whenever possible

5 years agoactivitypub: preload child objects when fetching timelines
William Pitcock [Sat, 23 Mar 2019 00:10:17 +0000 (00:10 +0000)]
activitypub: preload child objects when fetching timelines

5 years agoactivity: add with_preloaded_object() convenience
William Pitcock [Sat, 23 Mar 2019 00:09:56 +0000 (00:09 +0000)]
activity: add with_preloaded_object() convenience

5 years agoobject: add support for preloading objects when walking an activity graph in normal...
William Pitcock [Fri, 22 Mar 2019 23:34:47 +0000 (23:34 +0000)]
object: add support for preloading objects when walking an activity graph in normal form

5 years agoRemove postgres from documentation related jobs
rinpatch [Fri, 22 Mar 2019 22:01:01 +0000 (01:01 +0300)]
Remove postgres from documentation related jobs

5 years agoMerge branch 'hotfix/null-content' into 'develop'
rinpatch [Fri, 22 Mar 2019 21:17:00 +0000 (21:17 +0000)]
Merge branch 'hotfix/null-content' into 'develop'

Fix text being nullable in TwitterAPI

See merge request pleroma/pleroma!966

5 years agoFix text being nullable in TwitterAPI
rinpatch [Fri, 22 Mar 2019 21:10:50 +0000 (00:10 +0300)]
Fix text being nullable in TwitterAPI

5 years agoAdd automatic doc build and deploy
rinpatch [Fri, 22 Mar 2019 20:31:04 +0000 (23:31 +0300)]
Add automatic doc build and deploy

5 years agoMerge branch 'safe-mentions' into 'develop'
lambda [Fri, 22 Mar 2019 11:03:56 +0000 (11:03 +0000)]
Merge branch 'safe-mentions' into 'develop'

NodeInfo: Return safe_dm_mentions feature flag.

See merge request pleroma/pleroma!964

5 years agoNodeInfo: Return safe_dm_mentions feature flag.
lain [Fri, 22 Mar 2019 10:57:20 +0000 (11:57 +0100)]
NodeInfo: Return safe_dm_mentions feature flag.

5 years agoMerge branch 'fix/use-union-all' into 'develop'
kaniini [Fri, 22 Mar 2019 07:00:04 +0000 (07:00 +0000)]
Merge branch 'fix/use-union-all' into 'develop'

Ensure fts is prefered over trigram and use union_all instead of union in user search query

See merge request pleroma/pleroma!963

5 years agoEnsure fts is prefered over trigram and use union_all instead of union in user search...
rinpatch [Fri, 22 Mar 2019 05:39:49 +0000 (08:39 +0300)]
Ensure fts is prefered over trigram and use union_all instead of union in user search query

5 years agoMerge branch 'reports/fix-remote-reporting-emails' into 'develop'
kaniini [Fri, 22 Mar 2019 01:35:54 +0000 (01:35 +0000)]
Merge branch 'reports/fix-remote-reporting-emails' into 'develop'

reports: fix up email generation for remote reports

See merge request pleroma/pleroma!962

5 years agoreports: fix up email generation for remote reports
William Pitcock [Fri, 22 Mar 2019 01:17:14 +0000 (01:17 +0000)]
reports: fix up email generation for remote reports

5 years agoMerge branch 'safe-mentions' into 'develop'
kaniini [Fri, 22 Mar 2019 00:50:24 +0000 (00:50 +0000)]
Merge branch 'safe-mentions' into 'develop'

Add safe dm mode option.

See merge request pleroma/pleroma!958

5 years agoMerge branch 'feature/mastoapi-ext-conversation-id' into 'develop'
kaniini [Fri, 22 Mar 2019 00:25:35 +0000 (00:25 +0000)]
Merge branch 'feature/mastoapi-ext-conversation-id' into 'develop'

Mastodon API: add conversation_id extension

See merge request pleroma/pleroma!961

5 years agotests: fixup
William Pitcock [Thu, 21 Mar 2019 23:37:00 +0000 (23:37 +0000)]
tests: fixup

5 years agodocs: document `conversation_id` extension
William Pitcock [Thu, 21 Mar 2019 23:27:42 +0000 (23:27 +0000)]
docs: document `conversation_id` extension

5 years agomastodon api: add conversation_id extension (ref #674)
William Pitcock [Thu, 21 Mar 2019 23:25:41 +0000 (23:25 +0000)]
mastodon api: add conversation_id extension (ref #674)

5 years agocommon api: move context functions from twitterapi
William Pitcock [Thu, 21 Mar 2019 23:17:53 +0000 (23:17 +0000)]
common api: move context functions from twitterapi