Commit Graph

152 Commits

Author SHA1 Message Date
RossAsscends
05ef64769d Merge branch 'main' of https://github.com/RossAscends/TavernAI 2023-02-25 16:46:53 +09:00
RossAsscends
001c8fa2b8 Update .gitignore 2023-02-25 16:46:41 +09:00
RossAscends
cc55a885a4 Update style.css 2023-02-25 16:44:49 +09:00
RossAsscends
9b9a6d909a updated gitignore
should hopefully not be tracking these files for future pushes.
2023-02-25 07:00:46 +09:00
RossAsscends
743371159b added gitignore
so future pushes don't include user data from public subdirectories, and uploads directory. also removed my config.conf, as I change it to disable the whitelisting feature.
2023-02-25 06:46:03 +09:00
RossAscends
5cf91b1264 some more index.html reverts
added back in cookie JS, favicon, and removed bootstrap links/script references.
2023-02-25 06:31:00 +09:00
RossAscends
aa33f3be94 small CSS fix, reverting to default.
line 62 and 74 : background URL from "taverna.png" (my change) to "tavern.png" (default). I had made the url changes as a test for functionality while altering BG behavior. 

Even if taverna.png is in the CSS, the BG swapping works properly. 

I think I did this because having it set to tavern.png in the initial CSS will remove whatever BG was chosen by the user in a previous session. Could be wrong about that.
2023-02-25 06:18:15 +09:00
RossAscends
1f4c01fedf manual re-addition of index.html tokenizer code
line 849:
if((anchorTop != "" || charPersonality != "") && !is_pygmalion){

line 1035:
if(message_already_generated.indexOf('You:') === -1 && message_already_generated.indexOf('<|endoftext|>') === -1 && tokens_already_generated < parseInt(amount_gen) && getMessage.length > 0){
2023-02-25 06:03:12 +09:00
RossAscends
1c0ce37d3e Update bg_load.css 2023-02-25 05:46:17 +09:00
RossAscends
872c39ce3b Update index.html 2023-02-25 05:45:19 +09:00
RossAsscends
3663eb4564 Merge branch 'main' of https://github.com/RossAscends/TavernAI 2023-02-25 05:38:14 +09:00
RossAsscends
02330b4d12 Ross CSS 1.2.8 + hotkeys take 3 2023-02-25 05:36:41 +09:00
RossAscends
d8544385ab Merge pull request #1 from SillyLossy/ross-css
New CSS from RossAscends
2023-02-25 05:14:43 +09:00
SillyLossy
21198fbad8 New CSS from RossAscends
Cleaner changes from https://github.com/RossAscends/TavernAI/tree/RossAscends-TavernAI-UI-for-1.2.8
2023-02-24 21:13:37 +02:00
Ash
a104082943 ip checking whitelist fix 2 2023-02-18 20:17:35 +04:00
Ash
f24fd58710 ip whitelist fix 2023-02-18 19:54:44 +04:00
Ash
388acc4ddd optimisation checking EOS tag 2023-02-17 19:04:50 +04:00
Ash
d6afa07560 favicon 2023-02-17 14:52:08 +04:00
Ash
6cf2d95144 ip whitelist check fix 2023-02-17 02:58:07 +04:00
Ash
7b9837fd06 fix 2023-02-17 02:42:49 +04:00
Ash
5e272e91d2 readme fix 2023-02-16 16:30:59 +04:00
Ash
82323fb2eb readme fix 2023-02-16 16:27:40 +04:00
Ash
cebcd970c1 readme fix 2023-02-16 16:26:52 +04:00
Ash
e764f94c8a Colab: add lt for KoboldAI 2023-02-15 16:49:46 +04:00
Ash
a73decaac6 colab 2023-02-15 16:06:37 +04:00
Ash
171806db2f colab 2023-02-15 16:05:26 +04:00
Ash
dbcc628d53 Merge branch 'main' of https://github.com/TavernAI/TavernAI
# Conflicts:
#	server.js
2023-02-15 15:36:42 +04:00
Ash
366f235c02 @1.2.8:
1) Security update: https://github.com/TavernAI/TavernAI/security/advisories/GHSA-25wp-82wc-xchj
2) Fixed several bugs related to character import: now all imported characters are added to the top of the list.
3) Fixed a bug that duplicated character cards if the character name and map name did not match.
4) Made minor fixes for prompt formatting.
5) Added the ability to enable/disable TavernAI autostart in the browser through the configuration file.
6) Adapted for Pygmalion Dev.
2023-02-15 15:33:06 +04:00
Borov666
e13c1a3877 Merge pull request #50 from 10sa/patch-3
Remove Cookie secure options
2023-02-15 02:04:31 +04:00
Tensa
44e7d2ab01 Remove Cookie secure options
almost server is not using https, so disable it.
2023-02-15 07:01:51 +09:00
Ash
cb00faa570 Merge branch 'HEAD' of https://github.com/TavernAI/TavernAI 2023-02-14 23:11:24 +04:00
Ash
baabea2c55 colab 2023-02-14 23:11:06 +04:00
TavernAI
8b7b51ffad Merge pull request #46 from ZoltanAI/main
Improve JSON import
2023-02-14 22:25:16 +04:00
TavernAI
8a47fa8385 Merge pull request from GHSA-25wp-82wc-xchj
Add X-CSRF-Token for preventing CSRF vulnerability
2023-02-14 22:24:37 +04:00
10sa
1041fb77f7 Apply CORS Settings 2023-02-14 20:05:51 +09:00
Ash
20147fc8ca colab fix 2023-02-13 23:40:02 +04:00
10sa
9490c898c9 Implementats CSRF Token 2023-02-13 23:54:08 +09:00
Ash
2dc54a95b5 colab 2023-02-13 13:02:08 +04:00
Ash
89f575852b fix 2023-02-12 23:15:06 +04:00
Ash
7309796847 colab fix 2023-02-12 21:37:53 +04:00
Ash
309b1679c5 Colab update 2023-02-12 18:11:48 +04:00
Ash
e0724a2825 Colab save/load update 2023-02-12 18:06:47 +04:00
ZoltanAI
3c295cff77 Improve JSON import
Prefer TavernAI JSON format
Import all TavernAI JSON properties
Handle missing or null fields
2023-02-11 14:42:53 +00:00
Ash
dc40b82c9a colab 2023-02-11 03:02:46 +04:00
Ash
46f4b1e735 colab 2023-02-11 02:49:56 +04:00
Ash
2dec0ffce6 colab 2023-02-11 02:31:12 +04:00
Ash
abc2bce7cf colab 2023-02-11 01:56:15 +04:00
Ash
0a13b2da53 security update 2023-02-09 13:55:18 +04:00
Ash
0d54556d6d css fix 2023-02-08 22:00:28 +04:00
Borov666
1f28dc26fb Merge pull request #36 from 10sa/patch-1
Fix Invalid CSS styles and comments
2023-02-08 21:50:21 +04:00