Group 3 - Brendan Geary - #174

Open

BrendanGeary2020 wants to merge 48 commits into

becloudready:masterfrom

kunzhutich:master

Commits on Aug 28, 2026

initial small setup
kunzhutich
committed
6283fcc
Create test.txt
kunzhutich
committed
528ffd7
connor test
ConnorVandrush
committed
6a84f1b
deleted folders
ConnorVandrush
committed
1ea7748
test commit
ConnorVandrush
committed
a2043a5
Merge pull request #1 from kunzhutich/connor-dev-branch
ConnorVandrush
authored
138a35c
Add header component
ConnorVandrush
committed
a1181c2
Merge pull request #2 from kunzhutich/connor-dev-branch
ConnorVandrush
authored
a190f3e
fixed
ConnorVandrush
committed
ee2530c
Merge pull request #3 from kunzhutich/connor-dev-branch
ConnorVandrush
authored
646123e
initial BE layer ready but not tested
kunzhutich
committed
3c395e8
update
BrendanGeary2020
committed
b8c1e55
seeding data
kunzhutich
committed
9392a12
update
BrendanGeary2020
committed
2ee39f6
moved infra folder out so that it can capture FE as well
kunzhutich
committed
8b27a99
Merge branch 'hanruiwang-backend-schemas'
kunzhutich
committed
d0f4ffb
trainer side bar
BrendanGeary2020
committed
4633442
Merge branch 'master' into Brendan-Geary-Frontend
BrendanGeary2020
committed
5a6a6bb
updated dependencies
kunzhutich
committed
96cda40
Work in progress
ConnorVandrush
committed
388509e
Fix FE/BE field casing mismatch and reserved-TLD seed emails
kunzhutich
committed
206cd72
Merge branch 'master' into connor-dev-branch
ConnorVandrush
authored
50a93ef
Merge pull request #4 from kunzhutich/connor-dev-branch
ConnorVandrush
authored
4f564f1
Implement manager (Trainer) dashboard: create tasks, view cohort progress
kunzhutich
committed
2e734e7
logout worked for both user types
BrendanGeary2020
committed
679d6bc
imlplement trainee
ConnorVandrush
committed
15a3131
Merge branch 'connor-dev-branch' of https://github.com/kunzhutich/workshops into connor-dev-branch
ConnorVandrush
committed
1a07605
Merge branch 'master' into connor-dev-branch
ConnorVandrush
authored
0a2bf32
Merge pull request #5 from kunzhutich/connor-dev-branch
ConnorVandrush
authored
65c8e08
Merge branch 'hanruiwang-backend-schemas'
kunzhutich
committed
dd47a44
feat: add reusable development seed data
MUzairAnees
committed
3a74263
Fix merge fallout: restore auth flow after TraineeStore -> TraineeSlice rename
kunzhutich
committed
e1e24e8
Merge remote-tracking branch 'origin/master' into muzairanees-expand-seed-data
MUzairAnees
committed
f4e028f
Merge pull request #6 from kunzhutich/muzairanees-expand-seed-data
MUzairAnees
authored
1c2f443
Deployed version
ConnorVandrush
committed
6acd854
Merge branch 'master' into connor-dev-branch
ConnorVandrush
authored
07a2f06
Merge pull request #7 from kunzhutich/connor-dev-branch
ConnorVandrush
authored
c16b980
no need for this file
kunzhutich
committed
a42c74a
Merge branch 'master' of https://github.com/kunzhutich/workshops
kunzhutich
committed
5a7f15f

Commits on Aug 29, 2026

Good version
ConnorVandrush
committed
7da6295
Merge pull request #8 from kunzhutich/connor-dev-branch
ConnorVandrush
authored
1f8c93e

Commits on Aug 30, 2026

Commits on Sep 1, 2026

Merge upstream/master, resolve package-lock.json conflict by removing the stray root-level lockfile
kunzhutich
committed
c2555ea