2690 Commits

Author SHA1 Message Date
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
Bronya Rand
a90fe54e5b bak should not be here 2023-12-04 16:05:05 -06:00
Bronya Rand
f71b83b14f add comment on new code and add () for logic checks 2023-12-04 16:00:02 -06:00
Bronya Rand
085daaeff7 simplify and proper NOT check fix 2023-12-04 15:57:04 -06: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
Cohee
2a44af7ff4
Merge pull request #1456 from valadaptive/extensions-router
Use Express router for extensions endpoint
2023-12-04 21:55:22 +02:00
Cohee
aff821aa07 Fix discovery endpoint route 2023-12-04 21:54:03 +02:00
Cohee
3085dbe12c Merge branch 'staging' into extensions-router 2023-12-04 21:51:00 +02:00
Cohee
0b13033ab8
Merge pull request #1455 from valadaptive/content-manager-router
Use Express router for content endpoint
2023-12-04 21:49:02 +02:00
Cohee
d22d0c7cc2 Merge branch 'staging' into content-manager-router 2023-12-04 21:46:25 +02:00
Cohee
88396935cd
Merge pull request #1454 from valadaptive/classify-router
Use Express router for classify endpoint
2023-12-04 21:42:40 +02:00
Cohee
a2387130f3 Merge branch 'staging' into classify-router 2023-12-04 21:39:39 +02:00
Cohee
c0cf274e6f
Merge pull request #1453 from valadaptive/caption-router
Use Express router for caption endpoint
2023-12-04 21:38:12 +02:00
Cohee
1d4ac50fd7 Merge branch 'staging' into caption-router 2023-12-04 21:31:01 +02:00
Cohee
ddd16c1469
Merge pull request #1452 from valadaptive/assets-router
Use Express router for assets + "files" endpoints
2023-12-04 21:29:52 +02:00
Cohee
1ac494d468 Don't attempt to send files on dry runs. 2023-12-04 21:28:36 +02:00
Cohee
8db1a719b8
Merge pull request #1451 from valadaptive/curly-spacing
Enable object-curly-spacing lint
2023-12-04 21:00:43 +02:00
Cohee
3ad7d5d520 Negotiate formatting with VS Code autoformat 2023-12-04 20:59:11 +02:00
valadaptive
e6b549bc48 Use Express router for novelai endpoint 2023-12-04 12:52:27 -05:00
valadaptive
2e990bf336 Use Express router for horde endpoint 2023-12-04 12:51:02 -05:00
valadaptive
babe9abbe9 Use Express router for extensions endpoint 2023-12-04 12:48:29 -05:00
valadaptive
4c911d3155 Use Express router for content endpoint 2023-12-04 12:47:38 -05:00
valadaptive
0ad753f317 Use Express router for classify endpoint 2023-12-04 12:45:17 -05:00
valadaptive
d2e1577acb Use Express router for caption endpoint 2023-12-04 12:43:37 -05:00
valadaptive
d24c1dde10 Use Express router for assets + "files" endpoints
I've split out the "file/upload" endpoint into its own module, and
renamed it to "files" to be consistent with the existing naming scheme.
2023-12-04 12:40:53 -05:00
valadaptive
5f1bed1e70 Enable object-curly-spacing lint 2023-12-04 12:32:41 -05:00
Cohee
414c9bd5fb
Merge pull request #1450 from valadaptive/express-common
Move parsers into shared "express-common" module
2023-12-04 19:28:55 +02:00
Cohee
893ca25199 lint: format 2023-12-04 19:12:41 +02:00
Cohee
95ef108e84 Merge branch 'staging' into express-common 2023-12-04 19:09:20 +02:00
Cohee
d6fdafcacf
Merge pull request #1448 from valadaptive/sd-next-upscalers
Rename sd-next/upscalers to sd/sd-next/upscalers
2023-12-04 19:08:26 +02:00
Cohee
fcbfdc70af Merge branch 'staging' into sd-next-upscalers 2023-12-04 19:07:34 +02:00
Cohee
cce89dab05
Merge pull request #1449 from valadaptive/tokenizer-renames
Rename tokenizer endpoints
2023-12-04 19:06:49 +02:00
Cohee
8476ec7570 Merge branch 'staging' into tokenizer-renames 2023-12-04 19:01:38 +02:00
Cohee
a846bb3f43
Merge pull request #1447 from valadaptive/viewsecrets-rename
Rename /viewsecrets to /api/secrets/view
2023-12-04 18:54:37 +02:00
Cohee
4bbb36a601 Merge branch 'staging' into viewsecrets-rename 2023-12-04 18:49:01 +02:00
Cohee
8bf18891b3 Add data model field for WI entry group 2023-12-04 18:47:35 +02:00
Cohee
11a60e5eec
Merge pull request #1446 from valadaptive/move-endpoints
Move endpoints into their own folder
2023-12-04 18:46:59 +02:00
valadaptive
3931f791b2 Move parsers into express-common module
This will allow endpoint modules to import them themselves, instead of
requiring server.js to pass them in.
2023-12-04 10:25:40 -05:00
valadaptive
4919a2e9a2 Move endpoints into their own folder 2023-12-04 10:24:21 -05:00
valadaptive
9d4990d25d Rename sd-next/upscalers to sd/next/upscalers 2023-12-04 10:22:47 -05:00
valadaptive
57bc95133e Rename tokenizer routes
They're all under tokenizers/ now, and there are "count", "encode", and
"decode" endpoints. This forms a clearer hierarchy.
2023-12-04 10:17:43 -05:00
valadaptive
c073a89e2c Move endpoints into their own folder 2023-12-04 10:17:43 -05:00