Commit Graph

125 Commits

Author SHA1 Message Date
Elyor Djalilov
6601be3da6 configured input phone 2022-09-07 22:56:40 +05:00
Elyor Djalilov
b101e5159c component with react-phone-Input-2 2022-09-07 19:53:27 +05:00
49c17996e6 Web: Client: Components: Restored PhoneInput component 2022-09-06 17:19:02 +03:00
ae2a6726cf Merge branch 'develop' into feature/phone-input 2022-09-06 14:31:34 +03:00
Artem Tarasov
a845244ee0 Merge branch 'develop' into feature/login-ssr 2022-09-01 01:51:29 +03:00
Artem Tarasov
3e34505eed Web: Login/Components: fixed styles 2022-09-01 01:14:24 +03:00
Artem Tarasov
04122f64fa Web: Components/Common: added LoginStore support 2022-08-31 17:33:58 +03:00
TimofeyBoyko
34557b2e40 Merge branch 'develop' into feature/accounts-list 2022-08-31 16:31:29 +03:00
Artem Tarasov
4ac1eb4c5c Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/Badges.js
#	packages/client/src/components/IndicatorLoader/index.js
#	packages/client/src/components/QuickButtons.js
#	packages/client/src/components/panels/UploadPanel/SubComponents/LoadingButton.js
#	packages/client/src/pages/About/AboutContent.js
#	packages/client/src/pages/Confirm/sub-components/activateEmail.js
#	packages/client/src/pages/Home/InfoPanel/Header/index.js
#	packages/client/src/pages/VersionHistory/Section/Body/VersionBadge.js
#	packages/client/src/store/TargetUserStore.js
#	packages/common/components/ColorTheme/ColorTheme.js
#	packages/common/components/FilterInput/sub-components/FilterBlockItem.js
#	packages/common/components/FilterInput/sub-components/FilterButton.js
#	packages/common/components/FloatingButton/FloatingButton.js
#	packages/common/components/Navigation/sub-components/item.js
#	packages/common/store/AuthStore.js
#	packages/components/badge/index.js
#	packages/components/button/index.js
#	packages/components/calendar/index.js
#	packages/components/catalog-item/index.js
#	packages/components/combobox/sub-components/combo-button.js
#	packages/components/input-block/index.js
#	packages/components/main-button/index.js
#	packages/components/submenu/index.js
#	packages/components/tabs-container/index.js
#	packages/components/text-input/text-input.js
#	packages/components/textarea/index.js
#	packages/components/toggle-button/index.js
#	packages/login/src/Login.jsx
2022-08-31 16:25:55 +03:00
370696aba0 Web: Fixed property name for ColorTheme component, changed type => themeId 2022-08-31 15:38:39 +03:00
58c2b8b392 Merge branch 'develop' into bugfix/init-reset-stores 2022-08-31 11:42:02 +03:00
TimofeyBoyko
8bda52c489 Merge branch 'develop' into feature/accounts-list 2022-08-31 11:38:34 +03:00
TimofeyBoyko
52629d16df Web:Common:Filter: add support dark theme 2022-08-31 11:28:17 +03:00
Artem Tarasov
dc30ee143a Web: Client/Common/Components: changed prop name type to elementType in ColorTheme component 2022-08-31 02:20:25 +03:00
Artem Tarasov
0621fd9c86 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/components/dialogs/ConnectDialog/index.js
#	packages/login/src/Login.jsx
#	packages/login/src/client/components/sub-components/forgot-password-modal-dialog.tsx
#	packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
#	yarn.lock
2022-08-30 18:38:12 +03:00
db4e491ea9 Web: Files: fixed InfiniteLoaderComponent height 2022-08-30 15:41:09 +03:00
a786e19afa Web: Components: fixed InfiniteLoaderComponent crash 2022-08-30 14:37:58 +03:00
58424f1674 Components: TableContainer: add showSettings prop 2022-08-30 14:30:23 +03:00
d0da69a74b
Merge branch 'develop' into feature/settings-menu 2022-08-30 12:11:59 +03:00
Vlada Gazizova
2f822b0406
Merge branch 'develop' into feature/settings-common 2022-08-29 22:27:08 +03:00
899d7372d4 Web:Components:Add SliderTheme. 2022-08-29 21:43:25 +03:00
TimofeyBoyko
2c3dd7276d Merge branch 'develop' into feature/accounts-list 2022-08-29 18:22:45 +03:00
dc235a5bc9
Merge branch 'develop' into feature/create-room 2022-08-29 17:15:20 +03:00
mushka
4f1e8b860a added hover styles to iconCropper delete button 2022-08-29 16:47:32 +03:00
69ecaa8df4 Merge branch 'develop' into feature/settings-menu 2022-08-29 16:37:58 +03:00
66c25727a8 Web:Components:Fix styles catalog-item. 2022-08-29 16:16:09 +03:00
mushka
ec59b3aa55 added colors to dark theme and updated base 2022-08-29 13:42:34 +03:00
8abc7f4095 Merge branch 'develop' into feature/inifinite-scroll 2022-08-29 09:51:34 +03:00
TimofeyBoyko
937d99249e Merge branch 'develop' into feature/accounts-list 2022-08-29 09:47:42 +03:00
Vlada Gazizova
302e2e655a
Merge branch 'develop' into feature/settings-common 2022-08-27 12:17:44 +03:00
mushka
0ce6bab3ef started adding colors for dark theme 2022-08-27 00:57:05 +03:00
mushka
d227b98929 added base theme colors 2022-08-27 00:51:22 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
mushka
28f177e842 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-08-26 19:19:35 +03:00
ed5f62a877 Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
2022-08-26 18:48:20 +03:00
7868342e05 Web:Components: Change catalogItem fontSize for tablet. 2022-08-26 16:41:25 +03:00
3a3a3bbc76 Web: Fixed styles. 2022-08-26 11:35:57 +03:00
TimofeyBoyko
18cad0911c Merge branch 'develop' into feature/accounts-list 2022-08-26 06:56:29 +03:00
mushka
8f97d050c1 fix unsexpected modalDialog closing when dragging mouse outside of content 2022-08-25 18:55:15 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
mushka
eb503c292f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop 2022-08-25 12:25:57 +03:00
mushka
7b90fae579 added isDefault prop to tag and styles for it 2022-08-25 06:03:19 +03:00
814cb2c515 Web: Files: Tiles: fixed rooms styles 2022-08-24 14:09:58 +03:00
f37f355a41 Web: Components: fixed renderRow 2022-08-24 11:28:13 +03:00
Artem Tarasov
6f9120ee03 Merge branch 'develop' into feature/login-ssr
# Conflicts:
#	packages/client/src/store/TargetUserStore.js
#	packages/common/store/AuthStore.js
#	packages/common/store/SettingsStore.js
#	packages/common/utils/index.ts
#	packages/login/src/Login.jsx
#	packages/login/src/RoomsLogin.jsx
2022-08-24 10:17:39 +03:00
TimofeyBoyko
7042dca053 Merge branch 'develop' into feature/system-plugin-v2 2022-08-23 14:38:45 +03:00
cdc11afb81 Web:Components:Change the styles of the tabsContainer. 2022-08-23 13:50:14 +03:00
00ef98d972 Web:Components:Change the styles of the submenu. 2022-08-23 13:49:36 +03:00
cc31520a53 Web:Components: Change the styles of the main button. 2022-08-23 13:49:08 +03:00
2d9972aefe Web:Components: Change theme for mainButton, tabsContainer, fieldContainer. 2022-08-23 13:43:54 +03:00