Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
2110498
add: Efrat Madmon Joke
Efrat8277 May 26, 2026
542af37
add: yaelijoke
yaelirosner May 26, 2026
0510d4b
add: sara levin joke
saralev111 May 26, 2026
ad5228b
add: Yehudit joke
yehudit5224 May 26, 2026
7617b7c
add: [yaeli-hain] joke
yh21661355-code May 26, 2026
6d52e34
add: joke component with styles
yehudit5224 May 26, 2026
0e3e9a2
Update index.ts
yaelirosner May 26, 2026
3e8a8ff
Merge pull request #52 from diversi-tech/sola_sola3_saralevin
saralev111 May 26, 2026
e9028c0
Merge branch 'sola3' into sola_sola3_yaeli
yaelirosner May 26, 2026
8f5e47c
Merge pull request #47 from diversi-tech/sola_sola3_yaeli
yaelirosner May 26, 2026
18e005a
merge conflicts
yh21661355-code May 26, 2026
cad80bb
commit1
Efrat8277 May 26, 2026
8c60bfa
a
yehudit5224 May 26, 2026
56778f7
a
yaelirosner May 26, 2026
713ca8e
b
yehudit5224 May 26, 2026
b3a4e3e
b
yaelirosner May 26, 2026
aa21ac9
commit2
Efrat8277 May 26, 2026
0d26c1a
c
yaelirosner May 26, 2026
5ae6275
c
yehudit5224 May 26, 2026
1b76d08
d
yehudit5224 May 26, 2026
64b5d8c
d
yaelirosner May 26, 2026
f544938
commit exp1
Efrat8277 May 26, 2026
decacb6
darkness
yh21661355-code May 26, 2026
942f9a4
commit exp1
Efrat8277 May 26, 2026
f144d46
e
yaelirosner May 26, 2026
f443743
f
yaelirosner May 26, 2026
25746dd
e
yehudit5224 May 26, 2026
86247ee
f
yehudit5224 May 26, 2026
e90ea8a
loves 1
yh21661355-code May 26, 2026
6820acb
finish the merge
yaelirosner May 26, 2026
004a1b7
finish the merge
yehudit5224 May 26, 2026
d1df2fe
Merge branch 'sola3' of https://github.com/diversi-tech/Git-Practice …
Efrat8277 May 26, 2026
b824958
Merge pull request #51 from diversi-tech/sola_sola3_Efrat_Madmon
Efrat8277 May 26, 2026
a441629
Merge branch 'sola_sola3_yaeli' of https://github.com/diversi-tech/Gi…
yaelirosner May 27, 2026
d41bae9
fix missing curly brace
yaelirosner May 27, 2026
5ba1f18
json
yh21661355-code May 27, 2026
099a1b6
Merge branch 'sola3' into sola_sola3_yaeli
yaelirosner May 27, 2026
8391cad
Merge pull request #92 from diversi-tech/sola_sola3_yaeli
yaelirosner May 27, 2026
bdcaa0f
json
yh21661355-code May 27, 2026
670f2f8
Merge branch 'sola3' into sola_sola3_yehudit
YehuditB5224 May 27, 2026
4ee42bb
Merge pull request #93 from YehuditB5224/sola_sola3_yehudit
YehuditB5224 May 27, 2026
b5ad406
json
yh21661355-code May 27, 2026
25bfa36
Fix bugs and complete the task
saralev111 May 27, 2026
aad05db
json
yh21661355-code May 27, 2026
e26179f
Merge branch 'sola3' into sola_sola3_yaeli
yh21661355-code 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