Commit Graph

921 Commits

Author SHA1 Message Date
SillyLossy
d37585c993 Wrap message images into container 2023-05-16 22:48:21 +03:00
RossAscends
2806d869ed CSS fix for movingUI handle + less round corners 2023-05-17 03:36:50 +09:00
SillyLossy
d0b4bccd40 Merge branch 'sd_inline_image_generation' of https://github.com/sumit0k/SillyTavern into sumit0k/sd_inline_image_generation 2023-05-16 21:18:59 +03:00
SillyLossy
bffeb7ee62 Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev 2023-05-16 16:28:42 +03:00
SillyLossy
5bfd3787fa Add event emitter subsystem. 2023-05-16 16:28:38 +03:00
RossAscends
7a4eb303b0 Merge branch 'dev' of https://github.com/Cohee1207/SillyTavern into dev 2023-05-16 22:04:19 +09:00
RossAscends
0e6ae900f6 Authors Note draggable. 2023-05-16 22:04:17 +09:00
Sumit Kumar
94a53d5759 support for not hiding everything except image 2023-05-16 15:59:35 +05:30
SillyLossy
3b5ce2f669 Fix quiet prompt extraction 2023-05-16 12:40:36 +03:00
SillyLossy
83f9876a13 Check for message deletable on click 2023-05-16 10:51:04 +03:00
Cohee
5a66baaeb7 Merge pull request #318 from sanskar-mk2/better-delete
deletion checkbox delegate to parent
2023-05-16 10:41:43 +03:00
Sanskar Tiwari
b823d40df6 ocd whitespace 2023-05-16 04:44:10 +05:30
Sanskar Tiwari
558d0d9b66 deletion checkbox delegate to parent 2023-05-16 04:36:30 +05:30
SillyLossy
f1235aed1c Merge branch 'main' into dev 2023-05-16 01:19:06 +03:00
SillyLossy
1ec3352f39 Revert pygmalion formatting of substitution parameters #317 2023-05-16 01:17:37 +03:00
SillyLossy
9d49c4644d OAI prompt display 2023-05-16 00:50:00 +03:00
RossAscends
3abc9efc7a Merge branch 'dev' of https://github.com/Cohee1207/SillyTavern into dev 2023-05-16 06:33:01 +09:00
RossAscends
ae9f9cc060 itemizer now references correct prompt for message 2023-05-16 06:32:59 +09:00
Aisu Wata
741c7b6568 Merge branch 'dev' of github.com:Cohee1207/SillyTavern into dev 2023-05-15 16:14:00 -03:00
SillyLossy
11716b5fc0 Proper trim sentences with streaming 2023-05-15 19:05:00 +03:00
Sanskar Tiwari
5320688e26 Merge branch 'Cohee1207:dev' into dev 2023-05-15 21:20:49 +05:30
Sanskar Tiwari
bf49becf22 fix function and call it in correct place? 2023-05-15 21:14:48 +05:30
Sanskar Tiwari
c8b77c0d58 change keep newline to include newline 2023-05-15 21:00:24 +05:30
SillyLossy
b65279ea27 Adjust stopping strings for metharme 2023-05-15 17:42:18 +03:00
SillyLossy
d7982c4339 Clean-up Generate function for better readability 2023-05-15 17:28:41 +03:00
SillyLossy
7dcc6639d6 Don't lose generate parameters on forced name2 regeneration 2023-05-15 17:17:06 +03:00
Sanskar Tiwari
2f8b95b18d add trim sentence feature 2023-05-15 19:29:59 +05:30
RossAscends
d97058ab89 Merge branch 'dev' of https://github.com/Cohee1207/SillyTavern into dev 2023-05-15 18:00:47 +09:00
RossAscends
5245174f6f raw Prompt visible from Itemizer view 2023-05-15 18:00:45 +09:00
SillyLossy
333e871b4f #310 Reapply patch 2023-05-15 11:26:38 +03:00
SillyLossy
0673069a25 Revert "#310 Force add character name for groups"
This reverts commit 91edeb9cd2.
2023-05-15 11:25:51 +03:00
SillyLossy
91edeb9cd2 #310 Force add character name for groups 2023-05-15 11:17:05 +03:00
Sanskar Tiwari
238c4fad57 console logging the prompt option 2023-05-15 12:04:56 +05:30
RossAscends
c3fe796059 World Selector&Editor Combined/Lockable/Swappable 2023-05-15 09:27:03 +09:00
RossAscends
e8eb1ac36b fix items lost on merge 2023-05-15 02:36:52 +09:00
RossAscends
a25b333f91 Merge branch 'dev' of https://github.com/Cohee1207/SillyTavern into dev 2023-05-15 02:31:26 +09:00
RossAscends
291e23e2f5 update OAI itemization 2023-05-15 02:28:17 +09:00
SillyLossy
afd2e810a8 Fix OAI tokenization 2023-05-14 20:17:14 +03:00
SillyLossy
dade3fa17d Merge branch 'dev' of https://github.com/SillyLossy/TavernAI into dev 2023-05-14 19:47:34 +03:00
SillyLossy
6a94bb5063 Old anchors removed 2023-05-14 19:47:32 +03:00
RossAscends
133caa58d2 add in process files for OAI tokenization merge 2023-05-15 01:45:36 +09:00
RossAscends
3fcf7c893a Merge branch 'dev' of https://github.com/Cohee1207/SillyTavern into dev 2023-05-15 01:09:21 +09:00
RossAscends
30a43f96de OAI token itemization WIP (integrate PR299) 2023-05-15 01:08:45 +09:00
SillyLossy
50ab9df54a Merge branch 'main' into dev 2023-05-14 16:58:02 +03:00
SillyLossy
bd6255c758 Fix multigen with group chats 2023-05-14 16:36:07 +03:00
Aisu Wata
dc1dd23371 Merge branch 'dev' of github.com:Cohee1207/SillyTavern into dev 2023-05-13 22:16:32 -03:00
Aisu Wata
1b2e113a34 Feature: Auto Swipe 2023-05-13 22:15:47 -03:00
SillyLossy
cace7fa96d Fix itemize without extensions running 2023-05-14 00:33:10 +03:00
SillyLossy
833d0ac02f Merge branch 'main' into dev 2023-05-14 00:22:49 +03:00
RossAscends
1749a66923 parse memory & AN in prompt itemizer 2023-05-14 05:07:48 +09:00