Commit Graph

1974 Commits

Author SHA1 Message Date
350967144e Shared: Themes: fix missing 2024-06-20 11:29:33 +03:00
b5de6064a5 Shared: Themes: fix missing 2024-06-20 10:33:10 +03:00
9a61761906 Merge branch 'develop' into refactoring/global-colors 2024-06-20 10:03:55 +03:00
50ff20d426
Merge pull request #496 from ONLYOFFICE/bugfix/form-room
Bugfix/form room
2024-06-19 19:44:53 +04:00
a132cd12f9 Shared: Themes: fix missing 2024-06-19 16:32:50 +03:00
728275a370 Shared: Themes: fix missing 2024-06-19 16:24:25 +03:00
ea3deca0b8 Merge branch 'develop' into refactoring/global-colors 2024-06-19 15:50:28 +03:00
f8b86220bc Shared:Utils:NextSSRHelper: remove flag for disable internal requests 2024-06-19 14:35:11 +03:00
Akmal Isomadinov
1b99bc534f Merge branch 'develop' into bugfix/form-room 2024-06-18 14:44:51 +05:00
5dc1932a54 Components: Fix crash on create new room (static import ScrollbarContext issue) 2024-06-18 12:01:54 +04:00
c55d55f65c Shared: Themes: add secondPurple 2024-06-18 10:20:24 +03:00
529a78e765 Merge branch 'develop' into refactoring/global-colors 2024-06-18 10:16:14 +03:00
3df44723d4 Shared: Themes: fix missing 2024-06-18 10:10:11 +03:00
61306283d5 Merge branch 'develop' into feature/ldap-settings 2024-06-17 19:07:00 +04:00
f3d4ca52bf Fix bug 68470 - The list of languages ​​is not hidden when selecting via Enter. 2024-06-17 17:21:05 +03:00
2e66688239 Shared: Themes: fix missing 2024-06-17 15:19:47 +03:00
db9b2135d3 Shared: Themes: fix after merge 2024-06-17 15:00:34 +03:00
3d089d9752 Merge branch 'develop' into refactoring/global-colors 2024-06-17 14:50:29 +03:00
f94792d33e Shared: Themes: fix missing 2024-06-17 14:47:29 +03:00
a639635c98 Merge branch 'develop' into feature/ldap-settings
# Conflicts:
#	packages/client/src/pages/Home/Section/AccountsBody/InsideGroup/TableView/TableRow.js
#	packages/client/src/pages/Home/Section/AccountsBody/People/TableView/TableRow.js
#	packages/login/src/components/LoginForm/index.tsx
#	packages/shared/store/SettingsStore.ts
#	public/locales/en/Common.json
2024-06-17 15:17:07 +04:00
f1f38ca671 Merge branch 'develop' into feature/sr-cyrl 2024-06-17 14:59:01 +04:00
834513ecd3 Client: Added common flag for "sr-Cyrl-RS" 2024-06-17 14:55:55 +04:00
Akmal Isomadinov
044faad1f3 Merge branch 'develop' into bugfix/form-room 2024-06-17 15:53:41 +05:00
8024a08247 Merge branch 'develop' into feature/new-tabs 2024-06-17 17:46:07 +07:00
ba9e10b86a
Merge pull request #493 from ONLYOFFICE/bugfix/filter
Bugfix/filter
2024-06-17 14:31:58 +04:00
5d8b2a3fba Shared: Fixed colors for selector panel. 2024-06-17 13:08:17 +03:00
db43b5d938 Merge branch 'develop' into feature/new-tabs 2024-06-17 17:00:42 +07:00
b8c53f769c Shared:Components:Tabs: fix padding 2024-06-17 16:59:43 +07:00
d41f1816f3 Shared:Components:Tabs: change import types 2024-06-17 16:58:31 +07:00
Akmal Isomadinov
4d5cb413b0 Shared:Enums: Fixed order room type 2024-06-17 14:24:26 +05:00
34703214ad Web: Components: Table: removed padding 2024-06-17 11:37:58 +03:00
04b0e82348 Merge branch 'develop' into feature/new-tabs 2024-06-17 14:11:21 +07:00
0da0949215 Shared:Components:Tabs: add custom scrollbar 2024-06-17 14:02:18 +07:00
2a57c57e07 Merge branch 'develop' into refactoring/global-colors 2024-06-14 16:53:06 +05:00
656cb4395b Shared: Themes: fix missing 2024-06-14 16:52:53 +05:00
b5bd0b21fa Replacing two dots in a sentence, deleted useless code. 2024-06-14 14:30:47 +03:00
a7d44f61a6 Shared:Components:Tabs: add user-select to styles 2024-06-14 18:21:47 +07:00
e0705efdbd Fixed payment date. 2024-06-14 13:57:45 +03:00
3e07e24de1 Shared:Components:Selector: fix props for the tabs component 2024-06-14 17:40:18 +07:00
0d1f71e14c Renaming. 2024-06-14 13:25:48 +03:00
f60ef3547d Renaming. 2024-06-14 13:19:28 +03:00
e247ba3db3 Renaming. 2024-06-14 13:07:19 +03:00
45b363a770 Changed import. 2024-06-14 12:41:49 +03:00
3d23c9a782 Shared: Themes: fix missing 2024-06-14 13:59:00 +05:00
e02d05c43f Merge branch 'develop' into feature/values-renaming 2024-06-14 12:19:34 +04:00
6ef8481e88
Merge pull request #479 from ONLYOFFICE/feature/hcaptcha
Feature/hcaptcha
2024-06-14 12:13:39 +04:00
cd0dbc6a66 Shared: Themes: fix missing 2024-06-14 13:13:23 +05:00
a7d26ad8f7
Merge pull request #481 from ONLYOFFICE/bugfix/bug-68497
bugfix/bug-68497
2024-06-14 12:09:47 +04:00
c750dd62e9 Merge branch 'develop' into feature/new-tabs 2024-06-14 14:58:21 +07:00
d3f7692bad Merge branch 'develop' into refactoring/global-colors 2024-06-14 12:52:37 +05:00