namushka
|
5583c82627
|
removed bufferSelection from info panel, fixed some selection-related bugs
|
2023-11-02 16:23:21 +03:00 |
|
mushka-n
|
da4c667afe
|
major code cleanup
|
2023-11-01 12:29:49 +03:00 |
|
mushka-n
|
bc9cbb44c2
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-30 13:49:52 +03:00 |
|
Vladimir Khvan
|
6232fafd9f
|
Merge branch 'release/v2.0.0' of https://github.com/ONLYOFFICE/DocSpace-client into release/v2.0.0
Conflicts:
packages/client/src/pages/Confirm/sub-components/createUser.js
|
2023-10-27 18:14:35 +05:00 |
|
Vladimir Khvan
|
8abea90a92
|
fix Bug 63907 | first name and last name validation was added
|
2023-10-27 18:12:01 +05:00 |
|
mushka-n
|
6ac7700678
|
merge release + merge fix
|
2023-10-27 15:10:43 +03:00 |
|
|
|
3f6aa5d509
|
Web: Settings: removed duplicate api requests
|
2023-10-23 15:49:45 +03:00 |
|
|
|
51879dfe0a
|
Merge branch 'release/v2.0.0' into bugfix/api-optimized
|
2023-10-23 13:50:18 +03:00 |
|
mushka-n
|
5805f1b995
|
Merge branch 'release/v2.0.0' into feature/new-form-gallery
|
2023-10-20 11:09:31 +03:00 |
|
mushka-n
|
65e809cd97
|
merge release + merge resolve
|
2023-10-18 14:26:12 +03:00 |
|
|
|
5a64902149
|
Web: Files: removed useless getPortalPasswordSettings request
|
2023-10-18 12:35:14 +03:00 |
|
|
|
3a26b3dda6
|
Client: remove useless getFolderInfo requests
|
2023-10-18 11:18:42 +03:00 |
|
|
|
c14726e61b
|
Client: delete useless code
|
2023-10-16 12:42:35 +03:00 |
|
DmitrySychugov
|
138721316a
|
Client: turned off SmartBanner in store, affected the height of the Main component
|
2023-10-13 17:10:19 +05:00 |
|
|
|
1f27ac0c28
|
Merge branch 'bugfix/ui' into bugfix/initial-skeleton
|
2023-10-13 11:11:56 +03:00 |
|
Akmal Isomadinov
|
9071e541db
|
Client: Fixed language change
|
2023-10-12 20:25:55 +05:00 |
|
|
|
7a6931ef58
|
Merge branch 'bugfix/ui' into bugfix/initial-skeleton
|
2023-10-12 16:13:53 +03:00 |
|
|
|
d710c51e34
|
Client: fix first skeleton render (remove skeleton waterflow)
|
2023-10-12 10:19:19 +03:00 |
|
|
|
726223f86f
|
Web: Files: fixed members list
|
2023-10-11 14:05:31 +03:00 |
|
DmitrySychugov
|
5bc500a582
|
Client: fixed member list issues
|
2023-10-11 15:11:39 +05:00 |
|
|
|
07cb18f02e
|
Added mobileMore media query const
|
2023-10-09 18:02:32 +04:00 |
|
|
|
d17cd840df
|
Web: add currentDeviceType for store
|
2023-10-06 15:29:30 +03:00 |
|
Viktor Fomin
|
df2fc50896
|
Common: InfoPanelStore: fix openSelfProfile
|
2023-10-05 14:32:27 +03:00 |
|
mushka-n
|
a22635b7a8
|
move to new repo model
|
2023-10-05 11:29:18 +03:00 |
|
mushka-n
|
5ec8dec79e
|
merge new develop + merge changes
|
2023-10-05 11:23:00 +03:00 |
|
|
|
0d8bd872d6
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 17:21:34 +04:00 |
|
|
|
87d0e7932a
|
Web: Files: Info-panel: fixed members list
|
2023-09-29 12:52:08 +03:00 |
|
mushka-n
|
a843a45b09
|
merge develop + merge fix
|
2023-09-23 23:52:51 +03:00 |
|
mushka-n
|
7e56891fe6
|
added template descripton fetching
|
2023-09-22 21:19:06 +03:00 |
|
mushka-n
|
6cbb1cce34
|
implemented new localization structure + after-merge fixes
|
2023-09-22 18:38:37 +03:00 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
gazizova-vlada
|
a061d42f29
|
Web:Add dataReassignmentUrl.
|
2023-09-20 17:03:31 +03:00 |
|
mushka-n
|
693a1bf02b
|
merge with develop (and submit-to-form-gallery)
|
2023-09-19 16:42:56 +03:00 |
|
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
mushka-n
|
85423bd1dd
|
code cleanup
|
2023-09-19 13:56:34 +03:00 |
|
|
|
4e38a5a987
|
Web: Applied new formGallery config
|
2023-09-19 13:12:40 +04:00 |
|
|
|
65a43a86dd
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-13 10:14:35 +03:00 |
|
mushka-n
|
b657d3731b
|
merge develop + merge fix
|
2023-09-12 02:13:05 +03:00 |
|
mushka-n
|
d96911a37c
|
merge develop + merge fix
|
2023-09-11 13:26:58 +03:00 |
|
|
|
e9fcf067ee
|
Merge branch 'develop' into feature/new-settings-description
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
|
2023-09-04 12:16:13 +03:00 |
|
|
|
d77e8a1771
|
Merge branch 'develop' into feature/rtl-interface-client
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 16:42:08 +02:00 |
|
|
|
a952793dcb
|
Merge branch 'develop' into feature/new-settings-description
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/security/StyledSecurity.js
# packages/client/src/pages/PortalSettings/categories/security/sub-components/category-wrapper.js
# packages/common/store/SettingsStore.js
|
2023-09-01 17:03:04 +03:00 |
|
gazizova-vlada
|
6de452efac
|
Merge branch 'develop' into feature/login-settings
|
2023-09-01 16:56:55 +03:00 |
|
|
|
b0cbe39aa6
|
Merge branch 'develop' into feature/new-settings-description
|
2023-09-01 16:47:52 +03:00 |
|
|
|
efdd42f8f6
|
Merge branch 'develop' into feature/rtl-interface-client
|
2023-09-01 15:30:48 +02:00 |
|
|
|
3e6a417d19
|
Merge branch 'hotfix/v1.1.2' into develop
# Conflicts:
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# migrations/mysql/SaaS/NotifyDbContext/NotifyDbContextModelSnapshot.cs
# packages/client/src/components/panels/SelectFileDialog/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/restore-backup/sub-components/ButtonComponent.js
# packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js
# packages/client/src/pages/Profile/Section/Body/sub-components/main-profile/index.js
# packages/client/src/store/ProfileActionsStore.js
# packages/common/api/files/index.js
# packages/common/store/AuthStore.js
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# yarn.lock
|
2023-09-01 15:33:39 +03:00 |
|
|
|
2f179bec9c
|
Web: SSO: Fix logout redirect
|
2023-08-31 14:33:29 +04:00 |
|
|
|
24278a2d6b
|
Web: Client: Setting: added new description of settings, fixed styles
|
2023-08-31 12:37:29 +03:00 |
|
gazizova-vlada
|
629b42161c
|
Merge branch 'develop' into feature/login-settings
|
2023-08-31 09:57:26 +03:00 |
|
gazizova-vlada
|
566a5ce893
|
Web:Add link.
|
2023-08-30 18:34:47 +03:00 |
|
