Commit graph

101 commits

Author SHA1 Message Date
b99f41ebe1 tried to avoid merge conflicts 2024-09-18 11:11:41 +02:00
d29fe10794 The hidding of history and models works 2024-09-18 11:09:43 +02:00
a19039d89c Merge branch 'main' of interstellardevelopment.org:sageTheDm/ai-virtual-assistant 2024-09-18 09:53:15 +02:00
b3182b7964 Merging Problems 2024-09-18 09:53:00 +02:00
8a298fa3f9 Made the link static again 2024-09-18 09:51:48 +02:00
b04cccb136 Merge pull request 'Voice recognition' (#21) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/21
2024-09-18 09:50:04 +02:00
de12ebfa03 Merge pull request 'voice recognition with whisper' (#40) from YasinOnm08/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/40
2024-09-18 09:19:51 +02:00
06f263b417 voice recognition with whisper 2024-09-18 09:18:50 +02:00
12540f9432 Merge pull request 'CSS optimitaion' (#20) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/20
2024-09-18 09:13:29 +02:00
c85e981fce Merge pull request 'main' (#13) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/YasinOnm08/ai-virtual-assistant/pulls/13
2024-09-18 09:09:40 +02:00
b0ff4c3f2c Merge pull request 'updated css' (#35) from YasinOnm08/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/35
2024-09-18 09:04:57 +02:00
3afc4fa6ea updated css 2024-09-18 09:04:09 +02:00
9a17e11ce8 Merge pull request 'Fixede the CSS together with Yasin' (#19) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/19
2024-09-17 16:37:23 +02:00
33ef734c70 Merge pull request 'fix scroll bar' (#34) from YasinOnm08/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/34
2024-09-17 16:36:56 +02:00
734d7f3a09 fix scrolling bar 2024-09-17 16:32:27 +02:00
fa4f1473ad Merge pull request 'main' (#12) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/YasinOnm08/ai-virtual-assistant/pulls/12
2024-09-17 15:20:00 +02:00
3987d32ef3 Merge pull request 'new buttons' (#18) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/18
2024-09-17 15:08:50 +02:00
Patrick_Pluto
ca2c3f782b Added functionality. 2024-09-17 15:03:51 +02:00
Patrick_Pluto
2692972843 Fixed html. 2024-09-17 13:52:15 +02:00
3f379fef42 Merge pull request 'Windows css fixend and backend' (#17) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/17
2024-09-17 13:51:14 +02:00
Patrick_Pluto
df79f6b2c3 Merge branch 'main' of interstellardevelopment.org:React-Group/ai-virtual-assistant 2024-09-17 13:50:08 +02:00
Patrick_Pluto
0f3b5cb49a New Changes. 2024-09-17 13:49:52 +02:00
d70c8d28f3 Merge pull request 'fix windows css' (#33) from YasinOnm08/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/33
2024-09-17 13:49:05 +02:00
26851aaead fix windows css 2024-09-17 13:48:04 +02:00
80e733e0ca Merge pull request 'main' (#11) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/YasinOnm08/ai-virtual-assistant/pulls/11
2024-09-17 13:24:38 +02:00
94660381ad Merge pull request 'Backend optimisation' (#16) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/16
2024-09-17 13:09:14 +02:00
Patrick_Pluto
af1353a41a FIXED THE MERGE CONFLICT (THANKS) 2024-09-17 12:36:32 +02:00
Patrick_Pluto
e1df8869fb pull 2024-09-17 12:34:30 +02:00
164b1288e1 Merge pull request 'GUI changes & first steps into responsive design' (#32) from sageTheDm/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/32
2024-09-17 12:33:49 +02:00
1703650c2c additional responsive design 2024-09-17 12:33:11 +02:00
1821cbd64f GUI changes & first steps into responsive design 2024-09-17 12:25:15 +02:00
72e8a08636 Merge pull request 'Backend modifycation' (#15) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/15
2024-09-17 08:06:29 +02:00
1da1927425 Merge pull request 'Removed contact form and added a documentaion subside' (#31) from sageTheDm/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/31
2024-09-17 08:05:22 +02:00
755c2c441f Removed contact form and added a documentaion subside 2024-09-17 08:03:46 +02:00
c0282041af Merge pull request 'modifyed the css' (#30) from sageTheDm/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/30
2024-09-16 18:49:33 +02:00
2ca055b4c1 modifyed the css 2024-09-16 17:08:09 +02:00
c850c6c290 Merge pull request 'Web app modification' (#29) from sageTheDm/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/29
2024-09-16 16:46:06 +02:00
Patrick_Pluto
0edf05669e small refactor 2024-09-16 16:45:46 +02:00
01fadc2ccf Tried to add the contact form --> js is not working atm 2024-09-16 16:44:30 +02:00
f536885785 Merge pull request 'Fixed subsides' (#14) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/14
2024-09-16 16:21:18 +02:00
Patrick_Pluto
f7d23ef603 fixed the subsites fr fr 2024-09-16 16:18:48 +02:00
Patrick_Pluto
e0cd65ae65 fixed the subsites 2024-09-16 16:12:51 +02:00
1cd0393269 Merge pull request 'Added a header to the project' (#28) from sageTheDm/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/28
2024-09-16 16:10:06 +02:00
027a90311c Merge pull request 'class diagram' (#13) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/13
2024-09-16 16:08:55 +02:00
68f2b744fc Merge branch 'main' of interstellardevelopment.org:sageTheDm/ai-virtual-assistant 2024-09-16 16:08:18 +02:00
d0af4a5eeb Added a header to index 2024-09-16 16:08:00 +02:00
Patrick_Pluto
5b2a18cced class diagram 2024-09-16 16:00:20 +02:00
be9f2e5690 Merge pull request 'Bug fixes' (#12) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/sageTheDm/ai-virtual-assistant/pulls/12
2024-09-16 15:31:43 +02:00
5fd4493968 Merge pull request 'main' (#10) from React-Group/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/YasinOnm08/ai-virtual-assistant/pulls/10
2024-09-16 15:17:00 +02:00
086237c9f5 Merge pull request 'voice_recognition comments' (#27) from YasinOnm08/ai-virtual-assistant:main into main
Reviewed-on: https://interstellardevelopment.org/code/code/React-Group/ai-virtual-assistant/pulls/27
2024-09-16 15:16:23 +02:00