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

Shoonya v2.4 #714

Merged
merged 69 commits into from
Sep 13, 2023
Merged

Shoonya v2.4 #714

merged 69 commits into from
Sep 13, 2023

Conversation

ishvindersethi22
Copy link
Member

Reverts #693

ganavikumarswamy and others added 30 commits September 8, 2023 08:36
@ganavikumarswamy
changes in time line
26b35db
@ganavikumarswamy
Merge branch 'develop' into frontEnd
46e1e2f
@aparna-aa
Merge pull request #694 from AI4Bharat/frontEnd
c801e77 
Front end
@ayushpanwar25
pagination fix
15cfd4a
@ganavikumarswamy
changes in CL-ui
bae6dbe
@ganavikumarswamy
Merge branch 'develop' into frontEnd
9a75fba
@aparna-aa
Merge pull request #695 from AI4Bharat/pagination-fix
ccbb6a7 
pagination fix
@ganavikumarswamy
fixed conflict
7add8c2
@aparna-aa
Merge pull request #696 from AI4Bharat/frontEnd
79a4b56 
Front end
@ayushpanwar25
fix superchecker typo
1ec71be
@ayushpanwar25
redo minor pagination fix
8c60cb7
@aparna-aa
Merge pull request #697 from AI4Bharat/pagination-fix
4824ab2 
fix superchecker typo
@ganavikumarswamy
fontsize changes
47db5ae
@ganavikumarswamy
Merge branch 'develop' into frontEnd
c807d2b
@sagarika-padmanaban
resolved notes button colour issue
9c34f0a
@ishvindersethi22
Update TabsSuggestionData.js
dd446ca
@ishvindersethi22
Merge pull request #699 from AI4Bharat/hmm-tag
9c2814e 
Update TabsSuggestionData.js
@ishvindersethi22
Merge branch 'develop' into frontEnd
9f79001
@ayushpanwar25
change css logic
33d97d7
@aparna-aa
Merge pull request #700 from AI4Bharat/css-fix
da5fed6 
change css logic
@ayushpanwar25
Update TaskTable.jsx
485c250
@ayushpanwar25
Update SuperCheckerTasks.jsx
65f2ef2
@ayushpanwar25
Merge branch 'develop' into css-fix
3d4deb6
@ayushpanwar25
redirect on clui toggle
9849109
@aparna-aa
Merge pull request #701 from AI4Bharat/css-fix
d16a891 
Redirect on CLUI toggle
@ganavikumarswamy
Merge branch 'develop' into frontEnd
112c3d1
@sagarika-padmanaban
resolved bugs
9923b0a
@sagarika-padmanaban
resolved bugs
49f0c81
@sagarika-padmanaban
resolved bugs
b523f71
@sagarika-padmanaban
resolved bugs
8b38ce3
ganavikumarswamy and others added 28 commits September 12, 2023 16:11
@ganavikumarswamy
notes css changes and timeline changes
a635411
@ganavikumarswamy
Merge branch 'develop' into frontEnd
13ab660
@ganavikumarswamy
Merge branch 'frontEnd' of https://github.com/AI4Bharat/Shoonya-Frontend
886aacb 
 into frontEnd
@aparna-aa
Merge pull request #698 from AI4Bharat/frontEnd
7164aed 
Front end
@sagarika-padmanaban
resolved bugs
6f75961
@sagarika-padmanaban
resolved bugs
e07a923
@sagarika-padmanaban
resolved bugs
111740d
@sagarika-padmanaban
resolved bugs
e2be5f2
@tahirjmakhdoomi
Update audio waveform in the CLUI TimeLine.jsx
dfde9ff
@aparna-aa
Merge pull request #707 from AI4Bharat/tahirjmakhdoomi-patch-1
d348b8c 
Update audio waveform in the CLUI TimeLine.jsx
@ayushpanwar25
disable cl-ui for AudioTranscription* tasks
be63032
@aparna-aa
Merge pull request #708 from AI4Bharat/acoustic
3a2a80a 
disable cl-ui for AudioTranscription* tasks
@ayushpanwar25
empty acoustic_text validation
d275d23
@ayushpanwar25
Merge branch 'develop' into acoustic
bfee12e
@aparna-aa
Merge pull request #709 from AI4Bharat/acoustic
fc0361f 
empty acoustic_text validation
@ayushpanwar25
acoustic lsf changes
1aee523
@ayushpanwar25
allow empty transcripts for skip and draft
b0b69b4
@aparna-aa
Merge pull request #710 from AI4Bharat/acoustic
7b47977 
acoustic lsf changes
@sagarika-padmanaban
resolved bugs
04d0d79
@sagarika-padmanaban
Merge branch 'develop' into cl_ui
e8541e1
@ayushpanwar25
Update LSF.jsx
87761c2
@ayushpanwar25
Merge branch 'develop' into acoustic
f60efac
@ayushpanwar25
fix incorrectly resolved conflicts
2b85a13
@ishvindersethi22
Merge pull request #712 from AI4Bharat/acoustic
3d557ba 
acoustic LSF changes
@ishvindersethi22
Merge branch 'develop' into cl_ui
240e9c7
@ishvindersethi22
Merge pull request #711 from AI4Bharat/cl_ui
92614bc 
Cl UI
@ishvindersethi22
Revert "Revert "Shoonya v2.4""
4f2e8bf
@ishvindersethi22
Merge pull request #715 from AI4Bharat/develop
ebcef17 
Shoonya v2.4
@ishvindersethi22 ishvindersethi22 changed the title Revert "Revert "Shoonya v2.4"" Shoonya v2.4 Sep 13, 2023
@ishvindersethi22 ishvindersethi22 merged commit d9eb678 into master Sep 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ishvindersethi22 @ganavikumarswamy @aparna-aa @ayushpanwar25 @sagarika-padmanaban @tahirjmakhdoomi