Skip to content
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.

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

Conflict resolution #470

Merged
merged 34 commits into from
Apr 4, 2022
Merged

Conflict resolution #470

merged 34 commits into from
Apr 4, 2022

Conversation

pema-s
Copy link
Contributor

@pema-s pema-s commented Apr 4, 2022

Type of Pull Request

Check all applicable

  • 🎉 Feature Enhancement
  • 🐛 Bug Fix
  • 📖 Documentation Update
  • ❇️ Other

Description

Describe the changes made in the PR.

Issue

Provide the details of the issue / attach the issue link.

amritesh-singh and others added 30 commits March 10, 2022 15:25
…422)

* DC-307

* added forward slash for every slug of the file
* Fix redirects.

* Fix staging build.
* DC-88

* Update reference.md
* change for exp branch

* merge-docs-v1 added for build to workflow

* changes for dev and prod dispatch events

* Testing changes

* DC-286 Added snippet for stopping connection in sample

Co-authored-by: harshad-symbl <[email protected]>
Co-authored-by: Adam Voliva <[email protected]>
Co-authored-by: amritesh-singh <[email protected]>
* DC-357

Adds enable all trackers + splits docs into logical buckets

* added more content

* Adds more changes
* DC-307

* added forward slash for every slug of the file

* '/' added to slug of changelog for topbar

* Added slugs for pages on sidebar of landing page

* slugs for links on sidebars for API reference

* slugs for links on sidebars for Tutorials, No Updates for SDKs

* Adds changes to Labs topics + updates changelog

Co-authored-by: pema-s <[email protected]>
* DC-209 Consolidated two trackers with streaming api tutorials

* removed trailing white-space
#431)

* DC-225 Further explanation for the  and  parameters

* Improved wording
* DC-356

* DC-356

* DC-356

Co-authored-by: Pema <[email protected]>
* slugs added/updated as per DC-307

* updated id from `text-summary-ui` to `summary-ui`

* removed redirects, due to using urls for the same version, causing build errors

* Some incorrect changes with the last commit resolved
* DC-149

* DC-149
* DC-360

* DC-360
* Updated the default routing for all the topbar links

* fix: Active highlighting bug fixed, by hardcoding the slugs on regex

* Handled for `/async-api/introduction` and `/async-api/reference`

* corrects missing pages

* change made on the stagging config for active links

Co-authored-by: pema-s <[email protected]>
* update ui cards

* Makes dark mode default

Co-authored-by: Kush Vora <[email protected]>
amritesh-singh and others added 4 commits March 31, 2022 19:52
* DC-358

* DC-361

* Revert "DC-361"

This reverts commit 06086ab.

* DC-361

* DC-361
Adds bug fixes
* DC-381, DC-382

Adds bug fixes

* DC-129, DC-372
@pema-s pema-s requested a review from kushv16 April 4, 2022 16:03
Copy link
Contributor

@kushv16 kushv16 left a comment

Choose a reason for hiding this comment

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

LGTM

@pema-s pema-s merged commit b358005 into master Apr 4, 2022
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