Commit Graph

851 Commits

Author SHA1 Message Date
TimofeyBoyko
62bc6506a9 Merge branch 'develop' into bugfix/fix-article-iphone 2022-11-22 19:20:51 +03:00
TimofeyBoyko
0ac219e2d6 Web:Client: fix article mobile main button 2022-11-22 19:20:07 +03:00
9ad9127eeb Web: Removed the ability to delete a room without being in the archive. 2022-11-22 17:12:32 +03:00
ff53dc882e Merge branch 'develop' into feature/custom-theme 2022-11-22 17:03:12 +03:00
407dd9c74e Update socket.js
Fix work of early subscriptions to socket events
2022-11-22 16:59:23 +03:00
Akmal Isomadinov
a5d09b9904 Merge branch 'develop' into Add-id-for-header-of-main-folders 2022-11-22 18:54:00 +05:00
4cbe007ac4 Web:Components:Fix button border. 2022-11-22 16:39:40 +03:00
76b9752791 Web:Common:With a dark theme, added icon highlighting. 2022-11-22 16:18:23 +03:00
e74f9b538a Merge branch 'develop' into bugfix/access-rights 2022-11-22 16:02:25 +03:00
TimofeyBoyko
d2e272f15a Web:Common:Section: add render info-panel with portal for mobile devices 2022-11-22 13:21:59 +03:00
TimofeyBoyko
60d83d8170 Web:Common:FilterInput: add render filter block with portal for mobile devices 2022-11-22 12:38:45 +03:00
TimofeyBoyko
91835c2b95 Web:Common:Article: add render with portal for mobile devices 2022-11-22 12:16:53 +03:00
Viktor Fomin
50c55f0e29 Common: fix logo 2022-11-22 13:06:07 +05:00
Akmal Isomadinov
8daa9b5291 Web:Common:Components:Navigation: Added ids 2022-11-22 12:49:07 +05:00
Viktor Fomin
248b2017ad Common: API: delete useless 2022-11-22 12:34:57 +05:00
Elyor Djalilov
5b32fd4eb2 fixed style context menu 2022-11-22 11:49:46 +05:00
513de72854 Web:Common:Fix pin. 2022-11-21 18:53:07 +03:00
1d4168c81d Web:Common:Fix. 2022-11-21 18:46:59 +03:00
98df2d2e3d Web:Common:Add class filter-text. 2022-11-21 16:05:47 +03:00
sk81.biz@gmail.com
af5829d92a Mod package.json origin: https://system.onlyoffice.io 2022-11-21 14:39:12 +03:00
TimofeyBoyko
a78e3ef29f Web:Common:DialogAsideLoader: delete useless code 2022-11-21 13:48:56 +03:00
TimofeyBoyko
12e8686839 Web:Common:DialogAsideLoader: fix styles 2022-11-21 13:45:36 +03:00
7bbc8f4781 Merge branch 'develop' into bugfix/access-rights
# Conflicts:
#	packages/client/src/store/FilesStore.js
2022-11-21 11:23:16 +03:00
Vlada Gazizova
5884fa7acd
Merge branch 'develop' into feature/custom-theme 2022-11-21 11:15:55 +03:00
045c98258f Web: Added check for archive folder. 2022-11-21 10:37:10 +03:00
f68789220e Web: Refactoring. 2022-11-21 10:02:31 +03:00
c41a4bb17f Web: Fixed error. 2022-11-21 10:01:12 +03:00
69944587b9 fix 2022-11-20 20:02:32 +03:00
0f49b15dd6 fix 2022-11-19 21:01:47 +03:00
9bcaf62b9a temp 2022-11-18 21:54:05 +03:00
ec35693308
Merge pull request #1059 from ONLYOFFICE/bugfix/fix-info-panel
Web:Common:Add close InfoPanel for unmounting a component.
2022-11-18 18:33:41 +03:00
dee6ba8f60 Web: Common: fixed article loader 2022-11-18 18:17:17 +03:00
28b8ac504e Web: Common: added getArchiveFileRoleActions 2022-11-18 18:01:58 +03:00
Akmal Isomadinov
b65f887f6b Web:Common:Components:FilterInput: Updated id 2022-11-18 19:43:03 +05:00
94ce8ff399 Merge branch 'develop' into bugfix/access-rights 2022-11-18 17:41:40 +03:00
Akmal Isomadinov
7266f8ebb2 Web:Common:Components:FilterInput: Refactoring id 2022-11-18 19:16:45 +05:00
f445ff6a6a Merge branch 'develop' into feature/Add-id-for-filter 2022-11-18 16:47:39 +03:00
36798c4241 Web:Common:Add close InfoPanel for unmounting a component. 2022-11-18 15:48:50 +03:00
d26c875f0a Web: Added canCopy function. 2022-11-18 15:34:40 +03:00
TimofeyBoyko
1eaa81b43b Web:Common:Api: fix request body for unarchive 2022-11-18 14:53:09 +03:00
811c58e4da Web: Added canPinRoom function. 2022-11-18 14:11:39 +03:00
37952ee5b9 Web: Files: fixed display members tab for viewer 2022-11-18 14:05:22 +03:00
d29088c33f Web: Common: added getArchiveRoomRoleActions 2022-11-18 14:04:29 +03:00
8bc024d260 Web: Added canMakeForm function. 2022-11-18 11:58:17 +03:00
Akmal Isomadinov
a1a056d2cd Web:Common:Components:FilterInput:Sub-Components:SelectedItem Added className 2022-11-18 13:53:21 +05:00
1bd4897199 Web:Client:Fix theme. 2022-11-18 11:41:55 +03:00
90a0250ea8 Web:Common:Fix CatalogItem theme. 2022-11-18 11:30:12 +03:00
Akmal Isomadinov
986b77057e Web:Common:Constants: Removed FilterTypeKeys constant 2022-11-18 13:10:52 +05:00
Akmal Isomadinov
cec0943a36 Web:Common:Components:FilterInput:Sub-Components:SortButton: Added id 2022-11-18 13:10:07 +05:00
Akmal Isomadinov
259b28f6e1 Web:Common:components:FilterInput:sub-components:FilterBlockItem Refactoring and added ids 2022-11-18 13:09:24 +05:00
39aa6cb0b2 Web:Common:Add MobileProgressBarTheme. 2022-11-17 22:32:01 +03:00
23dab23399 Web:Client:Fix submenu theme. 2022-11-17 22:31:15 +03:00
f557a3e177 Merge branch 'develop' into feature/api-origin 2022-11-17 20:26:07 +03:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
f306a525fb Web:Common:Add ProgressTheme. 2022-11-17 12:27:32 +03:00
Akmal Isomadinov
4f4cdbfe63 Web:Common:Components:FilterInput Added ids 2022-11-16 20:33:19 +05:00
Akmal Isomadinov
fe6ec38dff Web:Common:Constants: Added FilterTypeKeys 2022-11-16 20:31:14 +05:00
8b9683022c Update axiosClient.js 2022-11-16 18:00:41 +03:00
Viktor Fomin
893cc3f541 Common: move more login modal 2022-11-16 17:23:15 +05:00
0b22183c41 Web:Common:Fix button. 2022-11-16 14:26:04 +03:00
bd38e39796 Addec temp origin to apitest.onlyoffice.io 2022-11-15 17:21:45 +03:00
4a313d77d6 Merge branch 'develop' into feature/api-origin 2022-11-15 16:00:39 +03:00
60c70fea1d
Merge pull request #1037 from ONLYOFFICE/bugfix/fix-rooms-badge-jumping
Bugfix/fix rooms badge jumping
2022-11-15 13:43:31 +03:00
TimofeyBoyko
93beb16763 Web:Common:ColorTheme: fix pin icon styles 2022-11-15 13:28:35 +03:00
7c0d97361d Merge branch 'develop' into feature/Add-identifier-for-test 2022-11-15 10:38:41 +03:00
b3db2e5f3e Update axiosClient.js 2022-11-14 19:46:07 +03:00
8a909c33d2 Merge branch 'develop' into feature/api-origin 2022-11-14 17:17:14 +03:00
ec49254d56 Web:Common:Fix. 2022-11-14 17:06:27 +03:00
54ccbe0969 Web:Common:Fix toggleButton. 2022-11-14 17:02:20 +03:00
2b3d368a98 Web:Common:Fix theme. 2022-11-14 16:42:07 +03:00
78de751702 Web:Common:Fix buttons color theme. 2022-11-14 15:52:20 +03:00
2636ec0705 Web:Common:Fix accent color theme. 2022-11-14 15:51:53 +03:00
Viktor Fomin
6b241edca6 Merge branch 'develop' into feature/new-profile-loader 2022-11-14 17:13:47 +05:00
Akmal Isomadinov
f96d664904 Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:38:32 +05:00
Akmal Isomadinov
c6ac0e417c Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:19:03 +05:00
Akmal Isomadinov
94ea046a68 Web:Common:Components:Article:Sub-Components: Updated id 2022-11-14 15:15:51 +05:00
Akmal Isomadinov
8dda8926ee Web:Common:Constants Added FolderNames constant 2022-11-14 15:04:50 +05:00
TimofeyBoyko
05de3adde7 Web:Common:Utirls: delete accessRights and add actions for rooms, files and accounts 2022-11-14 12:03:49 +03:00
Akmal Isomadinov
6dcc9cb541 Web:Common:Components:Dialogs:RecoverAccessModalDialog: Updated id 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
d81ad1a7fe Web:Common:Components:Article:Sub-Components:Article-Payment-Alert: Update id 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
e37776195a Web:Common:Components:Article:Sub-Components:Article-Hide-Menu-Button: Added identifiers to components 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
bc942c568c Web:Common:Components:Article:Sub-Components:Article-Profile: Added id 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
23faa6f5ee Web:Common:Components:Article:Sub-Components: Added id for test 2022-11-14 13:04:18 +05:00
Akmal Isomadinov
fe47936dfb Web:Common:Components:Dialogs: Added ids to the RecoverAccessModalDialog components for the test 2022-11-14 13:04:17 +05:00
TimofeyBoyko
5f9a777c2d Web:Common:AccessRights: rename getAccountsAccessRights to getAccountsRights 2022-11-14 10:36:51 +03:00
TimofeyBoyko
678f2f0629 Merge branch 'develop' into feature/accerss-rights-matrix 2022-11-14 10:30:19 +03:00
8da3deaa72 Added api_origin 2022-11-13 22:38:33 +03:00
Viktor Fomin
8c2fb8f8e8 Merge branch 'develop' into feature/new-profile-loader 2022-11-13 03:59:43 +05:00
75ca934448 Merge branch 'develop' into feature/custom-theme 2022-11-11 22:22:40 +03:00
TimofeyBoyko
21a1c0c10d Web:Common:Utils: fix get room rights 2022-11-11 17:34:39 +03:00
TimofeyBoyko
5e52c802df Web:Common:Utils: add access rights matrix for accounts 2022-11-11 16:26:05 +03:00
TimofeyBoyko
5bbc75f8bf Web:Common:Utils: add access rights matrix 2022-11-11 15:58:41 +03:00
8e54e59bec Web: Common/Editor: Added a request for requests in advance. 2022-11-11 13:52:10 +03:00
724de88e94 Web: Common: Added skip requests. 2022-11-11 13:49:03 +03:00
Viktor Fomin
60852375ca Common: Loaders: ProfileViewLoader: fix 2022-11-10 19:53:32 +05:00
ddc067f3f0 Web:Common:Fix theme. 2022-11-10 17:29:55 +03:00
Viktor Fomin
68a4e8cb7c Merge branch 'develop' into feature/new-profile-loader 2022-11-10 18:45:22 +05:00
Viktor Fomin
559d995b2c Common: Loaders: ProfileViewLoader: add mobile view 2022-11-10 18:45:09 +05:00
Viktor Fomin
719d0a7a12 Common: Loaders: ProfileViewLoader: redesign 2022-11-10 18:17:09 +05:00
564ec4457f Web:Common:Add textColor in toggle button. 2022-11-10 15:33:19 +03:00
7652fb1d59 Web:Common:Add textColor in MainButton. 2022-11-09 22:37:28 +03:00
72063d86f3 Web:Client:Add textColor in FilterBlockItemTag theme. 2022-11-09 21:49:12 +03:00
096ececd57 Web:Common:Add textColor in tabsContainer theme. 2022-11-09 21:32:36 +03:00
e88b26d3dc Web:Common:Fix. 2022-11-09 21:06:44 +03:00
1858af3380 Web:Common:Add textColor in StyledCircle. 2022-11-09 20:33:45 +03:00
05ae4683f3 Web:Common:Fix displayProgress. 2022-11-09 20:33:07 +03:00
68b200b3d8 Web:Common:Add isPaidBadge. 2022-11-09 20:27:43 +03:00
dbb724a936 Web:Common:Add textColor in FloatingButton. 2022-11-09 17:29:38 +03:00
a062181894
Merge pull request #1003 from ONLYOFFICE/bugfix/portal-deletion
Bugfix/portal deletion
2022-11-09 17:18:14 +03:00
Viktor Fomin
1ea6cdd82b Merge branch 'develop' into feature/new-profile-loader 2022-11-09 19:15:28 +05:00
Viktor Fomin
f874e8586e Merge branch 'develop' into bugfix/logo 2022-11-09 18:56:25 +05:00
Viktor Fomin
7bb4cc73b7 Common: Article: fix 2022-11-09 18:55:58 +05:00
0bc03cd148 Web:Common:Add textColor in Calendar. 2022-11-09 15:01:17 +03:00
cad00f6b06
Merge pull request #1002 from ONLYOFFICE/bugfix/fixed-tags
Web: Files: fixed tiles tags
2022-11-09 14:37:05 +03:00
0e8e019b22 Web:Common:Add textColor in VersionBadge. 2022-11-09 14:33:42 +03:00
TimofeyBoyko
cdd2b68324 Web:Common:Tags: fix advanced tag 2022-11-09 14:28:37 +03:00
65bc045fe7 Fix TypeError: Cannot read properties of null (reading '1') 2022-11-09 14:15:55 +03:00
8f6d197f7e Web: Access to the portal deletion page is prohibited for anyone who is not the owner. 2022-11-09 14:07:59 +03:00
ce6188e960 Web:Common:Add textColor in badge. 2022-11-09 13:55:20 +03:00
5f49237046 Web:Common:Add textColor for button. 2022-11-09 13:54:54 +03:00
187c61df68 Web: Added a page for deleting the portal during the expired period. 2022-11-09 13:22:31 +03:00
Viktor Fomin
5eba23889a Merge branch 'develop' into feature/new-profile-loader 2022-11-08 19:41:20 +05:00
7803b0e33c Merge branch 'develop' into feature/custom-theme 2022-11-08 16:54:02 +03:00
Viktor Fomin
d6ff6aa69a Common: Loaders: ProfileViewLoader: redesign 2022-11-08 18:24:40 +05:00
cc64fc9887 Web: Files: fixed selectionParentRoom error 2022-11-08 14:11:17 +03:00
Viktor Fomin
adf7362477 Components: Loaders: SectionHeader: fix style 2022-11-07 17:42:13 +05:00
Viktor Fomin
657ccbb7c8 Common: Article: add support color scheme 2022-11-07 16:58:53 +05:00
Viktor Fomin
1cb56a31fe Merge branch 'develop' into bugfix/smart-banner 2022-11-07 15:09:16 +05:00
d7abe3b9da
Merge pull request #963 from ONLYOFFICE/feature/whitelabel
Feature/whitelabel
2022-11-03 20:10:06 +03:00
mushka
1929d6630d 403 bug push 2022-11-03 19:35:55 +03:00
mushka
1a0a1e7988 fixed user context options and noItem view 2022-11-03 18:18:09 +03:00
mushka
b1413f5d02 cleaned up console.logs 2022-11-03 17:37:54 +03:00
mushka
83ecc297b8 Merge branch 'develop' into feature/info-panel-update 2022-11-03 17:09:41 +03:00
mushka
7ea5907259 fixed resend invitations api call and implemented it in members view 2022-11-03 17:06:13 +03:00
Viktor Fomin
027efa8e8b Merge branch 'develop' into bugfix/smart-banner 2022-11-03 18:59:38 +05:00
Viktor Fomin
48c01a82fb Web: revert 2022-11-03 18:41:59 +05:00
6dd55c2643 Web: Common: fixed article height 2022-11-03 15:46:56 +03:00
Viktor Fomin
67d6ce5378 Common: Article: fix size 2022-11-03 17:40:16 +05:00
mushka
bb16de4ed9 Merge branch 'develop' into feature/info-panel-update and solved merge conflict 2022-11-03 14:52:11 +03:00
Viktor Fomin
e512015e70 Common: Article: fix img size 2022-11-03 16:44:54 +05:00
Viktor Fomin
b8e2e49bd0 Merge branch 'develop' into feature/whitelabel 2022-11-03 15:05:41 +05:00
TimofeyBoyko
71ee8f0cd8 Web:Common:FilterInput: fix long tag 2022-11-03 12:52:45 +05:00
TimofeyBoyko
3700193ddb Web:Client:Accounts: fix managaer role at filter 2022-11-03 12:39:25 +05:00
0ba888ef5b Merge branch 'develop' into feature/custom-theme 2022-11-02 20:40:59 +03:00
36bd8eab14 Web:Common:Delete onSaveSelectedNewThemes. 2022-11-02 16:05:02 +03:00
Viktor Fomin
28846ea77d Common: Article: fix position with smart banner 2022-11-02 17:13:23 +05:00
31c6e0a7aa Web:Common:Add delete method. 2022-11-01 18:26:05 +03:00
mushka
ef8af2739a fixed history user link bug 2022-11-01 13:31:49 +03:00
Viktor Fomin
2afea89545 Merge branch 'develop' into feature/whitelabel 2022-11-01 15:25:52 +05:00
mushka
c7603626f5 created new updateRoomMemberRole api callout 2022-10-31 18:27:03 +03:00
Viktor Fomin
20878155eb Common: Article: add theme for logo 2022-10-31 19:22:30 +05:00
mushka
8fe7efe036 cleaned up infoPanelBody inject 2022-10-31 14:09:28 +03:00
mushka
5ef235bf8c Merge branch 'develop' into feature/info-panel-update 2022-10-31 13:55:44 +03:00
Viktor Fomin
9510ccbc74 Common: SettingsStore: fix logo url 2022-10-31 13:29:40 +05:00
Elyor Djalilov
c4ff1d057c Merge branch 'develop' into feature/active-sessions 2022-10-31 11:24:05 +05:00
2facf7fa7c Web:Common:Add onSaveSelectedNewThemes. 2022-10-30 16:40:20 +03:00
Viktor Fomin
e3615d4257 Merge branch 'develop' into feature/whitelabel 2022-10-29 01:25:26 +05:00
36e47cbe2e Merge branch 'develop' into feature/invite-accounts 2022-10-28 14:54:46 +03:00
Viktor Fomin
eded0a3a50 Merge branch 'develop' into feature/whitelabel 2022-10-28 16:05:38 +05:00
8375711b5c Web: Client: InvitePanel: Fixed invitation links usage for rooms 2022-10-28 11:24:25 +03:00
TimofeyBoyko
3baf50db59 Web:Common:Article: add theme support for vertical line 2022-10-28 12:54:06 +05:00
TimofeyBoyko
5bcbbb9b90 Web:Common:Article: add vertical line and fix styles 2022-10-28 12:42:43 +05:00
Viktor Fomin
1a25afd518 Common: Article: fix 2022-10-27 23:50:23 +05:00
c5ed1fd0da Web: Client: Store: Added invite users action and api methods 2022-10-27 17:00:45 +03:00
9c5f86b237 Merge branch 'develop' into feature/invite-accounts 2022-10-27 09:47:54 +03:00
35545b4bff Web: Common: Constants: Added new user type 2022-10-27 09:35:44 +03:00
Viktor Fomin
d66cf18981 Common: SettingsStore: fix 2022-10-27 00:29:44 +05:00
073aa9943f Fix WrongTranslationVariablesTest issues + added missing files and key sorting 2022-10-25 14:52:15 +03:00
Viktor Fomin
9033164e4a Common: Article: fix style 2022-10-25 14:30:44 +05:00
Viktor Fomin
3a61992044 Common: Article: use logos from whitelabel 2022-10-25 14:27:30 +05:00
Elyor Djalilov
42471135ba Merge branch 'develop' into feature/active-sessions
# Conflicts:
#	packages/client/src/components/dialogs/index.js
#	packages/components/themes/base.js
#	packages/components/themes/dark.js
2022-10-25 13:41:42 +05:00
mushka
bc10920372 Merge branch 'develop' into feature/info-panel-update 2022-10-24 20:52:01 +03:00
mushka
6c3f18145d added isItemChanged to infoPanelStore 2022-10-24 20:44:19 +03:00
Viktor Fomin
bc5458bd21 Merge branch 'develop' into feature/portal-deactivation 2022-10-24 18:38:02 +05:00
Elyor Djalilov
cabc463451 Web:Client:ActiveSessions: added mobile view 2022-10-24 17:14:49 +05:00
Viktor Fomin
86c6a8421a Common: Utils: add bg pattern func 2022-10-24 15:01:43 +05:00
TimofeyBoyko
30799fa082 Merge branch 'develop' into bugfix/files-context-menu 2022-10-24 14:09:25 +05:00
Viktor Fomin
03edde3dea Merge branch 'develop' into feature/portal-deactivation 2022-10-24 14:08:11 +05:00
mushka
521d6f9250 moved selection calculation logic to info panel store and added several selection helper methods 2022-10-21 20:20:02 +03:00
ab22be7478 Merge branch 'develop' into bugfix/login 2022-10-21 13:44:42 +03:00
TimofeyBoyko
561cc3b550 Web:Common:API: fix archiveRoom method 2022-10-20 21:34:21 +05:00
9f7f9bfd8a Replaced local onlyoffice-document-editor-react component 2022-10-20 18:47:02 +03:00
Viktor Fomin
cb5836bed2 Merge branch 'develop' into bugfix/login 2022-10-20 17:54:36 +05:00
Viktor Fomin
de26960561 Common: SettingsStore: auto theme 2022-10-20 17:43:11 +05:00
9e0bc49c6f Merge branch 'develop' into feature/portal-deactivation 2022-10-20 15:04:54 +03:00
527e66c25e
Merge pull request #934 from ONLYOFFICE/bugfix/fix-memory-leak
Web:Common:FilterInput: fix memory leak
2022-10-20 14:44:19 +03:00
1f5605eb84 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-20 14:24:12 +03:00
285c831477 Web:Client:Delete greetingSettingsIsDefault, greetingSettingsIsDefault. 2022-10-20 14:08:47 +03:00
TimofeyBoyko
c831a2cfd6 Web:Common:FilterInput: fix memory leak 2022-10-20 14:17:58 +05:00
0d680dd005 Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-20 11:36:22 +03:00
9c99f3a53f Merge branch 'develop' into feature/shared-redesign-third-party 2022-10-19 19:41:39 +03:00
Elyor Djalilov
d819128bdb Web:Client:ActiveSessions: added translations 2022-10-19 18:30:22 +05:00
07f826889b Web:Client:Add styles focus in Button, ComboButton. 2022-10-19 14:47:54 +03:00
a5165d09cf Merge branch 'develop' into feature/company-info-settings 2022-10-18 10:31:15 +03:00
TimofeyBoyko
9f226d657a Web:Common:UserStore: fix withActivationBar 2022-10-17 19:24:03 +05:00
TimofeyBoyko
271840ab4a Web:Common:CurrentQuotaStore: add check for existing 2022-10-17 18:43:59 +05:00
TimofeyBoyko
f3cbe39b8a Web:Common:CurrentQuotaStore: add check for existing 2022-10-17 18:39:11 +05:00
TimofeyBoyko
43922a19d5 Merge branch 'develop' into feature/bar-quotas 2022-10-17 16:47:14 +05:00
TimofeyBoyko
f3d9653fd6 Web:Client: fix send again button of profile 2022-10-17 16:43:04 +05:00
TimofeyBoyko
54b7f99f8e Merge branch 'develop' into feature/bar-quotas 2022-10-17 16:06:33 +05:00