IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,475 Commits 40 Branches 22 Tags 420 MiB
2ab63a3029
Commit Graph

294 Commits

Author SHA1 Message Date
Alexey Safronov
2ab63a3029 Merge branch 'develop' into feature/display-file-extension 2024-08-23 23:27:30 +04:00
Alexey Safronov
11fe4f4942 Merge branch 'develop' into feature/new-empty-screen 
# Conflicts:
#	packages/client/src/components/EmptyContainer/index.js
#	public/locales/en/Common.json
 2024-08-23 20:48:21 +04:00
Alexey Safronov
1b6d4fb103 Merge branch 'hotfix/v2.6.1' into develop 
# Conflicts:
#	packages/client/package.json
#	packages/shared/themes/base.ts
#	yarn.lock
 2024-08-23 20:41:35 +04:00
Viktor Fomin
84696a0e64 Shared: Themes: fix color 2024-08-22 13:18:56 +03:00
Alexey Safronov
3dd14ccd49 Merge branch 'develop' into feature/new-empty-screen 2024-08-22 12:31:27 +04:00
Alexey Safronov
e9f5327d7c Merge branch 'hotfix/v2.6.1' into develop 
# Conflicts:
#	packages/shared/components/room-icon/index.tsx
#	packages/shared/themes/base.ts
#	packages/shared/themes/dark.ts
#	packages/shared/themes/globalColors.ts
 2024-08-22 12:29:56 +04:00
Elyor Djalilov
64d1a56beb Merge branch 'develop' into feature/display-file-extension 2024-08-21 21:17:22 +05:00
Viktor Fomin
1d93dc44f0 Shared: Themes: delete useless 2024-08-21 16:48:36 +03:00
Alexey Safronov
445bf4224b Client: Replaced blur to blackout 2024-08-20 15:16:21 +04:00
Akmal Isomadinov
62cf485588 Merge branch 'develop' into feature/new-empty-screen 
# Conflicts:
#	packages/client/src/components/EmptyContainer/index.js
#	packages/client/src/pages/Home/Section/AccountsBody/EmptyScreen.js
#	packages/client/src/store/ContextOptionsStore.js
 2024-08-20 14:04:49 +05:00
Viktor Fomin
caf3efc1d9 Shared: Themes: fix input background 2024-08-20 11:27:39 +03:00
Akmal Isomadinov
cde5f13c49 Shared:EmptyView Refactoring 2024-08-16 14:23:34 +05:00
Alexey Safronov
a06cb5159f
Merge pull request #587 from ONLYOFFICE/feature/oauth2-rotation 
Feature/oauth2 rotation
 2024-08-15 17:55:07 +04:00
Alexey Safronov
0e52c87002 Merge branch 'develop' into feature/display-file-extension 2024-08-13 14:31:00 +04:00
Timofey Boyko
94d19ffdb8 Shared:Themes:Dark: fix disabled input color text 2024-08-13 11:17:59 +03:00
Alexey Safronov
d99a2f386f Merge branch 'develop' into feature/new-context-menu 2024-08-09 17:33:42 +04:00
Alexey Safronov
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
Aleksandr Lushkin
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
Alexey Safronov
7f766abfa9 Merge branch 'develop' into feature/display-file-extension 2024-08-08 11:44:09 +04:00
Viktor Fomin
4dc40f5154 Shared: Themes: fix 2024-08-07 15:16:53 +03:00
Alexey Safronov
f86605f70a Merge branch 'develop' into feature/new-context-menu 2024-08-07 13:24:07 +04:00
Viktor Fomin
04cf1999d7 Merge branch 'develop' into refactoring/global-colors 2024-08-06 13:59:26 +03:00
Elyor Djalilov
5eb0690060 Merge branch 'develop' into feature/display-file-extension 2024-08-06 11:10:27 +05:00
Elyor Djalilov
4681d18d28 Web: Client: Home: Section: added file extension 2024-08-06 11:08:36 +05:00
Viktor Fomin
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
Viktor Fomin
6a26128ee3 Shared: Themes: fix after merge 2024-07-30 13:03:38 +03:00
Viktor Fomin
447003315c Merge branch 'develop' into refactoring/global-colors 2024-07-30 13:00:40 +03:00
Alexey Safronov
072ce77b8a Merge branch 'develop' into feature/public-edit 2024-07-29 16:22:00 +04:00
Alexey Safronov
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
gopienkonikita
1972f6dc15 Merge branch 'develop' into feature/public-edit 
# Conflicts:
#	public/locales/en/Common.json
 2024-07-25 11:25:59 +03:00
Viktor Fomin
7a64964df2 Shared: Themes: add colors 2024-07-24 16:32:00 +03:00
Viktor Fomin
28c03fdb6b Shared: Themes: fix after merge 2024-07-24 15:26:11 +03:00
Viktor Fomin
165f57ea88 Merge branch 'develop' into refactoring/global-colors 2024-07-24 15:04:46 +03:00
Elyor Djalilov
b8a61b2823 Web: Client: UploadPanel. fix styles 2024-07-24 11:17:17 +05:00
Elyor Djalilov
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
Alexey Safronov
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
DmitrySychugov
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
DmitrySychugov
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
Viktor Fomin
f18a471e00 Shared: Themes: fix 2024-07-16 13:18:46 +03:00
Elyor Djalilov
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
gopienkonikita
f9adab1e99 Web: Components: LinkRow: fixed styles 2024-07-11 17:38:06 +03:00
Alexey Safronov
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
Elyor Djalilov
d8ddf3034e Web: Client: Data Import: fixed progress bar color 2024-07-11 13:04:51 +05:00
Tatiana Lopaeva
e508270a43 Shared: Fixed settings description color for dark theme. 2024-07-08 11:04:09 +03:00