Skip to content

Conversation

pwizla
Copy link
Collaborator

@pwizla pwizla commented Feb 24, 2021

What does it do?

Fix all the conflicts coming from the latest merge with main, get ready for final docs restructuring.

Why is it needed?

Make sure everything is fine for docs restruct.

Related issue(s)/PR(s)

Let us know if this is related to any issue/pull request

adrien-may and others added 30 commits December 21, 2020 17:06
Also added the link that goes to the related guide page.
Add .strapi-updater.json to .gitignore
* Updated the full details in --quickstart flag

The SqLite database is not motioned anywhere in starting line of code with --quickstart.

* coded --quickstart

The quickstart tag was not encoded before its being changed in this one

* Remove extra space

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
Co-authored-by: Andrew Spode <andrew.spode@itech.media>
* Add docs for configurable limit

* Update default maxLimit value

* Add limit to example code

Co-authored-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
* Create sections to differentiate list and edit view configuration

* Write documentation for edit view configuration

* Change file name + links to 'Configuring the views of a content type

* Modify list view configurations to match edit view configurations

* Improve relational fields section in edit view configuration doc

* Delete useless screenshots

* Delete DS_Store file

* Improve after review

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
Just a tiny misspell. Reference: https://dictionary.cambridge.org/dictionary/english/separately

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
For better understanding, I changed "this one" to "it" for clarity
* Add check-md plugin for VuePress

Now you can run `yarn check-links` for a basic output of links issues.

* Exclude '_old' folders when scanning for broken links

* Also add plugin to user-docs folder

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
* Add documentation for overriding responsive image sizing

* Add warning that existing images wont be resized

Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
Co-authored-by: DMehaffy <derrickmehaffy@gmail.com>
pwizla and others added 23 commits February 23, 2021 16:45
Update migration-guide-3.2.5-to-3.3.0.md
Add Microsoft SSO documentation
Remove reference to plugin route prefix disable boolean
Remove unnecessary article "a"
@pwizla pwizla requested review from derrickmehaffy and meganelacheny and removed request for meganelacheny February 24, 2021 16:01
Copy link
Member

@derrickmehaffy derrickmehaffy left a comment

Choose a reason for hiding this comment

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

LGTM, already reviewed the branch :)

@derrickmehaffy derrickmehaffy merged commit 3a4cfe0 into docs_restructuring Feb 24, 2021
@derrickmehaffy derrickmehaffy deleted the merge/piwi2 branch February 24, 2021 16:13
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.