Skip to content

Production hotfix (sidebar) + various updates ahead of 4.4.4 #1206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 191 commits into from
Oct 10, 2022
Merged

Production hotfix (sidebar) + various updates ahead of 4.4.4 #1206

merged 191 commits into from
Oct 10, 2022

Conversation

@pwizla
Copy link
Collaborator

@pwizla pwizla commented Oct 10, 2022

No description provided.

pwizla and others added 30 commits April 12, 2022 09:35
@pwizla
Update core store migration (#801)
d6ab945
@pwizla
Merge branch 'main' into next
9a32465
@stb13579 @pwizla
Typescript documentation (#835)
8ce5149 
* Added TypeScript project structure

* added links to JS files in TS project structure

* Added admin-panel TS config

* Added .ts file paths and TypeScript SQlite database config code snippet

* Add TS server config

* Add middlewares TS config

* Add functions TS config

* Add cron jobs TS config

* Add API TS config

* Add plugins TS config

* Add SSO TS examples

* Add AWS deploy. TS

* Add Azure TS examples

* Add Heroku TS

* Add Caddy TS examples

* Add DO AppPlatform TS

* Add DO droplets TS

* Add GA engine TS

* Add admin custom TS examples

* Add Error Handling TS examples

* Add policies TS examples

* add admin-panel ts config

* add ts config

* add ts config

* add TypeScript to FAQ

* Start dedicated TypeScript page

* Added links to file structure page

* added more project structure ts links

* add TypeScript to sidebar

* add version detail to FAQ

* Add content to TypeScript page

* add ts file path

* fix GitHub .ts code snippet & add Okta js snippet

* Project structure: Reword intro sentence + add link to TS doc

* Project structure: Rename tabs

* Simplify --quickstart callout

* Fix casing

* Rename h1 for TS intro doc

* Fix two → 2 + add link to project structure doc

* Comment out unfinished sections

* Update RBAC with TS

* Update functions config with TS

* Fix AWS TS

* Fix Azure TS

* fix capitalization

* fix lint

* Remove comment

* add ts config

* add ts config

* add ts config

* add ts config

* Restore beta logo

* Comment out yarn setup command

Co-authored-by: Pierre Wizla <pwizla+github@gmail.com>
Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>
@stb13579
add ts config to services
4426e88
@pwizla
Add callout for alpha/beta migration scripts
8c525c9
@pwizla
Revert "Add callout for alpha/beta migration scripts"
f7edbb7 
This reverts commit 8c525c9.

Testing as auto-deploy does not seem to work 🤷
@pwizla
Add callout for alpha/beta migration scripts (#878)
89ee8e5
@stb13579
Typescript phase 2 (#864)
b35f96b 
* lint cleanup

* lint cleanup

* add ts config -controllers

* add ts config --middlewares *check file path*

* add ts config --models

* add ts config --routes

* add ts config --webhooks

* update controllers code example

* update ts config --routes

* remove comments

* ts config code fix --routes

* fix ts config code --services

* fix ts config code examples --routes
@pwizla
Force node
91c5105 
just like on stable docs
@stb13579 @pwizla
update TypeScript dedicated page (#898)
0b96443 
* update TypeScript dedicated page

* fix punctuation

* TypeScript plugin dev updates

* TypeScript plugin dev updates

* improved accessibility

* improved text and table

* added note

* fix grammar

* fixed grammar

* fixed small wording issues

* add span tags to project structure comments

* fixed misc issues

* updated file-structure --ts

* Update docs/developer-docs/latest/development/plugins-development.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/development/plugins-development.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/development/plugins-development.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* updated TypeScript directories and files table

* Update plugin development page

* Update docs/developer-docs/latest/development/plugins-development.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* add link to Strapi Market

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>
@pwizla
Merge branch 'main' into next
b5210ec
@pwizla
Merge branch 'next' of github.com:strapi/documentation into next
57696ee
@pwizla @stb13579
@maevalienard @meganelacheny @gpene @Convly
Release 4.3.0-beta (#934)
23b7b13 
* Media Library and folders documentation (WIP)  (#867)

* Added content

* Added content about plugins

* added png files for plugins

* added more logo png files

* fixed missing file extension

* Revised and added content

* Revised text and table cleanup

* Revised Gatsby preview plugin content

* Add Media library to sidebar

* Add draft of Media Library intro

* Add media library to navbar

* Add media library to TOC

* Switch order of upload asset & create folder

* Create 'adding asset' WIP skeleton

* Move list of supported file types to 'adding assets'

* Create 'folders' section skeleton

* Add "managing assets" to TOC

* Rework a bit "Adding assets"

* Add comments to intro to media lib.

* Add draft/todo for "organizing assets with folders"

* Add "managing assets" skeleton

* Reorganize files and draft structure

* Improve introduction, add sorting & filtering

* Update edit assets structure

* Describe adding folders

* Add note about deep folder hierarchy pitfalls

* Refine introduction

* Complete draft of "organizing assets with folders"

* Add various improvements after a first re-read

* Improve "adding assets"

* Improve "introduction to media library"

* Improve "organizing assets with folders"

* Fix image files

* Add draft for "editing and deleting assets"

* Improve draft on editing assets

* Delete superfluous word in folders description

* Improve further the editing assets section

* Add final draft for editing section

* Rename the "editing" section file

* Remove unnecessary heading cross-linking

* Add screenshot todos

* Rename (bis)

* Make some tiny wording improvements

* Convert alternative instructions for the folder deletion to a note

* Delete strapi-plugins.md

* Re-add original Strapi plugins file

* Replace "Right" w/ "Just"

* Remove some features from the screenshot

* Fix improper grammar: allow to → allow +ing

* Clean up some TODOs

* Move supported media types out of details block and back to "adding assets"

* Clean up one more TODO 😅

* Remove unnecessary link to ML + add link to CM

* Fix wording

* Fix icon name typo

* Move "deleting assets" at end of file

* Add TODO for sorting screenshot

* Fix node engine (should ease Vercel deploy.)

* Remove (again) supported types from intro

* Fix list

* Mention folder names are searchable

* Fix button name for moving assets

* Open folders by single-click

* Replace default location for new sub-folder creation by the active folder

* Fix 1st step of folder edition instructions

* Fix editing folder instructions in note callout

* Mention folders as well in sorting options in intro

* Fix again folder editing instructions 😅

* Fix singular/plural for managing assets intro

* drop-down → button

* Mention batch move

Co-authored-by: Maeva Lienard <54801383+maevalienard@users.noreply.github.com>

* Document Media Library settings

* Add link to Media Library from "Writing content" table

* Update screenshots and text accordingly

* Update wording: folder →  subfolder in deeply nested hierarchy tip.

Co-authored-by: Maeva Lienard <54801383+maevalienard@users.noreply.github.com>

* Rework the sort section (adding screenshot)

* Refine Media Library overview screenshot

* Add SEO tags and remove TODOs

Co-authored-by: Shaun Brown <shaun.brown@strapi.io>
Co-authored-by: Maeva Lienard <54801383+maevalienard@users.noreply.github.com>

* TypeScript additions for release 4.3.0-beta (#935)

* add TypeScript typings

* add alt text

* add raw TS content and code blocks

* Add typings example and misc improvements

* update programmatic use text

* add programmatic examples + other fixes

* Update docs/developer-docs/latest/setup-deployment-guides/typescript.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/typescript.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/typescript.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/typescript.md

Co-authored-by: meganelacheny <megane.lacheny@strapi.io>

* Create dedicated TypeScript page in the Development section

* Improve TypeScript support page (#932)

* Remove TypeScript create section from TypeScript page

* remove Understand Typescript from TypeScript page

* create TypeScript config page

* Edit TypeScript config introduction

* Change title and add links for project, install and config

* Add typescript config page to sidebar

* fix spelling

* delete typings and programmatic content

* Update docs/developer-docs/latest/development/typescript.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* update intro and add callout

* Change table column order

* add link

* Update docs/developer-docs/latest/development/typescript.md

Co-authored-by: meganelacheny <megane.lacheny@strapi.io>

* Move development back to development page

* update top matter

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>
Co-authored-by: meganelacheny <megane.lacheny@strapi.io>

* Improve TypeScript typings subsection (#930)

* Improve TypeScript typings subsection

* Fix grammar

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Fix wording: interfaces → properties

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

* Fix snippet

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

* Fix canonicalUrl SEO tag

* Improve wording

* Fix broken links

* Add "Start Strapi programmatically" subsection (#921)

Co-authored-by: Pierre Wizla <pwizla+github@gmail.com>

Co-authored-by: Shaun Brown <shaun.brown@strapi.io>
Co-authored-by: Shaun Brown <97027841+StrapiShaun@users.noreply.github.com>
Co-authored-by: meganelacheny <megane.lacheny@strapi.io>
Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

* Delete autocomplete GIF

* Bump version number to 4.3.0-beta

* Remove mention to beta docs as we're already in there

* Add warning callout about downgrading and folders (#942)

Co-authored-by: Shaun Brown <shaun.brown@strapi.io>
Co-authored-by: Maeva Lienard <54801383+maevalienard@users.noreply.github.com>
Co-authored-by: Shaun Brown <97027841+StrapiShaun@users.noreply.github.com>
Co-authored-by: meganelacheny <megane.lacheny@strapi.io>
Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
@pwizla
Re-add missing --typescript flag in CLI install. guide
0d0c8da
@pwizla
Add link to TypeScript development docs to CLI installation docs
031e07b
@pwizla
Add missing word 😅
cae479a
@pwizla
Use production logo
2647e7a
@pwizla
Merge branch 'main' into next
d7b496b
@pwizla
Restore beta logo
d9f2553
@pwizla @stb13579 @Convly
typescript programmatic use (#980) (#1010)
f069fc7 
* add project structure link

* revise programmatic use

* Add table for directories and rework explanations

* Fix email documentation that prevented hot reload

* update code block

* Update mixed codebase example

* add note

* rework programmatic content

* rework combined JS + TS programmatic section

* a link for public directory docs

* rework programmatic section

* remove non-TypeScript examples

* remove utils

* fixed compile method

* revert directories code block

* remove content

* edit strapi.compile text and add code example back for this afternoon

* Streamline the content of programmatic sections

* reword `strapi.compile()` 1st sentence

* Update docs/developer-docs/latest/development/typescript.md

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

* Update docs/developer-docs/latest/development/typescript.md

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

* Update docs/developer-docs/latest/development/typescript.md

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

* Update docs/developer-docs/latest/development/typescript.md

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

* remove "install" from yarn install command

* fix yarn and npm commands

* add alternate text idea

* add generate typings

* update generate typings section

* update CLI commands for TS generate typings

* add schema typings callout to models documentation

* clean up writing

* Simplify cross-link wording

* Simplify cross-link wording

* Rename CLI command

* Improve CLI docs: Add flags and remove TypeScript-only note

* Improve rendering of CLI flags documentation

* Add link to CLI docs

* Fix typo + remove parenthesis

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

* Improve wording on CLI

Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>

Co-authored-by: Pierre Wizla <pwizla+github@gmail.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

Co-authored-by: Shaun Brown <97027841+StrapiShaun@users.noreply.github.com>
Co-authored-by: Jean-Sébastien Herbaux <jean-sebastien.herbaux@epitech.eu>
@pwizla
Mention folders in CM (#1009)
680d2b9
@pwizla
Keep official (not beta) logo
2ab2378
@pwizla
Add missing comma
9163f49
@pwizla
Update TS (migration) callout title
a68c2a3
@pwizla
Reword TS callout
11bfae4
@pwizla
Merge branch 'main' into next
c70d932
@pwizla
Merge branch 'main' into next
a90fc31
@pwizla
Bump version number (alpha)
e57c7de
@pwizla
Merge branch 'user/custom-fields' into repo/custom-fields
09aa8c5
@pwizla
Merge branch 'main' into repo/custom-fields
2da106b
paulaxisabel and others added 25 commits October 3, 2022 17:17
@paulaxisabel
Update Code of Conduct
a61a7f8
@stb13579
fix upload code example
a30adc0
@stb13579
Merge pull request #1185 from strapi/dev/upload-fix
8bf68a5 
Fix upload code example
@pwizla @Aurelsicoko
Move search bar to the the left and fix its behavior (#1187)
28893ff 
* Add branding palette

* Add branding stylesheet

* Modify InstallLink component

* Apply system-ui font

* Update logo

* Position the search bar

* Add new search icon

* Apply branding in the results

* Adjust positioning

* Add TODO to fix sidebar behavior

* Fix tablet display

* Fix Algolia search and positioning

* Improve search bar UX

* Add code & links in the search dataset

* Increase importance of h2 titles

* Fix docsearch.config.json

* Fix search bar behavior

Co-authored-by: Aurélien Georget <aurelsicoko@gmail.com>
@pwizla
Merge branch 'main' into next
de9382e
@pwizla
Fix logo and nav
2f1d38d
@stb13579
fix TypeScript code errors
05ee060
@stb13579
Merge pull request #1189 from strapi/dev/sso-fix
cacfaf7 
FIX SSO TypeScript code errors
@stb13579
add github token callout (#1180)
6823684
@stb13579 @pwizla
Revise contributing.md (#1143)
8410d73 
* initial commit

* reword and shorten

* minor text, spacing and punctuation improvements

* minor text improvements

* minor formatting changes

* structure improvements

* Update CONTRIBUTING.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>
@7dir
fix 4.4.1 version (#1176)
11a413d
@arshi-mustafa786 @gpene @pwizla
Update heroku.md (#1075)
d5d5b2c 
* Update heroku.md

I faced this error while following the commands.

* copy edit

* Update formatting (merge with prev. line)

* Update formatting (merge 2 lines)

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>
Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>
@derrickmehaffy @stb13579
@gpene @pwizla
Docker documentation for v4 (#1144)
3cac643 
* Docker documentation for v4

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>

* work on dev/staging

* everything but build, register, deploy

* add references to where to look for docker commands

* move command references to note callouts

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Shaun Brown  <97027841+StrapiShaun@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Shaun Brown  <97027841+StrapiShaun@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Shaun Brown  <97027841+StrapiShaun@users.noreply.github.com>

* pr feedback for prereq

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/snippets/docker-env-table.md

Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/setup-deployment-guides/installation/docker.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* PR feedback

* fix typo

* Tweak some docker-related sentences

Signed-off-by: Derrick Mehaffy <derrickmehaffy@gmail.com>
Co-authored-by: Shaun Brown  <97027841+StrapiShaun@users.noreply.github.com>
Co-authored-by: Gabriel <83644514+gpene@users.noreply.github.com>
Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>
Co-authored-by: Pierre Wizla <pwizla+github@gmail.com>
@Mcastres @pwizla
Add: Custom block section about cloud waitlist (#1192)
7d8928a 
* Add: Custom block section about cloud waitlist

* Remove: Automatic indentation

* Update callout format

Co-authored-by: Pierre Wizla <pwizla+github@gmail.com>
@pwizla
Merge branch 'production'
5a14303
@stb13579
sync db table
7641183
@pwizla
Update package.json
287dd67
@stb13579
Merge pull request #1194 from strapi/dev/cli-db-table
43b329b 
Add min and recommended db versions
@Mcastres
Add: utm_source & campaign in the waitlist cloud link (#1195)
5dbb57b
@pwizla
Merge branch 'production' into main
a8d6de5
@stb13579
Merge pull request #1182 from paulaxisabel/update-coc
50e4567 
Update the Code of Conduct
@petersg83 @pwizla @derrickmehaffy
add page Database migrations (#889)
353c23a 
* add page Database migrations

* Update docs/developer-docs/latest/developer-resources/database-migrations.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/developer-resources/database-migrations.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/developer-resources/database-migrations.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/developer-resources/database-migrations.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/developer-resources/database-migrations.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/developer-resources/database-migrations.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/developer-resources/database-migrations.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* Update docs/developer-docs/latest/developer-resources/database-migrations.md

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>

* add example + remove odd symbols

* apply feedback

* Enhance style and wording for documentation consistency

* add await

* few small pr feedback and fixes

* remove instructions for the down function

* remove dot list

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>
Co-authored-by: Pierre Wizla <pwizla+github@gmail.com>
Co-authored-by: derrickmehaffy <derrickmehaffy@gmail.com>
@pwizla
Remove unnecessary closing syntax in services docs
13683f2
@amincheloh @pwizla
Fix typo in troubleshooting.md (#1200)
e2d5ade 
* Fix typo in troubleshooting.md

* Fix speling

Co-authored-by: Pierre Wizla <pwizla@users.noreply.github.com>
Update nav-links class to prevent overlap on mobile (#1205)
bb3c2a6 
The `nav-links` class positioning causes overlap on mobile, changing to either position: relative or removing that line fixes the problem.
@vercel
Copy link

vercel bot commented Oct 10, 2022

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Updated
documentation ✅ Ready (Inspect) Visit Preview Oct 10, 2022 at 9:11AM (UTC)

@pwizla pwizla self-assigned this Oct 10, 2022
@strapi-cla
Copy link

strapi-cla commented Oct 10, 2022 •
edited
Loading

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
18 out of 23 committers have signed the CLA.

✅ pwizla
✅ stb13579
✅ tpimh
✅ petersg83
✅ vivekout
✅ gpene
✅ jizusun
✅ biko8
✅ habil
✅ amincheloh
✅ Shubhdeep12
✅ romash1408
✅ QuentinLeCaignec
✅ Mcastres
✅ paulaxisabel
✅ levipettersen
✅ derrickmehaffy
✅ hayelomt
❌ Aurelsicoko
❌ mikehaertl
❌ kiabq
❌ arshi-mustafa786
❌ 7dir

kiabq seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
You have signed the CLA already but the status is still pending? Let us recheck it.

@pwizla pwizla added the internal PRs created by the Strapi core team label Oct 10, 2022
@pwizla pwizla merged commit c0fffe8 into production Oct 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@pwizla pwizla

Labels

internal PRs created by the Strapi core team

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.