akkoma
5 years agoMerge branch 'feature/fake-statuses' into 'develop'
lambda [Tue, 2 Apr 2019 14:17:43 +0000 (14:17 +0000)]
Merge branch 'feature/fake-statuses' into 'develop'

Add fake status submit

See merge request pleroma/pleroma!995

5 years agoMerge branch 'bugfix/share-mastodon' into 'develop'
lambda [Tue, 2 Apr 2019 12:47:40 +0000 (12:47 +0000)]
Merge branch 'bugfix/share-mastodon' into 'develop'

[OStatus] adds status to pleroma instance if the url given is a status

See merge request pleroma/pleroma!1002

5 years agoMerge branch 'remove-user-activities' into 'develop'
lambda [Tue, 2 Apr 2019 12:45:29 +0000 (12:45 +0000)]
Merge branch 'remove-user-activities' into 'develop'

[#757] Add mix task to delete user's activities

See merge request pleroma/pleroma!1008

5 years agoMerge branch 'get_by_id' into 'develop'
lambda [Tue, 2 Apr 2019 12:43:28 +0000 (12:43 +0000)]
Merge branch 'get_by_id' into 'develop'

Replace `Repo.get_by` with existing functions

See merge request pleroma/pleroma!1010

5 years agoMerge branch 'features/pleroma-tan' into 'develop'
lambda [Tue, 2 Apr 2019 11:54:04 +0000 (11:54 +0000)]
Merge branch 'features/pleroma-tan' into 'develop'

priv/static/images: Add pleroma-tan

See merge request pleroma/pleroma!913

5 years agoRename fake param to preview and make the tests check that the object was not inserte...
rinpatch [Tue, 2 Apr 2019 11:31:18 +0000 (14:31 +0300)]
Rename fake param to preview and make the tests check that the object was not inserted to the db

5 years agoreplace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname...
Egor Kislitsyn [Tue, 2 Apr 2019 10:58:32 +0000 (17:58 +0700)]
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests

5 years agoMerge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
lambda [Tue, 2 Apr 2019 10:57:38 +0000 (10:57 +0000)]
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'

MastoAPI 2.6.0 `force_login` option

Closes #734

See merge request pleroma/pleroma!999

5 years agoMerge branch 'get_by_id' into 'develop'
lambda [Tue, 2 Apr 2019 10:52:29 +0000 (10:52 +0000)]
Merge branch 'get_by_id' into 'develop'

Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible

See merge request pleroma/pleroma!1009

5 years agoMerge branch 'fix/nicknames-beginning-with-numbers' into 'develop'
lambda [Tue, 2 Apr 2019 10:51:33 +0000 (10:51 +0000)]
Merge branch 'fix/nicknames-beginning-with-numbers' into 'develop'

Fix account lookup for nicknames beginning with numbers

See merge request pleroma/pleroma!1003

5 years agoFix account lookup for nicknames beginning with numbers
cascode [Tue, 2 Apr 2019 10:51:33 +0000 (10:51 +0000)]
Fix account lookup for nicknames beginning with numbers

5 years agoreplace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
Egor Kislitsyn [Tue, 2 Apr 2019 10:47:52 +0000 (17:47 +0700)]
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`

5 years agoreplace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`
Egor Kislitsyn [Tue, 2 Apr 2019 10:47:02 +0000 (17:47 +0700)]
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)`

5 years agoAdded "GET /oauth/authorize" tests.
Ivan Tashkinov [Tue, 2 Apr 2019 10:43:33 +0000 (13:43 +0300)]
Added "GET /oauth/authorize" tests.

5 years agochange `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
Egor Kislitsyn [Tue, 2 Apr 2019 10:08:03 +0000 (17:08 +0700)]
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests

5 years agochange `Repo.get(User, id)` => `User.get_by_id(id)`
Egor Kislitsyn [Tue, 2 Apr 2019 10:01:26 +0000 (17:01 +0700)]
change `Repo.get(User, id)` => `User.get_by_id(id)`

