Commit Graph

1599 Commits

Author SHA1 Message Date
Yannic Kilcher bcc73d6e02 fixed encoding header 2023-01-02 16:52:31 +01:00
Yannic Kilcher 07c62c925b Merge branch 'main' of github.com:LAION-AI/Open-Chat-GPT 2023-01-02 16:38:42 +01:00
Yannic Kilcher 9fd201ded5 added verify-lobby script 2023-01-02 16:38:38 +01:00
Andrew Maguire c5a0df636f Merge remote-tracking branch 'upstream/main' into add-devcontainer 2023-01-02 15:20:24 +00:00
chandru 19502cf8bf added clear list for more understanding of result 2023-01-02 19:34:37 +05:30
Keith Stevens 40b6aa26b2 Merge pull request #271 from othrayte/cypress-e2e-doc
website: Add some new detail to the docs on e2e testing
2023-01-02 21:04:29 +09:00
Adrian Cowan 447a3bce41 website: Add some new detail to the docs on e2e testing 2023-01-02 22:40:51 +11:00
Yannic Kilcher 86e099ae1a Merge pull request #262 from melvinebenezer/trivial_typo
fix: typo in EssayInstructions.md and EssayRevision.md
2023-01-02 11:55:42 +01:00
Yannic Kilcher c489f3ddc5 Merge pull request #253 from AlexanderHOtt/feat/better-docs
Write better documentation for getting started with discord bot development.
2023-01-02 11:44:55 +01:00
Yannic Kilcher 9ed5fbcf76 Merge pull request #252 from bitplane/remove-utf8-coding
Remove utf8 coding pragma from pre-commit and python files
2023-01-02 11:43:59 +01:00
Keith Stevens ad0c48795c Merge pull request #266 from othrayte/website-e2e-tests
Website e2e tests
2023-01-02 19:43:49 +09:00
Adrian Cowan dc1af6e2d8 website: Add e2e tests of ranking replies and prompts
Like the previous commit, these are intended to function as a minimal smoke test that the API interaction with the backend is functional.
2023-01-02 21:13:10 +11:00
Adrian Cowan 32e212b5a5 website: Add e2e tests of creating an assistant/prompter reply
These are intended to function as a minimal smoke test that the API interaction with the backend is functional.
2023-01-02 21:13:10 +11:00
Adrian Cowan 0df6d7fd31 website: more e2e tests for signin
Fixed issue where existing sign in test fails due to the existence of dev test login.

Added reusable cy.signInWithEmail() to login before testing rest of UI.
2023-01-02 21:13:10 +11:00
Yannic Kilcher a196af7ca8 Merge pull request #249 from bitplane/docker-compose-context
Add context to compose file so it runs in older "docker-compose"
2023-01-02 11:06:02 +01:00
Yannic Kilcher 695677238a Merge pull request #247 from bitplane/pre-commit-changes-doc
Add warning + advice to .pre-commit-config.yaml
2023-01-02 10:59:15 +01:00
Desmond Grealy 5f3d32b875 Merge branch 'main' into dark-mode-implementation 2023-01-02 00:49:03 -08:00
AbdBarho 9902e013b2 Use Chakra UI for Messages 2023-01-02 08:26:33 +01:00
James Melvin 2ff6108047 fix: typo in EssayInstructions.md and EssayRevision.md 2023-01-02 12:43:37 +05:30
Desmond Grealy 97625a8398 Theme implementation which does not rely on the Chakra Container component, which is for contianing width (and buggy). Last commit before pulling in latest to resolve merge confilicts, and continue to fix the survey pages. 2023-01-01 23:12:37 -08:00
Keith Stevens 2d98259280 Merge pull request #189 from BitterKanegul/42-implement-text-labels-web-frontend
#42 Adding popover to flag text with labels
2023-01-02 14:25:11 +09:00
Keith Stevens 53ab8fb479 Adding a bare bones unstyled terms of service and privacy policy 2023-01-02 14:21:39 +09:00
BitterKanegul 74396f79ba Add precommit fixes 2023-01-02 10:26:03 +05:30
BitterKanegul 725dededbd Add npm build fixes for types 2023-01-02 10:17:13 +05:30
BitterKanegul d36f2e4ec5 Change submitResponse function 2023-01-02 10:01:26 +05:30
Bobak Hashemi 34ab948ade testing rankgen integration into instructor trainer 2023-01-01 23:30:12 -05:00
BitterKanegul 3da5d11883 Add ESLint fixes 2023-01-02 09:52:24 +05:30
BitterKanegul e81c3cd3bb Incorporate review comments 2023-01-02 09:11:57 +05:30
BitterKanegul 260177ed1c Fix float 2023-01-02 09:11:57 +05:30
BitterKanegul fa5fc377ec Run prettier 2023-01-02 09:11:57 +05:30
BitterKanegul dfcbbee444 Adding popover to flag text with labels 2023-01-02 09:11:57 +05:30
Alex Ott 8e831f897f fix invite link 2023-01-01 17:06:54 -08:00
Alex Ott c2a0a34f82 merge main 2023-01-01 17:05:23 -08:00
Alex Ott 1d97bbc6c9 Merge remote-tracking branch 'upstream/main' 2023-01-01 17:01:50 -08:00
Desmond Grealy 6299f3673e Add an icon-based toggle. Fix alignment of items in header. Keeping unused 'ColorModeSwitch' component for now. 2023-01-01 17:01:47 -08:00
Alex Ott 8d9f3c80af update readme with a better getting started guide 2023-01-01 17:00:24 -08:00
kiritowu 5daadd6977 Add TOO_MANY_REQUEST to OasstErrorCode 2023-01-02 08:09:35 +08:00
kiritowu 144a5bc424 Initialise redis connection for Fastapi limiter 2023-01-02 08:04:59 +08:00
kiritowu 4e9a3ee292 Add fastapi-limiter to requirements.txt 2023-01-02 08:02:35 +08:00
Gareth Davidson 7000e10bc0 apply pre-commit rules 2023-01-02 00:01:45 +00:00
Desmond Grealy 862a0ac3fd border-bottom should be configurable and off for transparent 2023-01-01 15:57:19 -08:00
Gareth Davidson 6ad8310332 Remove encoding pragma, unnecessary in Python 3
Python 2 is dead so dunno why --remove is not the default
2023-01-01 23:57:15 +00:00
Andrew Maguire 30fe045de9 add newline 2023-01-01 23:52:22 +00:00
Andrew Maguire 0009f5b5d8 use frontend-dev in devcontainer 2023-01-01 23:30:48 +00:00
Andrew Maguire 1b081b5641 add context to docker compose and service 2023-01-01 23:28:24 +00:00
Gareth Davidson 1a370ae320 remove workaround instructions from README.md 2023-01-01 23:03:33 +00:00
Gareth Davidson 0b1059f53e fix compose file so it runs in both "docker-compose" and "docker compose" 2023-01-01 23:03:07 +00:00
Gareth Davidson 4f9834b5a6 add warning to .pre-commit-config.yaml
As per discussion on #212
2023-01-01 22:49:23 +00:00
Andrew Maguire c4b61bf84c apt-get 2023-01-01 22:24:45 +00:00
Andrew Maguire 229e7c7b0c try install docker-compose-plugin 2023-01-01 22:23:38 +00:00