Skip to content
Open
Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
65e6eaa
Dropdown changes with edit modal for owner
SwathiAngadi Aug 21, 2026
5907637
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
SwathiAngadi Aug 21, 2026
595eae5
Button functionalities
SwathiAngadi Sep 4, 2026
d7f0039
Resolved merge conflicts
SwathiAngadi Sep 4, 2026
07d7179
Promotion ability test code
SwathiAngadi Sep 15, 2026
325ad52
Made few changes in the code
SwathiAngadi Sep 18, 2026
56a0cde
DEleted the lock and yarn file to make it compatible with development
SwathiAngadi Sep 18, 2026
5853c6c
added yarn.lock file
SwathiAngadi Sep 18, 2026
5090460
added edit functionality and dark mode changes , bulk api
SwathiAngadi Sep 19, 2026
e1a7ff8
Fix IssueCharts CSS import casing
SwathiAngadi Sep 21, 2026
09a44e8
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
SwathiAngadi Sep 21, 2026
b439525
Fix yarn lockfile for Node 20 CI
SwathiAngadi Sep 21, 2026
66b020b
Removed oly .css file which was causing build failure
SwathiAngadi Sep 22, 2026
be1acda
added module file instead of .css file
SwathiAngadi Sep 22, 2026
7fd6477
Removed ununsed code and removed the test dat from the UI
SwathiAngadi Sep 22, 2026
9a1841f
SonarQube chnages
SwathiAngadi Sep 22, 2026
1501351
Added missing import logic
SwathiAngadi Sep 23, 2026
ac98c85
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
SwathiAngadi Sep 23, 2026
0952e47
Included reviewers suggestion and fixes
SwathiAngadi Oct 2, 2026
7e1e951
resolved merge conflicts
SwathiAngadi Oct 2, 2026
62ccad8
lint issue fix
SwathiAngadi Oct 2, 2026
b62cd15
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
SwathiAngadi Oct 10, 2026
651f26b
Added patch and reviewer group changes and also added separate ref fo…
SwathiAngadi Oct 10, 2026
642f58c
Fixed the failing tets case
SwathiAngadi Oct 11, 2026
06dbd1b
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
SwathiAngadi Oct 11, 2026
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
2 changes: 1 addition & 1 deletion fix-conflicts.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
'src/components/BMDashboard/AddMaterial/AddMaterial.module.css',
'src/components/BMDashboard/Equipment/Update/UpdateEquipment.module.css',
'src/components/BMDashboard/Issues/issueChart.module.css',
'src/components/BMDashboard/Issues/issueCharts.module.css',
'src/components/BMDashboard/Issues/IssueCharts.module.css',
'src/components/BMDashboard/ItemList/ItemListView.module.css',
'src/components/BMDashboard/Lesson/LessonForm.module.css',
'src/components/BMDashboard/LessonList/LessonCard.module.css',
Expand Down Expand Up @@ -54,17 +54,17 @@
let count = 0;
for (const f of files) {
if (!fs.existsSync(f)) {
console.log('NOT FOUND: ' + f);

Check warning on line 57 in fix-conflicts.js

View workflow job for this annotation

GitHub Actions / test

Unexpected console statement
continue;
}
const content = fs.readFileSync(f, 'utf8');
if (!content.includes('<<<<<<<')) {
console.log('No conflict: ' + f);

Check warning on line 62 in fix-conflicts.js

View workflow job for this annotation

GitHub Actions / test

Unexpected console statement
continue;
}
const resolved = resolveKeepHead(content);
fs.writeFileSync(f, resolved, 'utf8');
console.log('Fixed: ' + f);

Check warning on line 67 in fix-conflicts.js

View workflow job for this annotation

GitHub Actions / test

Unexpected console statement
count++;
}
console.log('Total: ' + count);

Check warning on line 70 in fix-conflicts.js

View workflow job for this annotation

GitHub Actions / test

Unexpected console statement
Loading
Loading