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.

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

API Detailed Operations Tutorial Streams and Group Sets #10

Merged
merged 16 commits into from
Sep 18, 2024
Merged

API Detailed Operations Tutorial Streams and Group Sets #10

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ca5d9a8
Test API added
Shyamachandran Jul 20, 2024
a908734
Test API
Shyamachandran Jul 20, 2024
6c33254
unit Tutorial streams updated in New folder
Shyamachandran Aug 1, 2024
41bb4dc
Formatted content
Shyamachandran Aug 4, 2024
c397732
changes astro file
Shyamachandran Aug 4, 2024
df5b1ce
unit Tutorial streams updated
Shyamachandran Aug 11, 2024
510979c
unit group sets updated in new folder
Shyamachandran Aug 18, 2024
07d8b8a
Update unit-group_sets.md
Shyamachandran Aug 20, 2024
10c4bb9
added more API operations into the folder
Shyamachandran Sep 1, 2024
2cfae46
added new API under group sets folder
Shyamachandran Sep 1, 2024
c9d214f
Update unit-group_sets.md
Shyamachandran Sep 3, 2024
d77bda9
Update astro.config.mjs
Shyamachandran Sep 3, 2024
e49ff0f
Update unit-group_sets.md
Shyamachandran Sep 10, 2024
e89f0db
Update astro.config.mjs
Shyamachandran Sep 16, 2024
ec93941
Update astro.config.mjs
Shyamachandran Sep 17, 2024
009879f
Merge branch 'main' into sh/APIupdate
DudeUnleashed Sep 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion astro.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ export default defineConfig({
label: 'unit_roles',
link: '/backend/api/unit_roles',
},

{
label: 'units API operation list',
link: '/backend/api/units',
Expand All @@ -155,7 +154,24 @@ export default defineConfig({
label: 'Error codes',
link: '/backend/api/error_codes',
},
{
<<<<<<< HEAD
label: 'Tutorial Streams',
link: '/backend/api/Unit-Tutorial Streams.md',
},
{
label: 'Group sets',
=======
label: 'Unit Tutorial Streams',
link: '/backend/api/unit-tutorial_streams',
},
{
label: 'Unit Group Sets',
>>>>>>> 07d8b8ad5447c02473126889dd785e6219e6c300
Copy link
Collaborator

Choose a reason for hiding this comment

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

@Shyamachandran this is merge conflict - please remove this and get a re-review from @DudeUnleashed .

Copy link
Collaborator

Choose a reason for hiding this comment

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

Change the PR title too please.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hello Nebula, Thank you for your review.
I have made the necessary changes and is ready for your review.
@DudeUnleashed - Please review revised version.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi Nebula,
This is all done now. All conflicts addressed.

link: '/backend/api/unit-group_sets',
},
],

},
{
label: 'Team',
Expand Down
Loading
Loading