Cohee
60909cef1f
Fix server crash on import. Fix possible undefined warning
2023-12-06 01:02:48 +02:00
Cohee
b58f14d1d2
Fix bulk menu not working
2023-12-06 00:55:42 +02:00
Cohee
7f703704c7
Display loader on loading past chats
2023-12-06 00:42:41 +02:00
Cohee
d5628d822d
Merge pull request #1471 from valadaptive/remove-upload-endpoint
...
Remove "upload" endpoint from assets API
2023-12-06 00:13:10 +02:00
valadaptive
4faa20bb1f
Remove "upload" endpoint from assets API
...
I accidentally reintroduced this when splitting up the commits, I think
2023-12-05 15:02:30 -05:00
Cohee
6ea9269592
Merge pull request #1470 from valadaptive/sanitize-cleanup
...
Clean up file name sanitization
2023-12-05 16:45:00 +02:00
valadaptive
c00df4f45b
Clean up file name sanitization
...
- Checking for null bytes is unnecessary because the check for illegal
characters directly below it will catch them.
- We can use the path.extname method to get the file extension more
cleanly. It returns the *last* extension (e.g.
path.extname('file.foo.js') === '.js'), so behavior is preserved.
- Normalizing the path is unnecessary. We don't allow any path
separators in the file name, so it does nothing.
- Stripping '..', path separators, and '$' is unnecessary because of the
earlier illegal character check.
2023-12-05 09:25:45 -05:00
Cohee
356c3a4300
Fix amount gen on zen sliders
2023-12-05 14:12:06 +02:00
Cohee
c9fbe75566
Rename WI logic ONE => ANY
2023-12-05 12:04:27 +02:00
Cohee
ebe0f46f31
Merge pull request #1469 from Bronya-Rand/staging
...
Proper World Info logic checks
2023-12-05 11:57:34 +02:00
Bronya Rand
612005fb64
Merge branch 'staging' of https://github.com/Bronya-Rand/SillyTavern into staging
2023-12-05 03:00:28 -06:00
Bronya Rand
537e9428e0
proper revert cuz vsc revert weird...
2023-12-05 03:00:26 -06:00
Bronya Rand
3c72463c34
Merge branch 'staging' of https://github.com/Bronya-Rand/SillyTavern into staging
2023-12-05 02:56:56 -06:00
Bronya Rand
f9ecc77b10
revert changes after cohee fix
2023-12-05 02:56:52 -06:00
Bronya Rand
c49f1555ea
update ze html
2023-12-04 18:47:56 -06:00
Bronya Rand
d6649bf7d0
update nums
2023-12-04 18:44:49 -06:00
Bronya Rand
5adfd107c0
Merge branch 'staging' of https://github.com/Bronya-Rand/SillyTavern into staging
2023-12-04 18:43:39 -06:00
Bronya Rand
0c6885a453
fix comments and debug text
2023-12-04 18:40:33 -06:00
Cohee
42c2170b6e
AND => AND ONE, fix comments
2023-12-05 02:28:04 +02:00
Cohee
6b0cca2532
Add NOT ONE selective logic
2023-12-05 02:20:35 +02:00
valadaptive
a457484c2d
Move character endpoints into their own module
2023-12-04 17:35:06 -05:00
valadaptive
17959a60a4
Remove charactersPath and chatsPath
...
We already have these paths in the DIRECTORIES constant.
2023-12-04 17:35:06 -05:00
valadaptive
b689b8bd30
Rename character API endpoints
...
Precursor to moving the character API into its own module
2023-12-04 17:35:06 -05:00
Cohee
45730d4766
Merge pull request #1464 from valadaptive/stable-diffusion-router
...
Use Express router for stable diffusion endpoint
2023-12-05 00:33:43 +02:00
Cohee
1ade0fda11
Merge branch 'staging' into stable-diffusion-router
2023-12-05 00:25:24 +02:00
Cohee
60083b2a35
Merge pull request #1466 from valadaptive/tokenizers-router
...
Use Express router for tokenizers endpoint
2023-12-05 00:24:38 +02:00
Cohee
b287d5f3bd
Merge branch 'staging' into tokenizers-router
2023-12-05 00:19:44 +02:00
Cohee
d2e8646ef9
Merge pull request #1468 from valadaptive/vectors-router
...
Use Express router for vectors endpoint
2023-12-05 00:19:14 +02:00
Cohee
21e19674b4
Merge branch 'staging' into vectors-router
2023-12-05 00:15:36 +02:00
Cohee
b171f0a868
Merge pull request #1467 from valadaptive/translate-router
...
Use Express router for translate endpoint
2023-12-05 00:13:44 +02:00
Cohee
444f67e930
Merge branch 'staging' into translate-router
2023-12-05 00:11:06 +02:00
Cohee
5fa81ec37c
Merge pull request #1465 from valadaptive/thumbnails-router
...
Use Express router for thumbnails endpoint
2023-12-05 00:10:12 +02:00
Cohee
eb273ced59
Merge branch 'staging' into thumbnails-router
2023-12-05 00:08:15 +02:00
Bronya Rand
a90fe54e5b
bak should not be here
2023-12-04 16:05:05 -06:00
Cohee
29476557d8
Merge pull request #1463 from valadaptive/sprites-router
...
Use Express router for sprites endpoint
2023-12-05 00:02:56 +02:00
Cohee
9d0a0bc139
Merge branch 'staging' into sprites-router
2023-12-05 00:01:03 +02:00
Bronya Rand
f71b83b14f
add comment on new code and add () for logic checks
2023-12-04 16:00:02 -06:00
Cohee
fbd4e32caa
Merge pull request #1462 from valadaptive/serpapi-router
...
Use Express router for serpapi endpoint
2023-12-04 23:59:26 +02:00
Cohee
2acb7d1ae5
Merge branch 'staging' into serpapi-router
2023-12-04 23:57:23 +02:00
Bronya Rand
085daaeff7
simplify and proper NOT check fix
2023-12-04 15:57:04 -06:00
Cohee
1dab76ccdf
Merge pull request #1461 from valadaptive/secrets-router
...
Use Express router for secrets endpoint
2023-12-04 23:56:34 +02:00
Cohee
1eb6f33e8b
Merge branch 'staging' into secrets-router
2023-12-04 23:54:54 +02:00
Cohee
56da2d1f81
Merge pull request #1460 from valadaptive/presets-router
...
Use Express router for presets endpoint
2023-12-04 23:53:58 +02:00
Cohee
6fc0e485cd
Merge branch 'staging' into presets-router
2023-12-04 23:51:08 +02:00
Cohee
9a50036657
Merge pull request #1459 from valadaptive/openai-router
...
Use Express router for openai endpoint
2023-12-04 23:50:13 +02:00
Cohee
32c3c34e4b
Merge branch 'staging' into openai-router
2023-12-04 23:45:50 +02:00
Cohee
ce1fb8a888
Merge pull request #1458 from valadaptive/novelai-router
...
Use Express router for novelai endpoint
2023-12-04 22:23:27 +02:00
Cohee
dca470c9e9
Merge branch 'staging' into novelai-router
2023-12-04 22:14:46 +02:00
Cohee
9c9b600403
Merge pull request #1457 from valadaptive/horde-router
...
Use Express router for horde endpoint
2023-12-04 22:12:38 +02:00
Cohee
6fd6d4fc4d
Merge branch 'staging' into horde-router
2023-12-04 22:07:39 +02:00
