lain [Tue, 2 Apr 2019 14:10:38 +0000 (16:10 +0200)]
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
lain [Tue, 2 Apr 2019 14:04:18 +0000 (16:04 +0200)]
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
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
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
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
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
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
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
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
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
cascode [Tue, 2 Apr 2019 10:51:33 +0000 (10:51 +0000)]
Fix account lookup for nicknames beginning with numbers
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)`
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)`
Ivan Tashkinov [Tue, 2 Apr 2019 10:43:33 +0000 (13:43 +0300)]
Added "GET /oauth/authorize" 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
Egor Kislitsyn [Tue, 2 Apr 2019 10:01:26 +0000 (17:01 +0700)]
change `Repo.get(User, id)` => `User.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)`
Egor Kislitsyn [Tue, 2 Apr 2019 09:30:11 +0000 (16:30 +0700)]
add `user delete_activities` mix task
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
Egor Kislitsyn [Tue, 2 Apr 2019 08:41:30 +0000 (15:41 +0700)]
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
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
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
rinpatch [Tue, 2 Apr 2019 06:07:58 +0000 (09:07 +0300)]
what the fuck
rinpatch [Tue, 2 Apr 2019 06:02:21 +0000 (09:02 +0300)]
huh
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
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
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
Haelwenn (lanodan) Monnier [Mon, 1 Apr 2019 23:53:25 +0000 (01:53 +0200)]
router: Add fake identity proof endpoint
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
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
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
Haelwenn (lanodan) Monnier [Mon, 1 Apr 2019 16:34:53 +0000 (18:34 +0200)]
COPYING: Wording
[ci skip]
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
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
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
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
Karen Konou [Mon, 1 Apr 2019 16:13:42 +0000 (18:13 +0200)]
Link to docs page instead of to clients.md
Haelwenn (lanodan) Monnier [Mon, 1 Apr 2019 16:13:13 +0000 (18:13 +0200)]
COPYING: wrap to 79, city.jpg Unsplash, wording
[ci skip]
Karen Konou [Mon, 1 Apr 2019 16:02:58 +0000 (18:02 +0200)]
Fix dead links and add note about new docs site
Ivan Tashkinov [Mon, 1 Apr 2019 14:25:25 +0000 (17:25 +0300)]
Fixed local MastoFE authentication / `force_login` option.
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
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
rinpatch [Mon, 1 Apr 2019 13:22:12 +0000 (16:22 +0300)]
change bold text to be proper geadings in introduction.md
rinpatch [Mon, 1 Apr 2019 13:10:47 +0000 (16:10 +0300)]
Fix backup/restore page to have proper headings
Ivan Tashkinov [Mon, 1 Apr 2019 11:46:50 +0000 (14:46 +0300)]
Added `force_login` authentication option (previously applied by default).
Haelwenn (lanodan) Monnier [Mon, 1 Apr 2019 00:15:14 +0000 (02:15 +0200)]
COPYING: Add copyright notice for the finmojis
[ci skip]
Mark Felder [Sun, 31 Mar 2019 22:46:17 +0000 (17:46 -0500)]
Add default mail adapter settings to config
Haelwenn (lanodan) Monnier [Sun, 31 Mar 2019 22:32:00 +0000 (00:32 +0200)]
COPYING: Add copyright notice for the whole repository
[ci skip]
Haelwenn (lanodan) Monnier [Sun, 31 Mar 2019 22:31:21 +0000 (00:31 +0200)]
LICENSE → AGPL-3
[ci skip]
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]
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
rinpatch [Fri, 29 Mar 2019 13:38:18 +0000 (16:38 +0300)]
qs
rinpatch [Fri, 29 Mar 2019 13:11:22 +0000 (16:11 +0300)]
Improve PleromaJobQeue config documentation
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
Egor [Fri, 29 Mar 2019 12:46:05 +0000 (12:46 +0000)]
Replace Pleroma.Jobs with `pleroma_job_queue`
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
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
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
Haelwenn (lanodan) Monnier [Fri, 29 Mar 2019 00:57:02 +0000 (01:57 +0100)]
Revert awfully long migration from
568e34858
rinpatch [Thu, 28 Mar 2019 17:29:46 +0000 (20:29 +0300)]
Remove duplicated header from i2p.md
rinpatch [Thu, 28 Mar 2019 17:27:01 +0000 (20:27 +0300)]
did it really take me 4 commits to fix this?
rinpatch [Thu, 28 Mar 2019 17:16:59 +0000 (20:16 +0300)]
Remove duplicated header from admin_api.md
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
rinpatch [Thu, 28 Mar 2019 17:13:22 +0000 (20:13 +0300)]
cringe
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
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
eugenijm [Wed, 27 Mar 2019 18:19:00 +0000 (21:19 +0300)]
Add user show endpoint for Pleroma admin API
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
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
rinpatch [Wed, 27 Mar 2019 10:43:43 +0000 (13:43 +0300)]
Fix muting reblogs tests
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
rinpatch [Wed, 27 Mar 2019 09:28:53 +0000 (12:28 +0300)]
Fix missing announces in MastoAPI home timeline
Closes #762
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
Maxim Filippov [Tue, 26 Mar 2019 22:51:59 +0000 (03:51 +0500)]
Add more user filters + move search to its own module
eugenijm [Tue, 26 Mar 2019 20:21:31 +0000 (23:21 +0300)]
Add vapid_key to the `POST /api/v1/apps` response
eugenijm [Tue, 26 Mar 2019 18:42:03 +0000 (21:42 +0300)]
Add GET /api/v1/apps/verify_credentials
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
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
lain [Tue, 26 Mar 2019 15:40:09 +0000 (16:40 +0100)]
AP UserView: Refactor banner / avatar display code, add test.
Ivan Tashkinov [Tue, 26 Mar 2019 15:18:36 +0000 (18:18 +0300)]
Test for MastoAPI /api/v1/instance response structure (formatting fix).
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
Ivan Tashkinov [Tue, 26 Mar 2019 15:13:24 +0000 (18:13 +0300)]
Test for MastoAPI /api/v1/instance response structure.
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
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
rinpatch [Tue, 26 Mar 2019 14:35:45 +0000 (17:35 +0300)]
Credo is upset about me not remembering the alphabet
rinpatch [Tue, 26 Mar 2019 14:18:18 +0000 (17:18 +0300)]
Fix formatting
rinpatch [Tue, 26 Mar 2019 14:16:21 +0000 (17:16 +0300)]
Remove ActivityRepresenter
Ivan Tashkinov [Tue, 26 Mar 2019 13:27:17 +0000 (16:27 +0300)]
Mastodon 2.7.2 instance attributes (registrations, languages).
eugenijm [Mon, 25 Mar 2019 17:21:48 +0000 (20:21 +0300)]
Increment replies_count on replies (MastoAPI)
Ivan Tashkinov [Tue, 26 Mar 2019 12:24:29 +0000 (15:24 +0300)]
Comments split.
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`.
Mark Felder [Tue, 26 Mar 2019 00:00:35 +0000 (19:00 -0500)]
Try sending an empty map
Mark Felder [Mon, 25 Mar 2019 23:47:04 +0000 (18:47 -0500)]
Attempt to fix incorrect federation of default instance avatars
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
rinpatch [Mon, 25 Mar 2019 18:59:52 +0000 (21:59 +0300)]
Add an id index to notifications
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
William Pitcock [Mon, 25 Mar 2019 03:32:19 +0000 (03:32 +0000)]
fix up missing announcements with preloads
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
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
rinpatch [Sun, 24 Mar 2019 23:15:45 +0000 (02:15 +0300)]
Serve non-public activities in /api/v1/favourites
Fixes #648
projects / akkoma / log