Skip to content

Add Plugin Labels and Prepackaged Plugin Info#3395

Merged
amyblais merged 9 commits intomasterfrom
aaronrothschild-patch-2
Apr 6, 2020
Merged

Add Plugin Labels and Prepackaged Plugin Info#3395
amyblais merged 9 commits intomasterfrom
aaronrothschild-patch-2

Conversation

@aaronrothschild
Copy link
Copy Markdown
Contributor

@aaronrothschild aaronrothschild commented Feb 14, 2020

  • Added Section for Plugin Labels describing them
  • pre-packaged plugins can now be removed from the system console
  • pre-packaged plugins are automatically installed only if enabled: this means some plugins might "disappear" on upgrade
  • pre-packaged plugins can be installed from the marketplace, even when offline

@aaronrothschild aaronrothschild added 1: Dev Review Requires review by a core commiter 2: Editor Review Requires review by an editor labels Feb 14, 2020
@aaronrothschild aaronrothschild self-assigned this Feb 14, 2020
@aaronrothschild aaronrothschild added this to the v5.20 milestone Feb 14, 2020
Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
@aaronrothschild
Copy link
Copy Markdown
Contributor Author

Incorporated @lieut-data 's suggestions. Going to publish Labels text later.

@amyblais amyblais added 3: Reviews Complete All reviewers have approved the pull request and removed 2: Editor Review Requires review by an editor labels Feb 14, 2020
@amyblais
Copy link
Copy Markdown
Member

Merging v5.20 docs into master.

@amyblais amyblais removed the 3: Reviews Complete All reviewers have approved the pull request label Feb 14, 2020
@amyblais amyblais changed the base branch from v5.20-documentation to master February 14, 2020 22:12
@amyblais
Copy link
Copy Markdown
Member

@aaronrothschild I had to change the branch to master because I needed to merge v5.20 docs into master. It seems some extra commits got added to this PR because of it. Sorry about that. I can help re-submit this PR if you don't have time.

@amyblais amyblais added the Awaiting Submitter Action Blocked on the author label Feb 17, 2020
Copy link
Copy Markdown
Member

@lieut-data lieut-data left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing from my review plate until rebase completed.

@aaronrothschild
Copy link
Copy Markdown
Contributor Author

@amyblais I'm not really sure what to do to get those commits out and don't want to screw anything up ;) . What do I need to do?

@amyblais
Copy link
Copy Markdown
Member

You can re-submit the PR @aaronrothschild

@lieut-data lieut-data force-pushed the aaronrothschild-patch-2 branch from 81cc902 to ca836c2 Compare February 28, 2020 15:42
@lieut-data
Copy link
Copy Markdown
Member

@aaronrothschild / @amyblais, I've rebased this on top of master to eliminate the duplicate commits. Let me know if that looks good!

@amyblais
Copy link
Copy Markdown
Member

Looks good.

@amyblais amyblais removed the Awaiting Submitter Action Blocked on the author label Feb 28, 2020
Comment thread source/administration/plugins.rst Outdated
Co-Authored-By: Amy Blais <amy_blais@hotmail.com>
Copy link
Copy Markdown
Member

@lieut-data lieut-data left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few suggestions below -- thanks @aaronrothschild!

Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
Comment thread source/administration/plugins.rst Outdated
justinegeffen and others added 4 commits April 6, 2020 14:32
Co-Authored-By: Jesse Hallam <jesse.hallam@gmail.com>
Co-Authored-By: Jesse Hallam <jesse.hallam@gmail.com>
Co-Authored-By: Jesse Hallam <jesse.hallam@gmail.com>
Stylistic changes: Updated headings in line with new style guide, and fixed erroneous prepackaged to pre-packaged.
@lieut-data lieut-data requested a review from hanzei April 6, 2020 12:44
@lieut-data lieut-data dismissed their stale review April 6, 2020 12:44

Dismissing my own review in favour of getting @hanzei's eyes on this.

@lieut-data lieut-data removed the request for review from alifarooq0 April 6, 2020 12:44
Copy link
Copy Markdown
Contributor

@hanzei hanzei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGMT 👍

@hanzei hanzei requested a review from amyblais April 6, 2020 15:27
@hanzei hanzei added 2: Editor Review Requires review by an editor and removed 1: Dev Review Requires review by a core commiter labels Apr 6, 2020
Comment thread source/administration/plugins.rst Outdated
@amyblais amyblais added 3: Reviews Complete All reviewers have approved the pull request and removed 2: Editor Review Requires review by an editor labels Apr 6, 2020
@amyblais amyblais merged commit 3fbc001 into master Apr 6, 2020
@amyblais amyblais deleted the aaronrothschild-patch-2 branch April 6, 2020 16:11
justinegeffen pushed a commit that referenced this pull request Apr 6, 2020
* master:
  Add Plugin Labels and Prepackaged Plugin Info (#3395)
  Adding NPS rating for docs pages (#3469)
  Fix broken link in Bot Account Creation > Plugin (#3493)

# Conflicts:
#	source/myscript.js
justinegeffen pushed a commit that referenced this pull request Apr 8, 2020
…/docs into justinegeffen-patch-7

* 'justinegeffen-patch-7' of https://github.com/mattermost/docs: (90 commits)
  Update integrations.rst
  Remove Oracle from Bitnami packages (#3491)
  Revert "Adding NPS rating for docs pages (#3469)" (#3495)
  Add Plugin Labels and Prepackaged Plugin Info (#3395)
  Adding NPS rating for docs pages (#3469)
  Fix broken link in Bot Account Creation > Plugin (#3493)
  Added Let's Encrypt clarification  (#2866)
  Update security.rst (#3434)
  Update sg_grammar-spelling-mechanics.rst (#3462)
  Update training.rst (#3485)
  Update release-faq.rst (#3484)
  Documenting how to change the default docker-compose network (#3480)
  Fixes GH-542-Moved : Request for Documentation: Add to interactive-messages documentation (#3482)
  Correct Code Block Formatting (#3477)
  Update mmctl-cli-tool.rst (#3481)
  FAQ on Archived Channels and data retention (#3470)
  Update desktop-changelog.rst (#3473)
  Update desktop-changelog.rst (#3471)
  Added Video to AD/LDAP Group Sync (#3450)
  Hint to `"skip_slack_parsing"` to ignore Slack-compatibility logic (#3427)
  ...

# Conflicts:
#	source/install/troubleshooting.rst
@amyblais amyblais removed the 3: Reviews Complete All reviewers have approved the pull request label Apr 13, 2020
@hanzei hanzei mentioned this pull request Apr 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants