Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
dc4bf5a
add: shira-carmi joke
shirac215-web May 26, 2026
d940bec
add: Shifra joke
SHIFI-ZAFRANI May 26, 2026
2aee1bb
add malka joke
MalkiGe May 26, 2026
198b979
add: ruti-paniri joke
rp0556797395-gif May 26, 2026
e26793e
Merge pull request #55 from diversi-tech/sola_sola1_ruti
rp0556797395-gif May 26, 2026
10942bb
fix: fix joke text formatting and syntax
SHIFI-ZAFRANI May 26, 2026
b560d76
fix: fix joke text formatting and syntax name
SHIFI-ZAFRANI May 26, 2026
83ec210
Update ShiraCarmiJokePage with a new joke
shirac215-web May 26, 2026
7269b05
Update ShiraCarmiJokePage
shirac215-web May 26, 2026
16d6569
Fix merge conflict in students index
shirac215-web May 26, 2026
d359d06
add emugy
shirac215-web May 26, 2026
8857720
revach
SHIFI-ZAFRANI May 26, 2026
bcaee8e
commit2
shirac215-web May 26, 2026
9c55a1b
commit3
shirac215-web May 26, 2026
ffa6ea0
commit4
shirac215-web May 26, 2026
47acaf1
commit5
shirac215-web May 26, 2026
3276b60
commit6
shirac215-web May 26, 2026
fb2270f
Merge pull request #39 from diversi-tech/sola_sola1_carmi
shirac215-web May 26, 2026
15afcd5
Merge branch 'sola_sola1' of https://github.com/diversi-tech/Git-Prac…
SHIFI-ZAFRANI May 26, 2026
3fbfdaa
fix: move punctuation marks inside string brackets
SHIFI-ZAFRANI May 26, 2026
4e3bc3e
fix: move punctuation marks inside string brackets1
SHIFI-ZAFRANI May 26, 2026
6ea2ffe
fix: cleanup system files to pass github actions
SHIFI-ZAFRANI May 26, 2026
b48d0cc
fix: restore index.ts and apply correct code version
SHIFI-ZAFRANI May 26, 2026
967b1a1
Merge pull request #43 from diversi-tech/sola_sola1_shifraZ
Shifra-Dev May 26, 2026
93d1410
Update index.ts with latest team changes
rp0556797395-gif May 27, 2026
4000f8f
Fix conflicts and conclude merge
shirac215-web May 27, 2026
0738e70
Add Shira Carmi to students list
shirac215-web May 27, 2026
6d96b0c
Merge pull request #88 from diversi-tech/sola_sola1_carmi
shirac215-web May 27, 2026
d1e1b5a
הוספתי רווח
rp0556797395-gif May 27, 2026
96b32ea
Update index.ts with my details
SHIFI-ZAFRANI May 27, 2026
03fde2e
Merge branch 'sola_sola1' of https://github.com/diversi-tech/Git-Prac…
SHIFI-ZAFRANI May 27, 2026
070c645
update
MalkiGe May 27, 2026
e9cab03
resolve merge by malka
MalkiGe May 27, 2026
8ad3f68
resolve
MalkiGe May 27, 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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "gen-branches && vite",
"dev": "npm run gen-branches && vite",
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview",
Expand Down
Loading