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
|
9abb4081f3
|
Web: Common: linkForgotPassword: fix after merge (login-ssr - file hierarchy changed)
|
2022-08-30 18:51:02 +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 |
|
|
|
6b25c3d7af
|
Web: Client: InvitePanel: Added invitePanel at DialogsStore, added translation keys at InviteDialog, fixed adding and deleting operation with invite list, fixed styles of icons
|
2022-08-30 18:08:58 +03:00 |
|
Artem Tarasov
|
bc0e986707
|
Web: Login/Common: added language cookie setting on the server
|
2022-08-30 17:50:54 +03:00 |
|
|
|
50659cdeb9
|
Common: ColorTheme: fix
|
2022-08-30 17:03:45 +03:00 |
|
|
|
e0c1acf111
|
Web: Added features.
|
2022-08-30 16:29:53 +03:00 |
|
|
|
6da7e16e52
|
Merge branch 'develop' into bugfix/init-reset-stores
|
2022-08-30 14:13:58 +03:00 |
|
mushka
|
a1db010869
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-30 14:06:55 +03:00 |
|
|
|
778b27ed5c
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 12:55:38 +03:00 |
|
|
|
d0da69a74b
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-30 12:11:59 +03:00 |
|
TimofeyBoyko
|
b737830e69
|
Web:Common:Api: delete useless code
|
2022-08-30 11:57:06 +03:00 |
|
|
|
5829654183
|
Web:Common:Fix.
|
2022-08-30 10:35:24 +03:00 |
|
|
|
605aee5529
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-30 11:55:19 +05:00 |
|
|
|
60086b1a68
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-30 09:04:22 +03:00 |
|
|
|
38b217d65e
|
Web: Client: InvitePanel: Added user search, added email validation, added editing for manual added items, fixed invite panel state
|
2022-08-30 08:55:19 +03:00 |
|
|
|
e6e45ce2d7
|
Web:Common:Fix.
|
2022-08-29 22:43:29 +03:00 |
|
Vlada Gazizova
|
2f822b0406
|
Merge branch 'develop' into feature/settings-common
|
2022-08-29 22:27:08 +03:00 |
|
|
|
d8d40b1ae1
|
Web:Common:Add SliderTheme, IndicatorLoaderTheme.
|
2022-08-29 21:42:47 +03:00 |
|
|
|
c46fa39060
|
Merge branch 'develop' into bagfix/init-reset-stores
# Conflicts:
# packages/client/src/store/FilesStore.js
# packages/client/src/store/index.Files.js
|
2022-08-29 18:27:33 +03:00 |
|
TimofeyBoyko
|
2c3dd7276d
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-29 18:22:45 +03:00 |
|
|
|
bc14356351
|
Web: Added currencies.
|
2022-08-29 17:46:43 +03:00 |
|
|
|
aca4d65f2b
|
Merge branch 'develop' into feature/oforms-scroll
|
2022-08-29 17:32:48 +03:00 |
|
|
|
dc235a5bc9
|
Merge branch 'develop' into feature/create-room
|
2022-08-29 17:15:20 +03:00 |
|
|
|
69ecaa8df4
|
Merge branch 'develop' into feature/settings-menu
|
2022-08-29 16:37:58 +03:00 |
|
|
|
0359611cf3
|
Merge branch 'develop' into feature/oforms-scroll
|
2022-08-29 16:33:05 +03:00 |
|
|
|
efafaf51d8
|
Web:Common:Fix styles ArticleHeader.
|
2022-08-29 16:15:33 +03:00 |
|
|
|
45935a2ace
|
Web: Change order of loading stores + added reset People/Files stores on logout
|
2022-08-29 13:58:30 +03:00 |
|
|
|
1c660c75e8
|
Web:Client:Fix loader ArticleHeader.
|
2022-08-29 13:49:15 +03:00 |
|
|
|
9154b971c0
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/pages/PortalSettings/index.js
# packages/common/api/settings/index.js
# packages/common/components/Loaders/index.js
|
2022-08-29 13:06:44 +03:00 |
|
mushka
|
18b56dbc3e
|
Merge branch 'develop' into feature/create-room
|
2022-08-29 12:36:47 +03:00 |
|
|
|
3413367480
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-29 12:21:19 +03:00 |
|
|
|
e3e47364e0
|
Merge branch 'develop' into feature/security-history-audit
|
2022-08-29 13:36:09 +05:00 |
|
|
|
24ece95419
|
Web: Fix invalid plugins check on login
|
2022-08-29 11:29:08 +03:00 |
|
|
|
9dfe51c614
|
Web: Common: added oforms filter
|
2022-08-29 11:28:05 +03:00 |
|
|
|
1078c7f138
|
Web: Common: fixed getOforms
|
2022-08-29 11:27:13 +03:00 |
|
TimofeyBoyko
|
8c9db6685c
|
Web:Common:Section: fix section width
|
2022-08-29 10:42:19 +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 |
|
|
|
bbca780d4c
|
Merge branch 'develop' into feature/invite-panel
|
2022-08-29 09:04:37 +03:00 |
|
|
|
4092aa546a
|
Web: Client: Added base invite panel
|
2022-08-29 08:50:37 +03:00 |
|
|
|
eaa4bf40b3
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/public/locales/en/Settings.json
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/index.js
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-28 00:18:48 +03:00 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17:44 +03:00 |
|
Artem Tarasov
|
c7d70c5263
|
Web: Common: ErrorContainer: removed unnecessary init store (fix ssr crash)
|
2022-08-27 01:52:33 +03:00 |
|
Artem Tarasov
|
106152a2a4
|
Web: Login/Common: fixed types
|
2022-08-27 00:49:06 +03:00 |
|
mushka
|
56c2cd64c5
|
Merge branch 'develop' into feature/create-room
|
2022-08-26 19:28:06 +03:00 |
|
mushka
|
b4a23f95b7
|
added isRoom property and calculateIsRoom method to infoPanelStore
|
2022-08-26 19:10:00 +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 |
|
|
|
a5e0f98c66
|
Web: Common: update api for login/audit history
|
2022-08-26 19:21:03 +05:00 |
|
|
|
082614ef85
|
Web:Common:Fix ColorTheme IconButton.
|
2022-08-26 11:30:33 +03:00 |
|
TimofeyBoyko
|
18cad0911c
|
Merge branch 'develop' into feature/accounts-list
|
2022-08-26 06:56:29 +03:00 |
|
mushka
|
50eb4cf072
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-25 21:38:52 +03:00 |
|
mushka
|
8d3a731e60
|
removed for-dev console.log
|
2022-08-25 18:16:03 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
|
|
04fb7ade63
|
Web: People: fixed row styles
|
2022-08-25 10:54:04 +03:00 |
|
TimofeyBoyko
|
674073825e
|
Web:Common:Api: add 'request' func to plugins api
|
2022-08-24 19:53:33 +03:00 |
|
mushka
|
8ddbc66c6f
|
created new RoomsTypeTranslations constant
|
2022-08-24 19:38:03 +03:00 |
|
mushka
|
b8637a31c1
|
added new isRoomsStorage param to saveThirdparty api call
|
2022-08-24 19:35:34 +03:00 |
|
|
|
61ff3cfd15
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe
|
2022-08-24 18:00:33 +03:00 |
|
|
|
e7f3976dbb
|
Web: Fixed login page.
|
2022-08-24 17:59:50 +03:00 |
|
mushka
|
55faeac29e
|
created new loaders for CreateEditRoomDialog
|
2022-08-24 17:57:05 +03:00 |
|
TimofeyBoyko
|
6ac0fe0546
|
Web:Delete useless code
|
2022-08-24 12:57:11 +03:00 |
|
TimofeyBoyko
|
2a2cf185e5
|
Web:Common:SettingsStore: add enablePlugins and pluginOptions
|
2022-08-24 12:33:37 +03:00 |
|
TimofeyBoyko
|
051c9e207a
|
Web:Common:API: move api for plugins from client to common
|
2022-08-24 12:32:26 +03:00 |
|
|
|
6c331a3074
|
Web: Added functionality for the grace period.
|
2022-08-24 10:25:08 +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 |
|
mushka
|
23a5faa0a4
|
cleaned up api/rooms
|
2022-08-23 14:30:16 +03:00 |
|
mushka
|
afc24f98cc
|
added removeLogo api call to api/rooms
|
2022-08-23 14:29:47 +03:00 |
|
|
|
a75f794d3f
|
Web:Components:Change padding for settingsStudio.
|
2022-08-23 13:50:46 +03:00 |
|
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
|
6b592bdd0a
|
Web: The initial value of the number of managers has been changed, the api request has been updated.
|
2022-08-23 11:51:50 +03:00 |
|
TimofeyBoyko
|
4a7be88e5a
|
Web:Common:API: update filter for accounts
|
2022-08-23 11:36:14 +03:00 |
|
Artem Tarasov
|
eba3f4ebe5
|
Web: Common: utils: added types for login func
|
2022-08-22 15:07:11 +03:00 |
|
|
|
1f2cceda94
|
Web: Common: hidden Selecto for infinite scroll
|
2022-08-22 14:38:00 +03:00 |
|
|
|
8e9d2c6d93
|
Web: Common: upgraded react-selecto
|
2022-08-22 14:30:42 +03:00 |
|
|
|
4b35f02578
|
Web: Common: Added that if the sidebar is removed, then remove the alert, the loader is added.
|
2022-08-22 13:19:54 +03:00 |
|
|
|
3854d484a4
|
Web: Added an alert about a free tariff.
|
2022-08-22 11:59:18 +03:00 |
|
|
|
d9c991a88c
|
Web: Added loaders.
|
2022-08-22 09:02:46 +03:00 |
|
|
|
c24c66ecec
|
Web: Added receiving a link for payment if the user has stopped his choice.
|
2022-08-19 18:11:54 +03:00 |
|
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +03:00 |
|
|
|
2925eb27aa
|
Web:Common:Fix.
|
2022-08-19 14:38:36 +03:00 |
|
|
|
e5e1d966d1
|
Web: Files: restored paging, added withPaging parameter
|
2022-08-19 12:37:30 +03:00 |
|
|
|
40f2ef1fc2
|
Web:Common:Fix.
|
2022-08-19 10:00:34 +03:00 |
|
|
|
b7eec9fa1d
|
Web:Common:Fix isVersion error.
|
2022-08-19 10:00:18 +03:00 |
|
|
|
d293be6d57
|
Web:Common:Add LinkTheme.
|
2022-08-19 09:27:04 +03:00 |
|
|
|
9ea79e41a1
|
Web: Added payer container.
|
2022-08-18 18:44:56 +03:00 |
|
|
|
fa01d5bd18
|
Web:Common: Fix currentColorScheme.
|
2022-08-18 17:56:17 +03:00 |
|
|
|
7a83e1d713
|
Web:Common:Changing badge styles.
|
2022-08-18 17:53:35 +03:00 |
|
|
|
457200198a
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-18 15:29:50 +03:00 |
|
|
|
a47c4c09fb
|
Web: Added due date, added date conversion according to page language.
|
2022-08-18 13:47:33 +03:00 |
|
|
|
e78b02cd0b
|
Web: Added portal quota, added translations.
|
2022-08-18 12:28:17 +03:00 |
|
|
|
4e30b65fe4
|
Web: Added getting payment price from api.
|
2022-08-18 11:29:49 +03:00 |
|
|
|
3d93f45ded
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/pages/Confirm/index.js
|
2022-08-18 11:26:04 +03:00 |
|
|
|
8fefd3debb
|
Merge branch 'develop' into feature/create-room
|
2022-08-18 11:25:02 +03:00 |
|
Artem Tarasov
|
1de8c98913
|
Web: Login: added loginUtils, added types
|
2022-08-18 10:51:35 +03:00 |
|
TimofeyBoyko
|
246839378e
|
Web:Common:Navigation: fix styles after changing section header height
|
2022-08-18 10:12:41 +03:00 |
|
TimofeyBoyko
|
ebcc8bc1da
|
Web:Common:Article: increase height of portal logo container
|
2022-08-18 10:11:10 +03:00 |
|
|
|
97796c2941
|
Web:Common:Fix.
|
2022-08-17 18:14:21 +03:00 |
|
|
|
2e2b701df0
|
Web: Common: changed DEFAULT_PAGE_COUNT
|
2022-08-17 17:54:35 +03:00 |
|
|
|
b5c8b1f953
|
Web:Common:Fix MainButton theme.
|
2022-08-17 15:52:16 +03:00 |
|
|
|
166d47c359
|
Web:Common:Fix SubmenuItemLabel theme.
|
2022-08-17 15:51:14 +03:00 |
|
|
|
1ab5666dd1
|
Web:Common:Fix button theme.
|
2022-08-17 15:50:47 +03:00 |
|
|
|
0b1a8bf368
|
Web: Files: fixed infinite-scroll styles
|
2022-08-17 15:11:48 +03:00 |
|
|
|
25355382ed
|
Web:Common:Fix buttonTheme.
|
2022-08-17 14:55:24 +03:00 |
|
|
|
14d743181e
|
Web:Common:Fix InfoPanelToggle, LinkForgotPassword, LoadingButton.
|
2022-08-17 12:20:52 +03:00 |
|
|
|
8f8cb84d9c
|
Web:Common:Fix TextareaTheme, InputBlockTheme, TextInputTheme, ComboButtonTheme.
|
2022-08-17 12:04:58 +03:00 |
|
Artem Tarasov
|
7a211d7134
|
Web: Common: desktop: added check for ssr
|
2022-08-17 11:56:50 +03:00 |
|
|
|
168adb4999
|
Web:Common: Fix VersionBadge.
|
2022-08-17 11:53:45 +03:00 |
|
Artem Tarasov
|
46ca8055f2
|
Web: Common/Components: added checkIsSSR to utils, applied changes
|
2022-08-17 11:19:49 +03:00 |
|
|
|
eead02f968
|
Web:Common: Fix calendar.
|
2022-08-17 11:14:30 +03:00 |
|
|
|
4fb553f589
|
Web:Common: Fix IconWrapper.
|
2022-08-17 11:10:06 +03:00 |
|
|
|
5be3de19dc
|
Web:Common: Fix FilterBlockItemTag.
|
2022-08-17 11:00:41 +03:00 |
|
|
|
15a57d61ae
|
Web:Common:Fix IndicatorTheme.
|
2022-08-17 10:26:40 +03:00 |
|
|
|
bd5b875d25
|
Web:Components:Fix StyledFloatingButton styles.
|
2022-08-17 10:25:12 +03:00 |
|
|
|
dd751ef7f6
|
Web:Common: Fix floatingButton styles.
|
2022-08-17 10:24:41 +03:00 |
|
|
|
e9ee5b118b
|
Web:Common: Delete MainButtonMobileTheme.
|
2022-08-17 10:23:51 +03:00 |
|
Artem Tarasov
|
f21c7812ab
|
Web: Common: the login function is moved to a separate file
|
2022-08-17 10:23:46 +03:00 |
|
|
|
774b445c16
|
Web: Files: fixed removeFiles, fixed filterTotal
|
2022-08-16 16:16:33 +03:00 |
|
|
|
414f3d980a
|
Web:Common:Fix button styles.
|
2022-08-16 13:53:45 +03:00 |
|
|
|
ba260e18a2
|
Web:Common:Fix submenu styles.
|
2022-08-16 13:52:41 +03:00 |
|
|
|
60f15d8a1d
|
Web:Common:Fix IconButtonTheme styles.
|
2022-08-16 13:51:41 +03:00 |
|
|
|
b1d21b4c52
|
Web:Common:Fix CatalogItemTheme styles.
|
2022-08-16 13:49:50 +03:00 |
|
|
|
0d228f7033
|
Web:Common:Fix Badge.
|
2022-08-16 13:48:12 +03:00 |
|
|
|
abb11df755
|
Web:Common:Fix TabsContainerTheme.
|
2022-08-16 13:47:16 +03:00 |
|
|
|
bde4a1f019
|
Web:Common:Fix ToggleButtonTheme.
|
2022-08-16 13:42:31 +03:00 |
|
|
|
d8f041edf8
|
Web:Common:Added IconButtonPinTheme.
|
2022-08-16 13:40:41 +03:00 |
|
|
|
12a83327b0
|
Web: Added payments page.
|
2022-08-16 10:49:34 +03:00 |
|
|
|
fb453b3582
|
Web:Common:Fix mainButton styles.
|
2022-08-16 09:21:12 +03:00 |
|
|
|
e36ffa1f75
|
Web:Common:Fix button styles.
|
2022-08-16 09:20:43 +03:00 |
|
Artem Tarasov
|
06981645c1
|
Web: Common/Client: added ts support in client, getOAuthToken, getLoginLink placed in common/utils
|
2022-08-15 17:27:40 +03:00 |
|
mushka
|
4379a34bcf
|
Merge branch 'develop' into feature/create-room
|
2022-08-15 16:01:20 +03:00 |
|
mushka
|
f0351ceec0
|
added roomLogo api methods
|
2022-08-15 15:54:46 +03:00 |
|
|
|
3a80b93bca
|
Web:Common:Added InfoPanelToggleTheme.
|
2022-08-15 11:15:44 +03:00 |
|
|
|
d96a3140dc
|
Web:Common:Added FloatingButtonTheme.
|
2022-08-15 10:38:46 +03:00 |
|
|
|
4e9c7a713d
|
Merge
|
2022-08-12 18:07:44 +03:00 |
|
|
|
b82a4206e0
|
Merge branch 'develop' into feature/settings-common
|
2022-08-12 18:04:11 +03:00 |
|
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +03:00 |
|
|
|
4feba8a356
|
Merge branch 'develop' into feature/inifinite-scroll
|
2022-08-12 13:08:12 +03:00 |
|
|
|
7d691f6dcb
|
Web: Common: fixed scroll
|
2022-08-12 11:00:42 +03:00 |
|
|
|
048237dffc
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/portal-deactivation
# Conflicts:
# packages/client/src/pages/Confirm/sub-components/deactivatePortal.js
# packages/client/src/pages/Confirm/sub-components/removePortal.js
# packages/client/src/pages/PortalSettings/categories/data-management/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/DeleteDataLoader.js
# packages/client/src/pages/PortalSettings/categories/delete-data/StyledDeleteData.js
# packages/client/src/pages/PortalSettings/categories/delete-data/index.js
# packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js
# packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
|
2022-08-11 21:47:39 +03:00 |
|
|
|
4463fc6e8f
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
# packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
# packages/common/components/Loaders/AutoBackupLoader/index.js
# packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
# packages/common/components/Loaders/DataBackupLoader/index.js
# packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
# packages/common/components/Loaders/RestoreBackupLoader/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
# products/ASC.Files/Server/GlobalUsings.cs
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/BackupStore.js
|
2022-08-11 17:10:37 +03:00 |
|
|
|
2aed8eb3a0
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/login-confirm-redesign
# Conflicts:
# packages/asc-web-components/index.js
# packages/client/src/DocspaceLogo/index.js
# packages/client/src/pages/Confirm/ConfirmWrapper.js
# packages/components/form-wrapper/index.js
# web/ASC.Web.Client/src/Shell.jsx
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header-unauth.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/StyledConfirm.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePassword.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changePhone.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/profileRemove.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaActivation.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/tfaAuth.js
# web/ASC.Web.Login/src/Login.jsx
# web/ASC.Web.Login/src/StyledLogin.js
|
2022-08-10 16:16:43 +03:00 |
|
mushka
|
8f5f597c5f
|
Merge branch 'develop' into feature/create-room
|
2022-08-09 19:12:47 +03:00 |
|
mushka
|
a85c33db50
|
added isRoom method to InfoPanelStore
|
2022-08-09 19:05:36 +03:00 |
|
|
|
0de5d36ce4
|
Web: Files: Scroll: added WindowScroller
|
2022-08-09 13:43:24 +03:00 |
|
|
|
d0e4f67ec4
|
Merge branch 'develop' into feature/inifinite-scroll
# Conflicts:
# packages/client/src/components/Article/Body/index.js
# packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
# packages/client/src/pages/Home/Section/Body/TableView/TableContainer.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/InfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/StyledInfiniteGrid.js
# packages/client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
# packages/client/src/store/FilesStore.js
|
2022-08-09 09:49:28 +03:00 |
|
|
|
28e0d02b28
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/sso
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/index.js
|
2022-08-06 23:12:39 +03:00 |
|
Artem Tarasov
|
a520446d69
|
Web: Packages: localStorage usage changed to cookies when saving language
|
2022-08-05 17:21:14 +03:00 |
|
Artem Tarasov
|
c37178a07b
|
Merge branch 'develop' into feature/login-ssr
|
2022-08-05 11:58:06 +03:00 |
|
|
|
3de884d0f9
|
Merge branch 'develop' into feature/integration-system
|
2022-08-05 11:12:32 +03:00 |
|
|
|
7741d235f7
|
Web: Optimization of store
|
2022-08-04 17:34:53 +03:00 |
|
Artem Tarasov
|
3f61baa64e
|
Web: Client/Common: disabled redirect to login page inside client
|
2022-08-04 15:27:44 +03:00 |
|
mushka
|
5cd4263b38
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-08-04 15:21:06 +03:00 |
|
|
|
ffd01f52c2
|
Common: SettingsStore: Removed base integration frame config
|
2022-08-04 13:31:35 +03:00 |
|
|
|
11098da084
|
Common: Utils: Added methods for interacting with integration frame: frameCallbackData, frameCallCommand
|
2022-08-04 13:29:42 +03:00 |
|
|
|
f7b24248da
|
Section: fix settings style
|
2022-08-04 01:36:19 +03:00 |
|
|
|
4af1247136
|
Web: Integration: Restored after merge develop
|
2022-08-03 14:48:54 +03:00 |
|
|
|
928ee509ad
|
Components: Headline: fix size
|
2022-08-02 18:03:25 +03:00 |
|
mushka
|
ea8aa736c4
|
merge with develop
|
2022-08-02 14:11:41 +03:00 |
|
|
|
03b03ed910
|
Merge branch 'develop' into feature/sso
# Conflicts:
# packages/client/public/images/actions.upload.react.svg
# packages/client/public/images/empty_screen_privacy.png
# packages/client/public/locales/en/SingleSignOn.json
# packages/client/public/locales/ru/SingleSignOn.json
# packages/client/src/helpers/constants.js
# packages/client/src/pages/PortalSettings/categories/integration/index.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerItem.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerModalDialog.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/consumerToggle.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/modalDialogContainer.js
# packages/client/src/pages/PortalSettings/categories/integration/sub-components/ssoLoader.js
# packages/client/src/pages/PortalSettings/categories/integration/thirdPartyServicesSettings.js
# packages/client/src/store/SsoFormStore.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/ThirdPartyServicesSettings/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerItem.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerModalDialog.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/consumerToggle.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/sub-components/modalDialogContainer.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/integration/thirdPartyServicesSettings.js
|
2022-08-02 12:05:15 +03:00 |
|
|
|
d093c97b97
|
Web: Renamed 'studio' to 'client' (bat-files, nginx configs, react, MF, themes)
|
2022-08-01 15:37:33 +03:00 |
|
|
|
359c160ac1
|
Web: Refactoring routes urls
|
2022-07-31 13:52:35 +03:00 |
|
|
|
995d07deae
|
Web: Upgrade yarn to v3.2.2
|
2022-07-29 18:20:57 +03:00 |
|
|
|
4c097607f9
|
Web: Fix position of MainButton with logo and display logo
|
2022-07-29 10:17:41 +03:00 |
|
|
|
256c2de843
|
Web: Removed modules dependencies and People and Files mobx providers
|
2022-07-28 16:11:55 +03:00 |
|
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
|
c5baa8834d
|
Web: Fix 'Accounts' imports, routes and includes
|
2022-07-26 12:51:52 +03:00 |
|
|
|
0ebd28f299
|
Web: Merged 'People' module with 'Client' and fixed paths
|
2022-07-25 22:19:47 +03:00 |
|
|
|
280f702cf9
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/NavMenu/index.js
# packages/client/src/store/ProfileActionsStore.js
# yarn.lock
|
2022-07-25 21:29:04 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
