GitLab

[Master] Release/2020 03 12

revert gui to previous version

Fix contact-us mistakes

- take captcha off the helpform url
- use encodeUriComponent to make sure semicolons in the agent string don’t mess up the form parameters
- take the `$` end matcher off the route to allow for parameters to be passed
- fix forum links
- fix faq link `/faq` => `/info/faq`

[Master] hotfix/scratch desktop 3.9.0

[Develop] hotfix/scratch desktop 3.9.0

Merge develop into the release branch.

Update scratch-gui to the latest version 🚀

Greenkeeper/scratch gui 0.1.0 prerelease.20200310205953

Closes #3739

Add new Contact Us information page

* With Carl decided to put the sidebar back even with just one item. It’s still one we want to emphasize.
* made sure the freshdesk js file would not block loading the form (it doesn’t appear to be needed for the form, it’s probably mainly for the pop-up version)
* moved the query processing into a constructor (more idomatic react)
* expanded the form so it should not need to scroll - also noted that in incognito mode a captcha is shown, so created enough space for that to be visible.

Scratchr2 has links to contact us from the report (profile|studio) dialogs. Looking at the scratchr2 source, there’s also one for confirmations, so this change handles the additional details in the same way - in the subject and description. In the future we could consider pre-filling specific form fields that we define.

[Develop] Release for 2020-03-03

[Master] Release for 2020-03-03

Merge develop to release branch

Bump scratch-gui for release

Decided that there is no need for the Nav sidebar since we don’t want the link to the Discussions right now. It could come back if we add the knowledge base.

[Develop] Split out message about conference registration delay

[Master] Split out message about conference registration delay

[Develop] Reduce report prominence

[Master] hotfix reduce report prominence

[Develop] Update conference page to open registration

[Master] Update conference page to open registration

Using the Freshdesk Feedback form
* adds new component HelpForm for the Freshdesk component
* adds new contact-us view
* modifies Information page css with style for a header on the right hand nav section
* adds new route for the contact-us page (is identical to the old scratchr2 URL)

The strings will get updated, even if the id persists.

Nice catch @adroitwhiz :)

pull in revert scratch render