Commit Graph

3829 Commits

Author SHA1 Message Date
NFish
457a9e56af Merge branch 'feat/auth-methods' into test/new-login-testing 2024-10-18 17:57:16 +08:00
NFish
1bbe0c5834 fix: use 'code' as the unique key for errors 2024-10-18 17:56:09 +08:00
NFish
e93473b68f Merge branch 'feat/auth-methods' into test/new-login-testing 2024-10-18 16:48:24 +08:00
NFish
8b7f7c836b fix: page will redirect to /apps when request account page 2024-10-18 16:47:50 +08:00
NFish
28ca19fd36 Merge branch 'test/new-login-testing' of github.com:langgenius/dify into test/new-login-testing 2024-10-18 15:41:06 +08:00
NFish
f31d05774a Merge branch 'feat/auth-methods' into test/new-login-testing 2024-10-18 15:40:51 +08:00
NFish
e1deeac706 fix: check if setup is finished before validating access_token 2024-10-18 15:38:38 +08:00
Joe
c23ae26dbb Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: ignore error
2024-10-18 15:20:44 +08:00
Joe
e78634e2b0 feat: ignore error 2024-10-18 15:20:27 +08:00
NFish
c3a3a69212 Merge branch 'test/new-login-testing' of github.com:langgenius/dify into test/new-login-testing 2024-10-18 15:07:17 +08:00
NFish
0406f7f697 Merge branch 'feat/auth-methods' into test/new-login-testing 2024-10-18 15:07:04 +08:00
Joe
12c10d12c0 Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  chore: lint
2024-10-18 15:05:45 +08:00
Joe
380c40cd04 chore: lint 2024-10-18 15:05:27 +08:00
Joe
05649fa859 Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: update resets
2024-10-18 15:02:48 +08:00
Joe
d2a65d3bf8 feat: update resets 2024-10-18 15:02:30 +08:00
Joe
057fff7dba Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: add new guy redirect resets
2024-10-18 14:39:47 +08:00
Joe
9f7a929e94 feat: add new guy redirect resets 2024-10-18 14:39:20 +08:00
NFish
eb83336bc9 fix: remove console.log 2024-10-18 14:32:43 +08:00
Joe
7aa95614f8 Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: update mail template; feat: add redirect
2024-10-18 14:16:45 +08:00
Joe
50435b84e2 feat: update mail template;
feat: add redirect
2024-10-18 14:16:14 +08:00
Joe
c05685ea03 Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: add class variable
2024-10-18 11:42:34 +08:00
Joe
91477e1400 feat: add class variable 2024-10-18 11:42:14 +08:00
Joe
38f954abe6 Merge branch 'feat/new-login' into test/new-login-testing
Some checks are pending
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
* feat/new-login:
  fix: _fulfill_login_params_from_env error
2024-10-17 18:42:14 +08:00
Joe
4dd823d97a fix: _fulfill_login_params_from_env error 2024-10-17 18:41:58 +08:00
Joe
1690a7cad8 Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: update control
  chore: update MAX_VARIABLE_SIZE
  chore: update MAX_VARIABLE_SIZE
2024-10-17 18:23:14 +08:00
Joe
f9268651cb feat: update control 2024-10-17 18:22:54 +08:00
Joe
8965498f75 chore: update MAX_VARIABLE_SIZE 2024-10-17 17:56:19 +08:00
Joe
c1f059589b chore: update MAX_VARIABLE_SIZE 2024-10-17 17:54:59 +08:00
Joe
7b91d6868c Merge branch 'feat/new-login' into test/new-login-testing
Some checks are pending
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
* feat/new-login:
  chore: remove extra config and init login type
