lain [Mon, 8 Apr 2019 12:10:43 +0000 (14:10 +0200)]
Merge branch 'features/mastoapi/2.6.0-conversations' of git.pleroma.social:pleroma/pleroma into features/mastoapi/2.6.0-conversations
Ivan Tashkinov [Tue, 2 Apr 2019 06:19:10 +0000 (09:19 +0300)]
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
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
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
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
Karen Konou [Mon, 1 Apr 2019 16:02:58 +0000 (18:02 +0200)]
Fix dead links and add note about new docs site
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
Mark Felder [Sun, 31 Mar 2019 22:46:17 +0000 (17:46 -0500)]
Add default mail adapter settings to config
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
lain [Mon, 25 Mar 2019 12:37:32 +0000 (13:37 +0100)]
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
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
Austin Lanari [Sun, 24 Mar 2019 18:32:09 +0000 (11:32 -0700)]
add overriding truncated_namespace condition for truncating paths for digital ocean
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
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
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
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
rinpatch [Sat, 23 Mar 2019 07:19:13 +0000 (10:19 +0300)]
Remove useless echo
William Pitcock [Sat, 23 Mar 2019 03:16:50 +0000 (03:16 +0000)]
tests: fix up activity collision test
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
William Pitcock [Sat, 23 Mar 2019 03:04:42 +0000 (03:04 +0000)]
user: use preloads when deleting accounts
William Pitcock [Sat, 23 Mar 2019 03:03:06 +0000 (03:03 +0000)]
ostatus: use preload objects with Object.normalize() when opportunistic
William Pitcock [Sat, 23 Mar 2019 03:00:04 +0000 (03:00 +0000)]
object: downgrade normalize warning to debug severity
William Pitcock [Sat, 23 Mar 2019 02:49:40 +0000 (02:49 +0000)]
activitypub: object view: use preloaded object when possible
William Pitcock [Sat, 23 Mar 2019 02:49:10 +0000 (02:49 +0000)]
activity: add get_by_ap_id_with_object()
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
William Pitcock [Sat, 23 Mar 2019 02:30:53 +0000 (02:30 +0000)]
notification: formatting
William Pitcock [Sat, 23 Mar 2019 02:27:52 +0000 (02:27 +0000)]
streamer: use the preloaded object if possible
William Pitcock [Sat, 23 Mar 2019 02:26:49 +0000 (02:26 +0000)]
rich media: helpers: only crawl Create activities
William Pitcock [Sat, 23 Mar 2019 02:19:34 +0000 (02:19 +0000)]
notification: preload child objects
William Pitcock [Sat, 23 Mar 2019 01:33:41 +0000 (01:33 +0000)]
relay: use preloaded object since we always have it
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)
William Pitcock [Sat, 23 Mar 2019 01:17:26 +0000 (01:17 +0000)]
ostatus: fetch preloaded object in note handler for testsuite
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)
William Pitcock [Sat, 23 Mar 2019 00:53:35 +0000 (00:53 +0000)]
activitypub: add missing with_preloaded_object()
William Pitcock [Sat, 23 Mar 2019 00:40:08 +0000 (00:40 +0000)]
activitypub: splice in the child object if we have one
William Pitcock [Sat, 23 Mar 2019 00:28:16 +0000 (00:28 +0000)]
formatting
William Pitcock [Sat, 23 Mar 2019 00:24:23 +0000 (00:24 +0000)]
activity: fix credo nitpick
William Pitcock [Sat, 23 Mar 2019 00:22:57 +0000 (00:22 +0000)]
rich media: use optimized Object.normalize()
William Pitcock [Sat, 23 Mar 2019 00:22:14 +0000 (00:22 +0000)]
common api: use the optimized Object.normalize whenever possible
William Pitcock [Sat, 23 Mar 2019 00:10:17 +0000 (00:10 +0000)]
activitypub: preload child objects when fetching timelines
William Pitcock [Sat, 23 Mar 2019 00:09:56 +0000 (00:09 +0000)]
activity: add with_preloaded_object() convenience
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
rinpatch [Fri, 22 Mar 2019 22:01:01 +0000 (01:01 +0300)]
Remove postgres from documentation related jobs
projects / akkoma / log