5 years agochange `Repo.get(Activity, id)` => `Activity.get_by_id(id)`
Egor Kislitsyn [Tue, 2 Apr 2019 09:50:31 +0000 (16:50 +0700)]
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)`

5 years agoadd `user delete_activities` mix task
Egor Kislitsyn [Tue, 2 Apr 2019 09:30:11 +0000 (16:30 +0700)]
add `user delete_activities` mix task

5 years agoMerge branch 'ci-speedup-2-electric-boogalo' into 'develop'
lambda [Tue, 2 Apr 2019 08:50:47 +0000 (08:50 +0000)]
Merge branch 'ci-speedup-2-electric-boogalo' into 'develop'

CI speedup: split into proper stages to benefit from parallel execution

See merge request pleroma/pleroma!1007

5 years agoMerge remote-tracking branch 'pleroma/develop' into remove-user-activities
Egor Kislitsyn [Tue, 2 Apr 2019 08:41:30 +0000 (15:41 +0700)]
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities

5 years agoadd support for all status type (ostatus) and replase case with if
Sachin Joshi [Tue, 2 Apr 2019 06:30:41 +0000 (12:15 +0545)]
add support for all status type (ostatus) and replase case with if

5 years agoremove reduntant services in docs deploy and change job names to kebab case
rinpatch [Tue, 2 Apr 2019 06:13:34 +0000 (09:13 +0300)]
remove reduntant services in docs deploy and change job names to kebab case

5 years agowhat the fuck
rinpatch [Tue, 2 Apr 2019 06:07:58 +0000 (09:07 +0300)]
what the fuck

5 years agohuh
rinpatch [Tue, 2 Apr 2019 06:02:21 +0000 (09:02 +0300)]
huh

5 years agoSeparate CI jobs to 3 stages to allow them to be executed in parallel
rinpatch [Tue, 2 Apr 2019 05:58:09 +0000 (08:58 +0300)]
Separate CI jobs to 3 stages to allow them to be executed in parallel

5 years agoMerge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'
rinpatch [Tue, 2 Apr 2019 05:31:41 +0000 (05:31 +0000)]
Merge branch 'bugfix/mastoapi/2.8.0-fake_identityproof' into 'develop'

router: Add fake identity proof endpoint

See merge request pleroma/pleroma!1006

5 years agofetch url for OStatus to know if it is a/c or status
Sachin Joshi [Tue, 2 Apr 2019 04:41:09 +0000 (10:26 +0545)]
fetch url for OStatus to know if it is a/c or status

5 years agorouter: Add fake identity proof endpoint
Haelwenn (lanodan) Monnier [Mon, 1 Apr 2019 23:53:25 +0000 (01:53 +0200)]
router: Add fake identity proof endpoint

5 years agoMerge branch 'fix/default-mail-adapter' into 'develop'
lambda [Mon, 1 Apr 2019 21:47:40 +0000 (21:47 +0000)]
Merge branch 'fix/default-mail-adapter' into 'develop'

Add default mail adapter settings to config

See merge request pleroma/pleroma!994

5 years agoMerge branch 'documentation-improvements' into 'develop'
lambda [Mon, 1 Apr 2019 21:20:11 +0000 (21:20 +0000)]
Merge branch 'documentation-improvements' into 'develop'

Small documentation improvements

See merge request pleroma/pleroma!1001

5 years ago[OStatus] adds status to pleroma instance if the url given is a status
Sachin Joshi [Mon, 1 Apr 2019 16:27:02 +0000 (22:12 +0545)]
[OStatus] adds status to pleroma instance if the url given is a status

5 years agoCOPYING: Wording
Haelwenn (lanodan) Monnier [Mon, 1 Apr 2019 16:34:53 +0000 (18:34 +0200)]
COPYING: Wording

[ci skip]

5 years agoupdate mastodon api link in README to point to a non-outdated docs
rinpatch [Mon, 1 Apr 2019 16:27:40 +0000 (19:27 +0300)]
update mastodon api link in README to point to a non-outdated docs

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 agoMake only important note bold rather than the whole paragraph because it looks better...
rinpatch [Mon, 1 Apr 2019 16:24:50 +0000 (19:24 +0300)]
Make only important note bold rather than the whole paragraph because it looks better that way

5 years agoRemove outdated howto change config and port and move it to config.md instead
rinpatch [Mon, 1 Apr 2019 16:19:06 +0000 (19:19 +0300)]
Remove outdated howto change config and port and move it to config.md instead

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 agoCOPYING: wrap to 79, city.jpg Unsplash, wording
Haelwenn (lanodan) Monnier [Mon, 1 Apr 2019 16:13:13 +0000 (18:13 +0200)]
COPYING: wrap to 79, city.jpg Unsplash, wording

[ci skip]

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 agoFixed local MastoFE authentication / `force_login` option.
Ivan Tashkinov [Mon, 1 Apr 2019 14:25:25 +0000 (17:25 +0300)]
Fixed local MastoFE authentication / `force_login` option.

5 years agorestart makes no sense here as we instructed to stop the service before
rinpatch [Mon, 1 Apr 2019 13:26:46 +0000 (16:26 +0300)]
restart makes no sense here as we instructed to stop the service before

5 years agoInstruct to stop the service only after git pulling and getting deps to minimize...
rinpatch [Mon, 1 Apr 2019 13:23:32 +0000 (16:23 +0300)]
Instruct to stop the service only after git pulling and getting deps to minimize downtimes

5 years agochange bold text to be proper geadings in introduction.md
rinpatch [Mon, 1 Apr 2019 13:22:12 +0000 (16:22 +0300)]
change bold text to be proper geadings in introduction.md

5 years agoFix backup/restore page to have proper headings
rinpatch [Mon, 1 Apr 2019 13:10:47 +0000 (16:10 +0300)]
Fix backup/restore page to have proper headings

5 years agoAdded `force_login` authentication option (previously applied by default).
Ivan Tashkinov [Mon, 1 Apr 2019 11:46:50 +0000 (14:46 +0300)]
Added `force_login` authentication option (previously applied by default).

5 years agoMove putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
rinpatch [Mon, 1 Apr 2019 09:25:53 +0000 (12:25 +0300)]
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex

5 years agoinsert object defaults for fake activities and make credo happy
rinpatch [Mon, 1 Apr 2019 09:16:51 +0000 (12:16 +0300)]
insert object defaults for fake activities and make credo happy

5 years agooof
rinpatch [Mon, 1 Apr 2019 08:58:08 +0000 (11:58 +0300)]
oof

5 years agoFix the issue with HTML scrubber
rinpatch [Mon, 1 Apr 2019 08:55:59 +0000 (11:55 +0300)]
Fix the issue with HTML scrubber

5 years agoCOPYING: Add copyright notice for the finmojis
Haelwenn (lanodan) Monnier [Mon, 1 Apr 2019 00:15:14 +0000 (02:15 +0200)]
COPYING: Add copyright notice for the finmojis

[ci skip]

5 years agoAdd default mail adapter settings to config
Mark Felder [Sun, 31 Mar 2019 22:46:17 +0000 (17:46 -0500)]
Add default mail adapter settings to config

5 years agoCOPYING: Add copyright notice for the whole repository
Haelwenn (lanodan) Monnier [Sun, 31 Mar 2019 22:32:00 +0000 (00:32 +0200)]
COPYING: Add copyright notice for the whole repository

[ci skip]

5 years agoLICENSE → AGPL-3
Haelwenn (lanodan) Monnier [Sun, 31 Mar 2019 22:31:21 +0000 (00:31 +0200)]
LICENSE → AGPL-3

[ci skip]

5 years agoCC-BY-SA-4.0: Add a copy of the CC-BY-SA-4.0 license
Haelwenn (lanodan) Monnier [Sun, 31 Mar 2019 22:30:21 +0000 (00:30 +0200)]
CC-BY-SA-4.0: Add a copy of the CC-BY-SA-4.0 license

[ci skip]

5 years agoAdd a fake option to lazy_put_actvity_defaults
rinpatch [Sat, 30 Mar 2019 10:57:54 +0000 (13:57 +0300)]
Add a fake option to lazy_put_actvity_defaults

5 years agodocument fake option
rinpatch [Fri, 29 Mar 2019 19:15:20 +0000 (22:15 +0300)]
document fake option

5 years agoImplement fake status submit
rinpatch [Fri, 29 Mar 2019 18:59:04 +0000 (21:59 +0300)]
Implement fake status submit

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