|
|
a06cb5159f
|
Merge pull request #587 from ONLYOFFICE/feature/oauth2-rotation
Feature/oauth2 rotation
|
2024-08-15 17:55:07 +04:00 |
|
|
|
94d19ffdb8
|
Shared:Themes:Dark: fix disabled input color text
|
2024-08-13 11:17:59 +03:00 |
|
|
|
d99a2f386f
|
Merge branch 'develop' into feature/new-context-menu
|
2024-08-09 17:33:42 +04:00 |
|
|
|
a2302aa248
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/Confirm/sub-components/activateUser.js
# packages/client/src/pages/PortalSettings/categories/integration/LDAP/sub-components/CertificateDialog.js
# packages/client/src/pages/PublicRoom/sub-components/RoomStyles.js
# packages/login/src/app/(root)/layout.tsx
# packages/login/src/app/(root)/page.tsx
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/types/index.ts
# packages/login/src/utils/actions.ts
# packages/shared/constants/index.ts
# packages/shared/themes/base.ts
|
2024-08-09 17:23:25 +04:00 |
|
Vlada Gazizova
|
7819b4ac39
|
Shared:Themes:Unnecessary code removed.
|
2024-08-09 13:23:41 +03:00 |
|
|
|
4218510853
|
Shared: Themes: Fix tag color in light theme
|
2024-08-09 10:19:23 +02:00 |
|
Vlada Gazizova
|
ba5093d0a3
|
Merge branch 'develop' into feature/new-context-menu
|
2024-08-08 13:12:23 +03:00 |
|
|
|
4dc40f5154
|
Shared: Themes: fix
|
2024-08-07 15:16:53 +03:00 |
|
|
|
f86605f70a
|
Merge branch 'develop' into feature/new-context-menu
|
2024-08-07 13:24:07 +04:00 |
|
|
|
04cf1999d7
|
Merge branch 'develop' into refactoring/global-colors
|
2024-08-06 13:59:26 +03:00 |
|
|
|
408b5f0269
|
Shared: Themes: fix rombs color
|
2024-08-02 11:11:31 +03:00 |
|
Vlada Gazizova
|
cdf3be34b8
|
Merge branch 'develop' into feature/new-context-menu
|
2024-07-31 11:37:24 +03:00 |
|
|
|
6a26128ee3
|
Shared: Themes: fix after merge
|
2024-07-30 13:03:38 +03:00 |
|
|
|
447003315c
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-30 13:00:40 +03:00 |
|
|
|
072ce77b8a
|
Merge branch 'develop' into feature/public-edit
|
2024-07-29 16:22:00 +04:00 |
|
|
|
602ce53411
|
Merge branch 'hotfix/v2.6.1' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/utils/settingsTree.js
|
2024-07-29 16:13:17 +04:00 |
|
|
|
1972f6dc15
|
Merge branch 'develop' into feature/public-edit
# Conflicts:
# public/locales/en/Common.json
|
2024-07-25 11:25:59 +03:00 |
|
|
|
7a64964df2
|
Shared: Themes: add colors
|
2024-07-24 16:32:00 +03:00 |
|
|
|
28c03fdb6b
|
Shared: Themes: fix after merge
|
2024-07-24 15:26:11 +03:00 |
|
|
|
165f57ea88
|
Merge branch 'develop' into refactoring/global-colors
|
2024-07-24 15:04:46 +03:00 |
|
|
|
b8a61b2823
|
Web: Client: UploadPanel. fix styles
|
2024-07-24 11:17:17 +05:00 |
|
|
|
78d64b05cf
|
Fix Bug 69217 - Files. Info. History. The folder from which the file was copied is incorrectly indicated in the history
|
2024-07-23 13:48:55 +05:00 |
|
|
|
116702d286
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/GoogleWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/ImportStep/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextCloudWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/NextcloudWorkspace/Stepper/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/UsersTypeRowContent.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/RowView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/UsersTypeTableRow.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/Stepper/SelectUsersTypeStep/AccountsTable/TableView/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/OnlyofficeWorkspace/index.js
# packages/client/src/pages/PortalSettings/categories/data-import/components/AddEmailsStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/ImportStep.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/Providers.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/RowView/UsersRowContent.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/TableView/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx
# packages/client/src/pages/PortalSettings/categories/data-import/sub-components/UsersInfoBlock.tsx
# packages/login/src/components/Invalid.tsx
|
2024-07-22 20:23:04 +04:00 |
|
Akmal Isomadinov
|
a75e8802e8
|
Merge branch 'release/v2.6.0' into feature/form-room
# Conflicts:
# packages/client/src/store/ContextOptionsStore.js
# packages/doceditor/public/locales/en/CompletedForm.json
|
2024-07-17 16:00:11 +05:00 |
|
|
|
f5206fce04
|
Merge branch 'release/v2.6.0' of github.com:ONLYOFFICE/DocSpace-client into release/v2.6.0
|
2024-07-17 15:37:59 +05:00 |
|
|
|
3297bdf32f
|
Fix Bug 66422 - Client: corrected colors for badges, type user
|
2024-07-17 15:37:48 +05:00 |
|
Akmal Isomadinov
|
c547782df6
|
Merge branch 'release/v2.6.0' into feature/form-room
# Conflicts:
# packages/shared/components/selector/sub-components/Body.tsx
|
2024-07-16 19:55:35 +05:00 |
|
|
|
f18a471e00
|
Shared: Themes: fix
|
2024-07-16 13:18:46 +03:00 |
|
|
|
71e4abc4ad
|
Merge branch 'develop' into refactoring/data-import
# Conflicts:
# packages/client/src/pages/PortalSettings/categories/data-import/components/SelectUsersTypeStep/AccountsTable/index.tsx
|
2024-07-16 10:03:45 +05:00 |
|
Akmal Isomadinov
|
820f32dd67
|
Doceditor:Components:CompletedForm Added a new design
|
2024-07-13 21:17:08 +05:00 |
|
|
|
f9adab1e99
|
Web: Components: LinkRow: fixed styles
|
2024-07-11 17:38:06 +03:00 |
|
|
|
99e265ebee
|
Merge branch 'release/v2.6.0' into develop
# Conflicts:
# packages/client/src/components/PrivateRouteWrapper/index.tsx
# packages/client/src/pages/PortalSettings/categories/developer-tools/index.js
# packages/login/src/app/layout.tsx
# packages/login/src/components/LoginForm/index.tsx
# packages/login/src/middleware.ts
# packages/login/src/utils/index.ts
# packages/shared/components/table/TableHeader.tsx
# packages/shared/routes/Route.private.tsx
|
2024-07-11 12:27:31 +04:00 |
|
|
|
d8ddf3034e
|
Web: Client: Data Import: fixed progress bar color
|
2024-07-11 13:04:51 +05:00 |
|
|
|
e508270a43
|
Shared: Fixed settings description color for dark theme.
|
2024-07-08 11:04:09 +03:00 |
|
|
|
f9db147f35
|
Shared: Themes: Fixed default color for dark theme of tabs component.
|
2024-07-05 15:56:31 +03:00 |
|
|
|
afa7ee40de
|
Client: InfoPanel: Fixed colors for dark theme.
|
2024-07-05 15:33:49 +03:00 |
|
|
|
1ea80ce7d9
|
Shared: Themes: fix missing
|
2024-07-02 16:37:47 +03:00 |
|
|
|
bdde096d8e
|
Shared: Themes: fix missing
|
2024-07-02 16:19:48 +03:00 |
|
|
|
d6c595d9ef
|
Shared: Themes: fix missing
|
2024-07-01 22:59:13 +03:00 |
|
|
|
ca2c48ec99
|
Shared: use colors from theme
|
2024-07-01 14:56:32 +03:00 |
|
|
|
6203bb9b6d
|
Shared: Themes: add shadow
|
2024-07-01 14:52:45 +03:00 |
|
Vlada Gazizova
|
00270304e9
|
Merge
|
2024-07-01 10:20:52 +03:00 |
|
|
|
ebffe0cc66
|
Shared: Themes: Added red color for white label background
|
2024-06-28 17:11:51 +03:00 |
|
|
|
c6946feaab
|
Shared: Themes: add tapHiglight
|
2024-06-28 14:12:21 +03:00 |
|
|
|
8f4ddba367
|
Merge branch 'develop' into feature/oauth2-client
|
2024-06-28 13:28:10 +03:00 |
|
|
|
11168a8717
|
Shared: use colors from theme
|
2024-06-27 14:22:26 +03:00 |
|
|
|
57b73af294
|
Merge branch 'develop' into refactoring/global-colors
|
2024-06-26 17:00:39 +03:00 |
|
|
|
499bfbf049
|
Shared: Themes: add rombs colors
|
2024-06-26 17:00:34 +03:00 |
|
|
|
ab24a40a0e
|
Client:OAuth: refactoring
|
2024-06-26 15:19:13 +03:00 |
|
|
|
fd87966680
|
Merge pull request #523 from ONLYOFFICE/bugfix/fix-display-change-owner-panel
Web: Files: fixed the display of the owner change panel
|
2024-06-25 23:07:13 +03:00 |
|
