DocSpace-client/packages
Elyor Djalilov fca9c7a815 Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/public/locales/ar-SA/People.json
#	packages/client/public/locales/ar-SA/PeopleTranslations.json
#	packages/client/public/locales/az/People.json
#	packages/client/public/locales/az/PeopleTranslations.json
#	packages/client/public/locales/bg/People.json
#	packages/client/public/locales/bg/PeopleTranslations.json
#	packages/client/public/locales/cs/People.json
#	packages/client/public/locales/cs/PeopleTranslations.json
#	packages/client/public/locales/de/People.json
#	packages/client/public/locales/de/PeopleTranslations.json
#	packages/client/public/locales/el-GR/People.json
#	packages/client/public/locales/el-GR/PeopleTranslations.json
#	packages/client/public/locales/en/PeopleTranslations.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/es/People.json
#	packages/client/public/locales/es/PeopleTranslations.json
#	packages/client/public/locales/fi/People.json
#	packages/client/public/locales/fi/PeopleTranslations.json
#	packages/client/public/locales/fr/People.json
#	packages/client/public/locales/fr/PeopleTranslations.json
#	packages/client/public/locales/hy-AM/People.json
#	packages/client/public/locales/hy-AM/PeopleTranslations.json
#	packages/client/public/locales/it/People.json
#	packages/client/public/locales/it/PeopleTranslations.json
#	packages/client/public/locales/ja-JP/People.json
#	packages/client/public/locales/ja-JP/PeopleTranslations.json
#	packages/client/public/locales/ko-KR/People.json
#	packages/client/public/locales/ko-KR/PeopleTranslations.json
#	packages/client/public/locales/lo-LA/People.json
#	packages/client/public/locales/lv/People.json
#	packages/client/public/locales/lv/PeopleTranslations.json
#	packages/client/public/locales/nl/People.json
#	packages/client/public/locales/nl/PeopleTranslations.json
#	packages/client/public/locales/pl/People.json
#	packages/client/public/locales/pl/PeopleTranslations.json
#	packages/client/public/locales/pt-BR/People.json
#	packages/client/public/locales/pt-BR/PeopleTranslations.json
#	packages/client/public/locales/pt/People.json
#	packages/client/public/locales/pt/PeopleTranslations.json
#	packages/client/public/locales/ro/People.json
#	packages/client/public/locales/ro/PeopleTranslations.json
#	packages/client/public/locales/ru/People.json
#	packages/client/public/locales/ru/PeopleTranslations.json
#	packages/client/public/locales/ru/Profile.json
#	packages/client/public/locales/ru/Settings.json
#	packages/client/public/locales/sk/People.json
#	packages/client/public/locales/sk/PeopleTranslations.json
#	packages/client/public/locales/sl/People.json
#	packages/client/public/locales/sl/PeopleTranslations.json
#	packages/client/public/locales/tr/People.json
#	packages/client/public/locales/tr/PeopleTranslations.json
#	packages/client/public/locales/uk-UA/People.json
#	packages/client/public/locales/uk-UA/PeopleTranslations.json
#	packages/client/public/locales/vi/People.json
#	packages/client/public/locales/vi/PeopleTranslations.json
#	packages/client/public/locales/zh-CN/People.json
#	packages/client/public/locales/zh-CN/PeopleTranslations.json
#	packages/client/src/components/FilesPanels/index.js
#	packages/client/src/components/dialogs/LogoutAllSessionDialog/index.js
#	packages/client/src/components/dialogs/LogoutSessionDialog/index.js
#	packages/client/src/components/dialogs/index.js
#	packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
#	packages/client/src/pages/Profile/Section/Body/sub-components/active-session/index.js
#	packages/client/src/store/DialogsStore.js
#	packages/client/src/store/SelectionPeopleStore.js
#	packages/client/src/store/SettingsSetupStore.js
#	packages/shared/themes/base.ts
#	packages/shared/themes/dark.ts
#	public/locales/ar-SA/Common.json
#	public/locales/az/Common.json
#	public/locales/bg/Common.json
#	public/locales/cs/Common.json
#	public/locales/de/Common.json
#	public/locales/el-GR/Common.json
#	public/locales/en/Common.json
#	public/locales/es/Common.json
#	public/locales/fi/Common.json
#	public/locales/fr/Common.json
#	public/locales/hy-AM/Common.json
#	public/locales/it/Common.json
#	public/locales/ja-JP/Common.json
#	public/locales/ko-KR/Common.json
#	public/locales/lo-LA/Common.json
#	public/locales/lv/Common.json
#	public/locales/nl/Common.json
#	public/locales/pl/Common.json
#	public/locales/pt-BR/Common.json
#	public/locales/pt/Common.json
#	public/locales/ro/Common.json
#	public/locales/ru/Common.json
#	public/locales/sk/Common.json
#	public/locales/sl/Common.json
#	public/locales/tr/Common.json
#	public/locales/uk-UA/Common.json
#	public/locales/vi/Common.json
#	public/locales/zh-CN/Common.json
2024-05-02 18:45:36 +05:00
..
client Merge branch 'develop' into feature/active-sessions 2024-05-02 18:45:36 +05:00
components/table-container
doceditor Merge branch 'hotfix/v2.5.1' into develop 2024-05-02 15:05:36 +04:00
login Merge branch 'hotfix/v2.5.1' into develop 2024-05-02 15:05:36 +04:00
management Web: Management: Backup. fixed crash 2024-04-22 16:11:03 +05:00
shared Merge branch 'hotfix/v2.5.1' into develop 2024-05-02 15:05:36 +04:00