2024-10-17 17:53:17 +08:00
Joe
d848effedd chore: remove extra config and init login type 2024-10-17 17:51:48 +08:00
Joe
211a84f600 Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: update frozen
2024-10-17 17:16:11 +08:00
Joe
07ec7e0f3e feat: update frozen 2024-10-17 17:15:58 +08:00
Joe
e09953a9fc Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login: (30 commits)
  feat: add init login type
  fix https://github.com/langgenius/dify/issues/9409 (#9433)
  update dataset clean rule (#9426)
  add clean 7 days datasets (#9424)
  fix: resolve overlap issue with API Extension selector and modal (#9407)
  refactor: update the default values of top-k parameter in vdb to be consistent (#9367)
  fix: incorrect webapp image displayed (#9401)
  Fix/economical knowledge retrieval (#9396)
  feat: add timezone conversion for time tool (#9393)
  fix: Deprecated gemma2-9b model in Fireworks AI Provider (#9373)
  feat: storybook (#9324)
  fix: use gpt-4o-mini for validating credentials (#9387)
  feat: Enable baiduvector intergration test (#9369)
  fix: remove the stream option of zhipu and gemini (#9319)
  fix: add missing vikingdb param in docker .env.example (#9334)
  feat: add minimax abab6.5t support (#9365)
  fix: (#9336 followup) skip poetry preperation in style workflow when no change in api folder (#9362)
  feat: add glm-4-flashx, deprecated chatglm_turbo (#9357)
  fix: Azure OpenAI o1 max_completion_token and get_num_token_from_messages error (#9326)
  fix: In the output, the order of 'ta' is sometimes reversed as 'at'. #8015 (#8791)
  ...
2024-10-17 16:39:38 +08:00
Joe
be4b62d5d8 feat: add init login type 2024-10-17 16:39:04 +08:00
NFish
3ff4536745 Merge branch 'feat/auth-methods' into test/new-login-testing 2024-10-17 15:19:05 +08:00
NFish
097486f96b fix: show error tip if reset-password API returns 'account_not_found' error 2024-10-17 15:18:46 +08:00
NFish
ca53141de8 Merge branch 'feat/auth-methods' into test/new-login-testing 2024-10-17 14:19:37 +08:00
NFish
2077e35820 style: update style of the login page when there is no auth methods enabled 2024-10-17 14:19:15 +08:00
Joe
abe6a1bb99 Merge branch 'main' into feat/new-login
* main: (35 commits)
  fix https://github.com/langgenius/dify/issues/9409 (#9433)
  update dataset clean rule (#9426)
  add clean 7 days datasets (#9424)
  fix: resolve overlap issue with API Extension selector and modal (#9407)
  refactor: update the default values of top-k parameter in vdb to be consistent (#9367)
  fix: incorrect webapp image displayed (#9401)
  Fix/economical knowledge retrieval (#9396)
  feat: add timezone conversion for time tool (#9393)
  fix: Deprecated gemma2-9b model in Fireworks AI Provider (#9373)
  feat: storybook (#9324)
  fix: use gpt-4o-mini for validating credentials (#9387)
  feat: Enable baiduvector intergration test (#9369)
  fix: remove the stream option of zhipu and gemini (#9319)
  fix: add missing vikingdb param in docker .env.example (#9334)
  feat: add minimax abab6.5t support (#9365)
  fix: (#9336 followup) skip poetry preperation in style workflow when no change in api folder (#9362)
  feat: add glm-4-flashx, deprecated chatglm_turbo (#9357)
  fix: Azure OpenAI o1 max_completion_token and get_num_token_from_messages error (#9326)
  fix: In the output, the order of 'ta' is sometimes reversed as 'at'. #8015 (#8791)
  refactor: Add an enumeration type and use the factory pattern to obtain the corresponding class (#9356)
  ...
2024-10-17 11:33:33 +08:00
ybalbert001
fdcf87c70c
fix https://github.com/langgenius/dify/issues/9409 (#9433)
Co-authored-by: Yuanbo Li <ybalbert@amazon.com>
2024-10-17 10:47:56 +08:00
Joe
278ebdbba0 Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: update fulfill_params_from_enterprise
2024-10-17 10:40:23 +08:00
Jyong
5aabb83f5a
update dataset clean rule (#9426) 2024-10-17 10:40:22 +08:00
Joe
5c8d149786 feat: update fulfill_params_from_enterprise 2024-10-17 10:40:05 +08:00
Jyong
bd678f9ca1
add clean 7 days datasets (#9424)
Some checks are pending
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
2024-10-16 22:24:50 +08:00
Joe
b2ec90bd5e Merge branch 'test/new-login-testing' of https://github.com/langgenius/dify into test/new-login-testing
Some checks are pending
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
* 'test/new-login-testing' of https://github.com/langgenius/dify:
  add build branch.
2024-10-16 18:16:59 +08:00
Joe
0885a95ec2 Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: update ALLOW_REGISTER default value
2024-10-16 18:16:46 +08:00
Joe
dd1ca37886 feat: update ALLOW_REGISTER default value 2024-10-16 18:16:25 +08:00
DDDDD12138
a87890b3cc
fix: resolve overlap issue with API Extension selector and modal (#9407)
Some checks are pending
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
2024-10-16 17:40:17 +08:00
Garfield Dai
c8ad9fd172 add build branch.
Some checks are pending
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/amd64, build-api-amd64) (push) Waiting to run
Build and Push API & Web / build (api, DIFY_API_IMAGE_NAME, linux/arm64, build-api-arm64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/amd64, build-web-amd64) (push) Waiting to run
Build and Push API & Web / build (web, DIFY_WEB_IMAGE_NAME, linux/arm64, build-web-arm64) (push) Waiting to run
Build and Push API & Web / create-manifest (api, DIFY_API_IMAGE_NAME, merge-api-images) (push) Blocked by required conditions
Build and Push API & Web / create-manifest (web, DIFY_WEB_IMAGE_NAME, merge-web-images) (push) Blocked by required conditions
2024-10-16 17:19:56 +08:00
Joe
a0d8cfc6da Merge branch 'feat/new-login' into test/new-login-testing
* feat/new-login:
  feat: update invite member
2024-10-16 17:16:59 +08:00