Commit Graph

12 Commits

Author SHA1 Message Date
a639635c98 Merge branch 'develop' into feature/ldap-settings
# Conflicts:
#	packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
#	packages/login/src/components/LoginForm/index.tsx
#	packages/shared/store/SettingsStore.ts
#	public/locales/en/Common.json
2024-06-17 15:17:07 +04:00
a78086c680 Shared: add captchaKey and captchaType for login 2024-06-13 10:38:15 +03:00
de9a5124bf Merge branch 'develop' into feature/ldap-settings
# Conflicts:
#	packages/login/src/components/LoginForm/index.tsx
#	packages/shared/api/user/index.js
2024-05-28 18:47:54 +04:00
fa9dd76fcd LDAP: Added LDAP login with original password by checkbox 2024-05-14 15:49:55 +04:00
d4f66f20de Merge branch 'release/v2.5.0' into feature/language-combobox
# Conflicts:
#	packages/client/src/components/NavMenu/sub-components/header-unauth.js
#	packages/login/src/client/components/Login.tsx
#	packages/login/src/client/components/sub-components/LoginForm.tsx
#	packages/login/src/server/lib/helpers/index.ts
#	packages/shared/api/user/index.js
#	packages/shared/utils/common.ts
2024-04-18 11:52:48 +03:00
22c73d5bfa Login/Shared: Added support for changing the language when logging in via social networks. 2024-04-17 13:38:59 +03:00
918daa782c Web: Added changing the language without reloading the page. 2024-04-16 16:12:02 +03:00
e998e52e49 Shared: API: add skip logout 2024-04-10 15:01:25 +03:00
c9234fec72 Replaced copyright start year + format 2024-03-21 18:09:55 +04:00
11b4f67041 Shared: apply yarn eslint:fix 2024-03-18 12:54:09 +03:00
adcc11094d Copyright 2024 2024-03-18 03:13:02 +04:00
7a2709b1f6 Shared:Utils:Common\Api: move from common and rewrite to typescript 2024-01-14 09:13:04 +03:00