Commit Graph

87 Commits

Author SHA1 Message Date
eduardruzga
17e500344a merge 2024-12-11 20:02:07 +02:00
Anirban Kar
5d4b860c94 updated to adapth baseurl setup 2024-12-11 14:02:21 +05:30
Anirban Kar
e0c5c51e56 lint fix 2024-12-10 23:03:12 +05:30
Anirban Kar
af09104c82 moved log to only print on change, and changed error logs to warnings 2024-12-10 23:02:54 +05:30
Anirban Kar
7f8f5023a1 Merge branch 'main' into ui-background-rays 2024-12-10 20:43:27 +05:30
Anirban Kar
b4d0597120 remaining changes 2024-12-10 18:37:23 +05:30
Dustin Loring
b6f6f187fd fix: small bug
stopped collapse from happen when no provider selected
2024-12-07 16:27:37 -05:00
Dustin Loring
66fe6a2efc fix position issue
fix position issue when in chat
2024-12-07 16:22:11 -05:00
Dustin Loring
5dd9c926c8
Merge branch 'coleam00:main' into ui/model-dropdown 2024-12-07 16:18:58 -05:00
Cole Medin
31e7b48e05
Merge pull request #580 from oTToDev-CE/feat/add-tabbed-setting-modal
feat: Added a tabbed setting modal
2024-12-07 15:01:17 -06:00
Anirban Kar
a98b51e0ef updated theme color 2024-12-08 02:12:02 +05:30
Anirban Kar
8067bb63af Merge branch 'main' into ui-background-rays 2024-12-08 01:55:05 +05:30
Dustin Loring
a2acc77e89 fix: clean up
fix: typecheck / lint
2024-12-07 10:53:33 -05:00
Dustin Loring
42ebd3d50e Added a tabbed setting modal 2024-12-07 10:27:50 -05:00
Dustin Loring
5692a4c011 lint fix 2024-12-06 09:42:58 -05:00
Dustin Loring
773e69ef7a Update BaseChat.tsx
moved the model collapse button.
2024-12-06 09:36:42 -05:00
Anirban Kar
fe2f0080a3
Merge branch 'main' into github-import 2024-12-06 18:54:06 +05:30
eduardruzga
2fd0c06ed4 Split code a little bit 2024-12-04 20:51:27 +02:00
eduardruzga
f6a9861390 Hardcode url for together ai as fallback if not set in env 2024-12-04 20:31:42 +02:00
Cole Medin
8c641443b7
Merge pull request #332 from atrokhym/main
HIGH PRIORITY - Attach images to prompts
2024-12-04 10:53:37 -06:00
Anirban Kar
b0743e00b1
Merge branch 'main' into github-import 2024-12-04 17:54:47 +05:30
Dustin Loring
5bd138750e
Merge branch 'main' into fix/ui-gradient 2024-12-03 08:12:52 -05:00
Anirban Kar
509390569f added context to history 2024-12-03 11:09:37 +05:30
Andrew Trokhymenko
5adc0f681c adding drag and drop images to text area 2024-12-02 20:27:10 -05:00
Anirban Kar
bd236860f9 chore: fixed lock file 2024-12-03 03:23:22 +05:30
Anirban Kar
b499ee1f15 Merge branch 'main' into github-import 2024-12-03 02:48:37 +05:30
Andrew Trokhymenko
235747af51 merge with upstream 2024-12-02 14:55:43 -05:00
Andrew Trokhymenko
0ab334126a adding to display the image in the chat conversation. and paste image too. tnx to @Stijnus 2024-12-02 14:08:41 -05:00
Dustin Loring
87620f38be lint rules added and fixed 2024-12-02 06:06:17 -05:00
Dustin Loring
2439e1cffa hotfix 2024-12-01 09:42:19 -05:00
Dustin Loring
1118a4c597 small fixes 2024-12-01 09:11:59 -05:00
Dustin Loring
0dbb155d8a
Merge branch 'dev' into ui-glow 2024-12-01 08:55:42 -05:00
Dustin Loring
d85dff6f27
Update BaseChat.tsx
Added ray
2024-12-01 07:41:23 -05:00
Dustin Loring
c4347cb10d added collapsable chat area 2024-12-01 07:23:15 -05:00
Andrew Trokhymenko
7cdb56a847 merge with upstream/main 2024-11-29 22:02:35 -05:00
Eduard Ruzga
9b62edd910
Merge pull request #413 from wonderwhy-er/Import-folder
(Ready for Review) Start chat with Folder Import
2024-11-26 10:03:29 +02:00
Eduard Ruzga
574f0a05b3
Merge pull request #414 from SujalXplores/fix/eslint-issues
fix: silent eslint issues
2024-11-25 23:13:28 +02:00
eduardruzga
15d490dda4 Merge with master fixes 2024-11-25 19:57:53 +02:00
eduardruzga
e2d4b0a4f2 Merge remote-tracking branch 'coleam00/main' into Import-folder
# Conflicts:
#	app/components/chat/BaseChat.tsx
2024-11-25 19:52:50 +02:00
Anirban Kar
e6ed210d0d work in progress poc git import 2024-11-25 19:53:54 +05:30
Sujal Shah
f94165a421 fix: silent eslint issues 2024-11-25 14:00:18 +05:30
eduardruzga
3d2ab89cdc Proof of concept for folder import 2024-11-25 10:24:03 +02:00
eduardruzga
30605ea3a1 Small-cleanup-of-base-chat-component 2024-11-25 09:43:34 +02:00
eduardruzga
6e94d20a74 Couple of bugfixes 2024-11-24 15:28:49 +02:00
eduardruzga
1f09459fa5 Small change to make review easier 2024-11-24 12:05:22 +02:00
eduardruzga
fbea474442 Type fixes 2024-11-23 10:41:43 +02:00
eduardruzga
6e8aa04d27 Lint fixes 2024-11-23 00:29:16 +02:00
eduardruzga
f6a7c4f5b5 Merge remote-tracking branch 'coleam00/main' into import-export-individual-chats
# Conflicts:
#	app/components/chat/BaseChat.tsx
#	app/components/chat/Messages.client.tsx
#	app/lib/persistence/db.ts
#	app/lib/persistence/useChatHistory.ts
2024-11-23 00:26:12 +02:00
eduardruzga
fb34a4cb8f Add import, fix export 2024-11-23 00:23:45 +02:00
eduardruzga
9f49c25f96 Added export button 2024-11-22 11:51:52 +02:00