Commit Graph

7162 Commits

Author SHA1 Message Date
Akmal Isomadinov
5064bbad5a Web:Client:Pages:AccountsHome:Section:Header Added method getMenuItemId and Added id 2022-11-28 14:46:47 +05:00
Akmal Isomadinov
0128c3cbd6 Web:Client:Store:HeaderMenuStore Added method getMenuItemId 2022-11-28 14:45:57 +05:00
Akmal Isomadinov
5b4f005b90 Web:Client:Store:PeopleStore Added ids 2022-11-28 14:44:40 +05:00
Akmal Isomadinov
54ebd28205 Web:Client:Pages:Accounts:Home:Section:Header Updated ids 2022-11-28 14:10:53 +05:00
Viktor Fomin
366d92abb2 Merge branch 'develop' into feature/fix-whitelable 2022-11-28 12:09:11 +03:00
Akmal Isomadinov
e86e30c339 Web:Client:pages:AccountsHome:Section:Header Updated ids 2022-11-28 14:07:09 +05:00
Akmal Isomadinov
34925f3b68 Web:Client:Pages:AccountsHome:Section:Header Added id 2022-11-28 13:58:49 +05:00
Akmal Isomadinov
4dc109a338 Web:Client:Components:Dialogs:ArchiveDialog Refactoring id buttons 2022-11-28 13:34:46 +05:00
Elyor Djalilov
d3c02d495e added prefix Common 2022-11-28 13:28:46 +05:00
Elyor Djalilov
c628368e9b deleted duplicate keys 2022-11-28 13:26:08 +05:00
Akmal Isomadinov
b22f4f97b5 Web:Client:Components:Dialogs:EmptyTrashDialog Added ids 2022-11-28 12:52:16 +05:00
Elyor Djalilov
c6f5db2486 unused key removed 2022-11-28 12:12:42 +05:00
Elyor Djalilov
91932d5715 unused key removed 2022-11-28 12:10:01 +05:00
Elyor Djalilov
7b19ca5754 empty value keys fixed 2022-11-28 12:07:17 +05:00
Akmal Isomadinov
1c0a1bbc84 Web:Components:Context-Menu-Button Refactoring 2022-11-28 12:03:36 +05:00
Elyor Djalilov
6fffbed1e3 unused key removed 2022-11-28 12:02:58 +05:00
Akmal Isomadinov
354739a698 Web:Client:Pages:Home:Section:Header Added ids 2022-11-28 12:02:35 +05:00
Elyor Djalilov
254e21515b unused key removed 2022-11-28 11:58:42 +05:00
Elyor Djalilov
fc59726fe1 empty value keys fixed and deleted duplicate keys 2022-11-28 11:46:04 +05:00
Elyor Djalilov
b3ce916889 empty value keys fixed 2022-11-26 15:01:16 +05:00
Elyor Djalilov
ad1a6c4d4d Fix bad merge 2022-11-26 14:41:58 +05:00
Elyor Djalilov
a54463de2a empty value keys fixed 2022-11-26 14:28:36 +05:00
Elyor Djalilov
d462eac7c3 empty value keys fixed 2022-11-26 14:19:37 +05:00
Elyor Djalilov
1775ba9fe9 empty value keys fixed 2022-11-26 14:18:20 +05:00
Elyor Djalilov
bc729a8847 Fix bad merge 2022-11-26 13:47:40 +05:00
Timofey Boyko
3703d3f7aa Merge branch 'develop' into bugfix/149 2022-11-25 20:53:31 +03:00
Akmal Isomadinov
a946c6bb57 Web:Components:Link-With-Dropdown Added id 2022-11-25 19:51:56 +05:00
Akmal Isomadinov
cdfe014a99 Web:Common:Components:Navigation:Sub-Components Added id 2022-11-25 19:51:24 +05:00
Akmal Isomadinov
065b870bb7 Web:Client:Pages:Home:Section:Header Removed console log 2022-11-25 19:50:26 +05:00
Akmal Isomadinov
4e7233a258 Web:Client:Pages:Home:InfoPanel:Body:Views Added id 2022-11-25 19:49:42 +05:00
Akmal Isomadinov
396c9eb01b Web:Client:Pages:Home:InfoPanel:Body:Sub-Components:ItemTitle:ItemContextOptions Added method withId and refactoring 2022-11-25 19:48:50 +05:00
Akmal Isomadinov
5d0ac0d925 Web:Client:Pages:Home:InfoPanel:Body:Helpers:DetailsHelper Refactoring id 2022-11-25 19:47:03 +05:00
Akmal Isomadinov
dc3693358d Web: Updated ids infoPanel 2022-11-25 19:43:51 +05:00
Akmal Isomadinov
3677ab0bc5 Web:Client:Components:Panels:SelectionPanel Added id 2022-11-25 19:40:02 +05:00
Akmal Isomadinov
f4168fb4ef Web:Client:Components:Dialogs:DeleteDialog Added id 2022-11-25 19:39:07 +05:00
Akmal Isomadinov
6acab4edf4 Web:Client:Components:Dialogs:ArchiveDialog Added id 2022-11-25 19:38:00 +05:00
1b7844b44a Merge branch 'develop' into feature/socket-newtag 2022-11-25 17:17:31 +03:00
7fda8f1bf0 Merge branch 'develop' into bugfix/153 2022-11-25 16:18:23 +03:00
Elyor Djalilov
34954cd9e0 Fix bad merge 2022-11-25 17:51:13 +05:00
8826c473eb Merge branch 'develop' into bugfix/fix-article-iphone 2022-11-25 15:40:47 +03:00
0dce5ee718
Merge pull request #1082 from ONLYOFFICE/bugfix/156
Bugfix/156
2022-11-25 15:37:02 +03:00
Elyor Djalilov
bb5000fb82 Fix bad merge 2022-11-25 16:42:35 +05:00
Elyor Djalilov
b8348af578 Merge branch 'develop' into feature/new-docspace-translations
# Conflicts:
#	packages/client/public/locales/en/DeleteDialog.json
#	packages/client/public/locales/en/Files.json
#	packages/client/public/locales/en/InfoPanel.json
#	packages/client/public/locales/en/InviteDialog.json
#	packages/client/public/locales/en/Payments.json
#	packages/client/public/locales/en/Profile.json
#	packages/client/public/locales/en/Settings.json
#	packages/client/public/locales/en/Translations.json
#	packages/client/public/locales/ru/Files.json
#	packages/client/public/locales/ru/InfoPanel.json
#	packages/client/public/locales/ru/Payments.json
#	packages/client/src/components/GlobalEvents/RenameEvent.js
#	packages/client/src/pages/Home/Section/Filter/index.js
2022-11-25 16:27:23 +05:00
78f406f4d3
Merge pull request #1084 from ONLYOFFICE/bugfix/payments-page-loading
Bugfix/payments page loading
2022-11-25 14:13:03 +03:00
f929e42dcb Merge branch 'develop' into bugfix/fix-article-iphone 2022-11-25 14:04:37 +03:00
ac236c8399 Web: Fixed checks. 2022-11-25 13:24:27 +03:00
95ff7c57e8 Web: Changed dependency array. 2022-11-25 13:08:34 +03:00
e2e81982f9 SocketIO: new rooms and events 2022-11-25 12:42:15 +03:00
a8ebab9510 Web: Deleted useless code. 2022-11-25 12:37:19 +03:00
e02b4ec633 Web: Changed the check for getting a link to an account. 2022-11-25 12:33:48 +03:00
0999986a8c Web: Renamed function. 2022-11-25 12:32:43 +03:00
4469e4aa63 Web: Added waiting for receiving information on the tariff on the payment page. 2022-11-25 12:31:18 +03:00
23a7210fbc Merge branch 'develop' into bugfix/access-rights 2022-11-24 20:33:59 +03:00
Elyor Djalilov
8f4d6eb638 bugfix/157: badge style fixed 2022-11-24 20:08:46 +05:00
Elyor Djalilov
0697454a59 bugfix/157: badge style fixed 2022-11-24 20:07:23 +05:00
Elyor Djalilov
5870df42bc bugfix/156: tooltip style fixed 2022-11-24 20:03:23 +05:00
Elyor Djalilov
6daf5a2670 bugfix/156: tooltip style fixed 2022-11-24 19:57:40 +05:00
Elyor Djalilov
e186950190 bugfix/156: tooltip style fixed 2022-11-24 19:56:37 +05:00
Elyor Djalilov
bbb1afb7ec bugfix/156: tooltip style fixed 2022-11-24 19:54:30 +05:00
Elyor Djalilov
b7de4a5ab0 bugfix/156: tooltip style fixed 2022-11-24 19:40:19 +05:00
35698e1ea6 Web: Added temp path. 2022-11-24 16:00:32 +03:00
90db4721d6 Web: Fixed getting the correct folder when opening a dialog inside a room. 2022-11-24 15:33:10 +03:00
mushka
5db2980ed2 fix 2 2022-11-24 15:26:03 +03:00
d9c7bd924e Web: Added opening a document when saving a copy in the editor. 2022-11-24 13:56:30 +03:00
043bf639c7 Web: Files: fixed delete third-party room 2022-11-24 11:59:02 +03:00
Elyor Djalilov
2aae1d4a25 Merge branch 'bugfix/border-style' of github.com:ONLYOFFICE/DocSpace into bugfix/border-style 2022-11-24 13:25:17 +05:00
Elyor Djalilov
880f2ad440 bugfix: fixed table header border 2022-11-24 13:25:05 +05:00
Viktor Fomin
2e585e1448 Client: PortalSettings: WhiteLabel: fix 2022-11-24 13:14:01 +05:00
Viktor Fomin
59c91700be Client: PortalSettings: WhiteLabel: fix style 2022-11-24 13:01:16 +05:00
Viktor Fomin
aebeb0baeb Components: Themes: add color 2022-11-24 13:00:55 +05:00
Viktor Fomin
989b965841 Client: fix translate 2022-11-24 12:57:38 +05:00
Akmal Isomadinov
6c79c21562 Web:Client:Store:FilesActionsStore Added ids 2022-11-24 12:51:54 +05:00
Akmal Isomadinov
72eec51a6f Web:Client:Components:Dialogs:CreateEditRoomDialog:Sub-Components:TagInput Updated id 2022-11-24 12:51:26 +05:00
Akmal Isomadinov
96b1e07011 Web:Client:Components:Dialogs:CreateEditRoomDialog:sub-components: Added ids 2022-11-24 12:50:20 +05:00
Akmal Isomadinov
ef3cafd830 Web:Components:Table-Container:GroupMenuItem Added id 2022-11-24 12:47:29 +05:00
Akmal Isomadinov
e553da3936 Web:Client:Components:Dialogs:CreateEditRoomDialog:Data Added ids 2022-11-24 12:46:27 +05:00
Akmal Isomadinov
e5768e7bd1 Web:Client:Components:Dialogs:CreateEditRoomDialog:CreateRoomDialog Added ids 2022-11-24 12:45:14 +05:00
Viktor Fomin
e48ffdd62f Common: Article: delete console 2022-11-24 12:16:23 +05:00
Viktor Fomin
c52f54abc1 Client: PortalSettings: WhiteLabel: fix 2022-11-24 09:18:11 +05:00
Viktor Fomin
6a93ed476e Client: About: fix 2022-11-24 05:39:20 +05:00
Viktor Fomin
f52ec4e467 Common: Article: fix 2022-11-24 05:39:13 +05:00
Viktor Fomin
f80fcd591e Common: get user theme 2022-11-24 05:39:00 +05:00
Viktor Fomin
1fb1228dbd Merge branch 'develop' into feature/fix-whitelable 2022-11-24 02:33:13 +05:00
d3d91ba54e Merge branch 'develop' into feature/custom-theme 2022-11-23 19:57:15 +03:00
faf2b40abd Web:Client:Add color theme in link. 2022-11-23 18:19:49 +03:00
10d2859441 Web:Client:Add color theme. 2022-11-23 17:50:29 +03:00
0ee0cdadcc Web:Common:Removed adding a theme for the buttons that are in the top panel when working with a file. 2022-11-23 17:33:24 +03:00
c68bca73c8 Web:Client:Add theme. 2022-11-23 17:22:13 +03:00
9bc8eb5455 Web:Client:Fix. 2022-11-23 16:32:27 +03:00
2364f63506
Merge pull request #1065 from ONLYOFFICE/bugfix/121
Bugfix/121
2022-11-23 16:00:52 +03:00
Elyor Djalilov
76f73a9b61 bugfix/121 2022-11-23 17:53:23 +05:00
5d6e0b17c9 Web:Common:Fix hover. 2022-11-23 14:52:36 +03:00
8de0828704 Merge branch 'develop' into bugfix/border-style 2022-11-23 14:45:41 +03:00
d183495072 Web:Components:Add theme in StyledSelectedOwner. 2022-11-23 14:45:16 +03:00
7a70842dae Web:Client:Add event keyup. 2022-11-23 14:24:29 +03:00
e3c7edb82f Web:Client:Removed function from render. 2022-11-23 14:13:40 +03:00
463ebc02aa Web:Client:Removed function from render. 2022-11-23 14:08:16 +03:00
f7506a42eb Fix socket subscription to new created files 2022-11-23 13:52:18 +03:00
0ff6e91698
Merge pull request #1075 from ONLYOFFICE/bugfix/options-editor
Bugfix/options editor
2022-11-23 13:49:39 +03:00
Viktor Fomin
fd181baae3 Merge branch 'develop' into feature/fix-whitelable 2022-11-23 15:01:42 +05:00
0a3c9466b8 Web: Fixed url. 2022-11-23 13:00:25 +03:00
b84dddb896 Web:Components:Fix color text. 2022-11-23 12:56:42 +03:00
Viktor Fomin
5c997947f8 Common: Article: fix close 2022-11-23 14:45:22 +05:00
6132883419 Web: fixed mark as read icon 2022-11-23 12:10:22 +03:00
85d43ef90d Web:Client:Refactoring. 2022-11-23 12:03:00 +03:00
9a60578c6f Web:Client:Setting a checkbox for a new theme. 2022-11-23 11:56:13 +03:00
Viktor Fomin
802316c5f9 Client: NavMenu: ProfileMenu: fix close icon 2022-11-23 13:13:42 +05:00
Viktor Fomin
671f6c94f5 Client: PortalSettings: WhiteLabel: add await 2022-11-23 12:58:52 +05:00
TimofeyBoyko
979966f997 Web:Client:Home: fix actions at archived header context menu 2022-11-23 10:55:17 +03:00
9560bf0923 Web:Client:Removed function from render. 2022-11-23 10:53:37 +03:00
eb64a033a8 Web: Refactoring. 2022-11-23 10:10:11 +03:00
Viktor Fomin
7ab2d622cb Client: PortalSettings: WhiteLabel: fix 2022-11-23 10:11:00 +05:00
Viktor Fomin
0672cd9e38 Client: PortalSettings: WhiteLabel: fix disable 2022-11-23 09:45:23 +05:00
Viktor Fomin
dcf40b8097 Client: PortalSettings: WhiteLabel: add save 2022-11-23 09:43:50 +05:00
Viktor Fomin
b8715c153b Client: PortalSettings: WhiteLabel: fix use text as logo 2022-11-23 08:56:08 +05:00
Viktor Fomin
76d2c6ed28 Client: PortalSettings: WhiteLabel: add upload 2022-11-23 08:46:34 +05:00
Viktor Fomin
6ffba7b368 Client: PortalSettings: WhiteLabel: fix size 2022-11-23 06:24:17 +05:00
Viktor Fomin
cd5a5d7d23 Client: PortalSettings: WhiteLabel: fix path 2022-11-23 06:22:12 +05:00
Viktor Fomin
b602497021 Client: rename logos 2022-11-23 06:19:52 +05:00
Viktor Fomin
80cd969381 Client: fix logo 2022-11-23 06:19:41 +05:00
Viktor Fomin
004aceda28 Common: Article: fix logo 2022-11-23 06:19:01 +05:00
Viktor Fomin
75bcfdbdd2 Login: SimpleNav: fix logo 2022-11-23 06:18:48 +05:00
Viktor Fomin
85f092aa0d Login: fix logo 2022-11-23 06:18:24 +05:00
Viktor Fomin
c2fb9f583e Merge branch 'develop' into feature/fix-whitelable 2022-11-23 04:36:46 +05:00
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
e28682d6d1
Merge pull request #1072 from ONLYOFFICE/bugfix/socket-docker-dev
Bugfix/socket docker dev
2022-11-22 18:51:00 +03:00
cfcf747466 Web:Client:Delete box className. 2022-11-22 18:35:34 +03:00
05b554f8f4 Web:Client:Fix className. 2022-11-22 18:32:59 +03:00
7cc80cfbb9 Web:Client:Fix create room button theme. 2022-11-22 18:29:53 +03:00
fcb240e5c0 Web:Components:Fix create room button theme. 2022-11-22 18:26:51 +03:00
4b180094e8 Whitelabel: rename 2022-11-22 18:03:59 +03:00
9e22a50957 Web: Added check for group actions. 2022-11-22 17:52:45 +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
49e982763e Web: Added a check for the possibility of showing the history version. 2022-11-22 17:02: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
2354f04f97 Web:Client:Fix className. 2022-11-22 16:52:49 +03:00
7521af5c24 Web:Client:Fix className. 2022-11-22 16:50:14 +03:00
4cbe007ac4 Web:Components:Fix button border. 2022-11-22 16:39:40 +03:00
7bf6a25bc6 Web: Returned removing opening location. 2022-11-22 16:23:07 +03:00
76b9752791 Web:Common:With a dark theme, added icon highlighting. 2022-11-22 16:18:23 +03:00
c43ffe5ce4 Web:Components:With a dark theme, added icon highlighting. 2022-11-22 16:18:07 +03:00
2fff8e973e
Merge pull request #1071 from ONLYOFFICE/feature/new-dark-loader
Feature/new dark loader
2022-11-22 16:05:47 +03:00
644e91982d Web:Client: Removed the event handler from the container, hung it on each block. 2022-11-22 16:05:04 +03:00
e74f9b538a Merge branch 'develop' into bugfix/access-rights 2022-11-22 16:02:25 +03:00
Akmal Isomadinov
610cf0fdda Web:Components:Loader:Types:Rombs: Added dark theme 2022-11-22 18:01:23 +05:00
Akmal Isomadinov
4ec25a14da Web:Components:Themes: Added themes for romb loader 2022-11-22 17:59:49 +05:00
Viktor Fomin
9ceec6103e Merge branch 'develop' into feature/fix-whitelable 2022-11-22 15:42:23 +05:00
Viktor Fomin
ce1e75827d Client: PortalSettings: WhiteLabel: fix path 2022-11-22 15:41:53 +05:00
Viktor Fomin
117b5dc83b Client: PortalSettings: WhiteLabel: add size label 2022-11-22 15:39:58 +05:00
Viktor Fomin
8ebab5b1f0 Client: PortalSettings: WhiteLabel: fix 2022-11-22 15:35:17 +05:00
TimofeyBoyko
d2e272f15a Web:Common:Section: add render info-panel with portal for mobile devices 2022-11-22 13:21:59 +03:00
TimofeyBoyko
0ef9f379ef Web:Client:Shell: add toast render with portal for mobile devices 2022-11-22 13:02:46 +03:00
TimofeyBoyko
3b8325ad36 Web:Client:InvitePanel: add render with portal for mobile devices 2022-11-22 13:01:41 +03:00
Viktor Fomin
3f59849627 Client: fix logos 2022-11-22 14:48:16 +05:00
TimofeyBoyko
60d83d8170 Web:Common:FilterInput: add render filter block with portal for mobile devices 2022-11-22 12:38:45 +03:00
TimofeyBoyko
2e57ba1f3c Merge branch 'develop' into bugfix/fix-article-iphone 2022-11-22 12:17:16 +03:00
TimofeyBoyko
91835c2b95 Web:Common:Article: add render with portal for mobile devices 2022-11-22 12:16:53 +03:00
Viktor Fomin
6b47cc1b60 Client: About: fix logo 2022-11-22 13:11:35 +05:00
mushka
28ef220eef fix 2022-11-22 11:10:15 +03:00
702aaf3653 WEb: Editor: Commented useless code. 2022-11-22 11:07:43 +03:00
918ca0b76f Web: Editor: Commented useless code. 2022-11-22 11:06:57 +03:00
Viktor Fomin
50c55f0e29 Common: fix logo 2022-11-22 13:06:07 +05:00
Viktor Fomin
21b359cf14 Client: NavMenu: fix logo 2022-11-22 13:05:53 +05:00
9faa4299ab Web: Editor: Fixed message display in editor. 2022-11-22 11:05:37 +03:00
mushka
0ca2bf2b4f Merge branch 'develop' into bugfix/create-room-tag-input 2022-11-22 10:56:35 +03:00
mushka
8b376ee023 fix 2022-11-22 10:54:05 +03:00
Akmal Isomadinov
6f9c024a08 Web:Components:Table-Container:TableGroupMenu Added ids 2022-11-22 12:52:10 +05:00
Akmal Isomadinov
289cebad75 Web:Client:Pages:Home:Section:Header Added ids 2022-11-22 12:51:22 +05:00
Akmal Isomadinov
7d18a3f372 Web:Client:Pages:Home:InfoPanel:Header: Added id 2022-11-22 12:50:33 +05:00
Akmal Isomadinov
8daa9b5291 Web:Common:Components:Navigation: Added ids 2022-11-22 12:49:07 +05:00
Viktor Fomin
2d41cd5a72 Login: fix logo 2022-11-22 12:48:34 +05:00
Akmal Isomadinov
f0a021478a Web:Client:Store:FileStore: Added getCheckboxItemId function 2022-11-22 12:47:58 +05:00
Viktor Fomin
1a06ea3787 Client: delete useless 2022-11-22 12:35:05 +05:00
Viktor Fomin
248b2017ad Common: API: delete useless 2022-11-22 12:34:57 +05:00
TimofeyBoyko
cbc8b9efac Web:Client:MainBar: fix mobile styles 2022-11-22 10:29:43 +03:00
60284ff9e0
Merge pull request #1068 from ONLYOFFICE/bugfix/whitelabel
Bugfix/whitelabel
2022-11-22 12:26:18 +05:00
Elyor Djalilov
8b33a33d8b bugfix/153: fixed bug with text 2022-11-22 12:10:57 +05:00
Elyor Djalilov
5b32fd4eb2 fixed style context menu 2022-11-22 11:49:46 +05:00
Viktor Fomin
a54341871e Merge branch 'develop' into bugfix/whitelabel 2022-11-21 23:46:04 +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
b11e857291 Web:Client:Add translation for ColorSchemeDialog. 2022-11-21 18:39:33 +03:00
54dbeb7f73 Web:Client:Fix event handler functions. 2022-11-21 18:34:19 +03:00
ca6e5b8f88 Web:Client:Add removeEventListener. 2022-11-21 17:22:10 +03:00
Elyor Djalilov
acefa7e55d bugfix/121: fixed style combobox 2022-11-21 18:35:36 +05:00
Elyor Djalilov
d0824a6314 Merge branch 'develop' into bugfix/border-style 2022-11-21 18:22:38 +05:00
4ce1bdaa17 Web: Added restriction on viewing version history. 2022-11-21 16:12:22 +03:00
98df2d2e3d Web:Common:Add class filter-text. 2022-11-21 16:05:47 +03:00
d00d7e17cd Web:Client:Add translations for Paid. 2022-11-21 15:55:01 +03:00
304f47adaf Merge branch 'feature/custom-theme' of github.com:ONLYOFFICE/AppServer into feature/custom-theme 2022-11-21 15:51:35 +03:00
6c4d62fe27 Web:Client:Added translations per country with themes. 2022-11-21 15:51:19 +03:00
TimofeyBoyko
d4fc3080e2 Web:Client:MainBar: hide main bar while tranlsations are loading 2022-11-21 15:50:51 +03:00
e6df1f7f36 Web: Fixed the problem of deleting the title when saving the document. 2022-11-21 15:45:20 +03:00
sk81.biz@gmail.com
af5829d92a Mod package.json origin: https://system.onlyoffice.io 2022-11-21 14:39:12 +03:00
TimofeyBoyko
8cdf2d2b8a Web:Client:NewFilesPanel: delete useless set state 2022-11-21 14:12:29 +03:00
9651586e98 Web:Client:Add const. 2022-11-21 14:04:32 +03:00
c5e54cae1f Web:Move dependency to client package. 2022-11-21 14:00:31 +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
TimofeyBoyko
c6add5cd67 Web:Client:Article: disable multi click on new files badge 2022-11-21 13:45:36 +03:00
TimofeyBoyko
5a9e66bd09 Web:Client:HOCs: fix multi click for unpin and new files badges 2022-11-21 13:45:36 +03:00
TimofeyBoyko
b42b39f888 Web:Client:NewFilesPanel: fix double request and negative new files count 2022-11-21 13:45:36 +03:00
Viktor Fomin
7db84753b7 Client: PortalSettings: WhiteLabel: add logo options 2022-11-21 13:56:29 +05: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
9cfda401f9 Web: Deleted useless code. 2022-11-21 11:12:37 +03:00
cd899abffe Web:Client:Fix. 2022-11-21 11:10:52 +03:00
69ef34ca7c Web: Deleted useless code. 2022-11-21 11:06:51 +03:00
f4817e0b02 Web:Client:Fix. 2022-11-21 11:04:01 +03:00
9ccfe113bc Web: Added canViewRoomInfo function. 2022-11-21 10:58:01 +03:00
e64ca3713a Web: Deleted useless code. 2022-11-21 10:45:43 +03:00
445b36feb0 Web: Renamed functions. 2022-11-21 10:42:11 +03:00
045c98258f Web: Added check for archive folder. 2022-11-21 10:37:10 +03:00
15074a1069 Web: Rename. 2022-11-21 10:05:04 +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
Viktor Fomin
f95e6d2b86 Merge branch 'develop' into bugfix/whitelabel 2022-11-18 20:50:45 +05: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
b700db24f9 Merge branch 'develop' into bugfix/fix-create-tag 2022-11-18 18:28:25 +03:00
9982cae3c0
Merge pull request #1054 from ONLYOFFICE/bugfix/additional-resources
bugfix/additional-resources
2022-11-18 18:27:02 +03:00
5ed81e9433 Merge branch 'develop' into feature/catalog-redesign 2022-11-18 18:20:53 +03:00
dee6ba8f60 Web: Common: fixed article loader 2022-11-18 18:17:17 +03:00
0b7c6dfb94 Merge branch 'bugfix/access-rights' of github.com:ONLYOFFICE/AppServer into bugfix/access-rights 2022-11-18 18:13:52 +03:00
cc8530a1c7 Web: New condition added. 2022-11-18 18:13:41 +03:00
cb3729b0bc Merge branch 'develop' into bugfix/fix-sso-loader 2022-11-18 18:11:53 +03:00
df34c842ac Web: Commented useless code. 2022-11-18 18:03:25 +03:00
28b8ac504e Web: Common: added getArchiveFileRoleActions 2022-11-18 18:01:58 +03:00
9a8fab2946 Web: Removed conditions that are used inside a function. 2022-11-18 17:53:52 +03:00
25a5ec7b84 Web: Refactoring. 2022-11-18 17:50:55 +03:00
784abbe39e Merge branch 'develop' into feature/catalog-redesign 2022-11-18 17:49:57 +03:00
7922b78a57 Web: Added additional conditions added. 2022-11-18 17:49:48 +03:00
c3ffe890ab Web: Added additional conditions added. 2022-11-18 17:46:59 +03:00
a423fcd50b Web: Renamed function. 2022-11-18 17:45:20 +03:00
aed454bc82 Web: Removed conditions that are used inside a function. 2022-11-18 17:44:30 +03:00
Akmal Isomadinov
b65f887f6b Web:Common:Components:FilterInput: Updated id 2022-11-18 19:43:03 +05:00
e8536f2714 Web: Added additional conditions added. 2022-11-18 17:42:28 +03:00
94ce8ff399 Merge branch 'develop' into bugfix/access-rights 2022-11-18 17:41:40 +03:00
8ae61fdfff Web: Rename function. 2022-11-18 17:38:18 +03:00
Akmal Isomadinov
038eb30a9f Web:Components:View-Selector: Removed id 2022-11-18 19:17:11 +05:00
Akmal Isomadinov
7266f8ebb2 Web:Common:Components:FilterInput: Refactoring id 2022-11-18 19:16:45 +05:00
Akmal Isomadinov
2652f0c800 Web:Components:Combobox Removed id 2022-11-18 19:15:48 +05:00
Akmal Isomadinov
01b97ee52f Web:Client:Pages:AccountsHome:Section:Filter: Updated id 2022-11-18 19:14:56 +05:00
35e22fe8c8 Merge branch 'develop' into feature/fix-whitelable
# Conflicts:
#	web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
#	web/ASC.Web.Core/LogoUploader.cs
#	web/ASC.Web.Core/PublicResources/Resource.resx
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-11-18 16:48:19 +03:00
f445ff6a6a Merge branch 'develop' into feature/Add-id-for-filter 2022-11-18 16:47:39 +03:00
2b44060186 Merge branch 'develop' into bugfix/access-rights 2022-11-18 16:11:33 +03:00
1e597effc2 Web: Deleted useless code. 2022-11-18 16:10:34 +03:00
36798c4241 Web:Common:Add close InfoPanel for unmounting a component. 2022-11-18 15:48:50 +03:00
cbfb31e9b6 Web: Added canCreateCopy function. 2022-11-18 15:45:01 +03:00
d26c875f0a Web: Added canCopy function. 2022-11-18 15:34:40 +03:00
e7a00955ef Web:Client:Add create tag for enter. 2022-11-18 15:01:24 +03:00
TimofeyBoyko
1eaa81b43b Web:Common:Api: fix request body for unarchive 2022-11-18 14:53:09 +03:00
42d7a6dda7 Web: Changed canChangeUserRole function. 2022-11-18 14:35:36 +03:00
TimofeyBoyko
0e822663ae Web:Client:EmptyContainer: fix empty screen for archived room 2022-11-18 14:34:43 +03:00
7150aa67ec Web: Added canEditRoom function, deleted useless code. 2022-11-18 14:21:54 +03:00
811c58e4da Web: Added canPinRoom function. 2022-11-18 14:11:39 +03:00
Viktor Fomin
64469e0bb8 Merge branch 'develop' into bugfix/additional-resources 2022-11-18 16:11:14 +05: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
18a38aafa7 Web: Refactoring room functions. 2022-11-18 14:02:49 +03:00
Viktor Fomin
fe4f36c902 Client: ProfileActionsStore: fix keys 2022-11-18 16:01:35 +05:00
0caddaaca2
Merge pull request #1052 from ONLYOFFICE/bugfix/fix-archived-header-context-menu
Bugfix/fix archived header context menu
2022-11-18 13:47:31 +03:00
3fc6f847f5 Web:Client:Add SSOLoader in ToggleSSO. 2022-11-18 13:47:21 +03:00
2a483e6eb3 Fix Cannot read properties of undefined (reading 'rootFolderType') 2022-11-18 13:20:54 +03:00
TimofeyBoyko
4dcb0fcab1 Web:Client:Home: delete useless code 2022-11-18 13:12:07 +03:00
TimofeyBoyko
afc18b4a03 Merge branch 'develop' into bugfix/fix-archived-header-context-menu 2022-11-18 13:09:07 +03:00
TimofeyBoyko
06b3bbe017 Web:Client:Home: fix header menu for archive 2022-11-18 13:08:22 +03:00
Viktor Fomin
9c7eae5be3 Merge branch 'develop' into bugfix/whitelabel 2022-11-18 14:47:21 +05:00
Viktor Fomin
dabf301a6d Client: PortalSettings: WhiteLabel: fix 2022-11-18 14:47:07 +05:00
9405028eb8 Web: Removed useless code. 2022-11-18 12:46:55 +03:00
3a29f82e0f Web: Deleted useless code. 2022-11-18 12:44:03 +03:00
46b514c09f Web: People: hid empty header menu 2022-11-18 12:09:29 +03:00
7894f9e434 Web: Refactoring. 2022-11-18 12:05:45 +03:00
1157806abb Web: Files: hid empty header menu 2022-11-18 12:00:10 +03:00
bfae96c6e9 Web: Files: removed pin-to-top from archive 2022-11-18 11:59:25 +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
c6a9bccd65 Web: fixed. 2022-11-18 11:45:50 +03:00
b11fae33df Web:Components:Delete unnecessary style. 2022-11-18 11:42:27 +03:00
1bd4897199 Web:Client:Fix theme. 2022-11-18 11:41:55 +03:00
12c8ca7a6f Web: Refactoring. 2022-11-18 11:37:04 +03:00
36191e5b41 Web:Components:Fix StyledCatalogItemImg. 2022-11-18 11:31:00 +03:00
fd0ee377a4 Web: Added common function. 2022-11-18 11:30:20 +03:00
90a0250ea8 Web:Common:Fix CatalogItem theme. 2022-11-18 11:30:12 +03:00
30cb9bec38 Web: added canMoveAlienItems function. 2022-11-18 11:28:59 +03:00
Akmal Isomadinov
369eb1c4e9 Web:Components:View-Selector: Added ids 2022-11-18 13:12:24 +05:00
Akmal Isomadinov
a38e534b6e Web:Components:Combobox Added id 2022-11-18 13:11:54 +05: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
Akmal Isomadinov
8948460b58 Web:Client:Pages:Home:Section:Filter Added ids 2022-11-18 13:08:05 +05:00
Akmal Isomadinov
82e7745bfe Web:Client:Page:AccountsHome:Section:Filter: Added id 2022-11-18 13:06:47 +05:00
Viktor Fomin
6274f99540 Client: PortalSettings: WhiteLabel: restore default logo 2022-11-18 13:05:59 +05:00
a7df5b95b5 Web: Added canMove function. 2022-11-18 10:58:00 +03:00
be418d8e8e Web: fixed. 2022-11-18 10:50:45 +03:00
39a8e23ef3 Web: fixed 2022-11-18 10:35:14 +03:00
638f9c605b Web: Added canDeleteAlienItems function. 2022-11-18 10:32:11 +03:00
7f06959d57 Web: Added canDeleteItsItem function. 2022-11-18 10:27:28 +03:00
df9870b76e Web: Added canFillForm function. 2022-11-18 09:57:43 +03:00
7a77396983 Web: Added canRename function. 2022-11-18 09:36:40 +03:00
Viktor Fomin
2cb754235f Client: PortalSettings: WhiteLabel: use text as logo 2022-11-18 07:01:07 +05:00
Viktor Fomin
5acd929895 Client: PortalSettings: Utils: add logo generator 2022-11-18 07:00:46 +05:00
Viktor Fomin
edaeeb9320 Client: PortalSettings: WhiteLabel: fix style 2022-11-18 03:30:02 +05:00
Viktor Fomin
d406f711c7 Components: Themes: add colors 2022-11-18 03:29:44 +05:00
Viktor Fomin
6585031127 Client: PortalSettings: WhiteLabel: add save/cancel buttons 2022-11-18 03:23:01 +05:00
Viktor Fomin
b0b8cc07fa Client: PortalSettings: WhiteLabel: add editors logo 2022-11-18 03:21:36 +05:00
Viktor Fomin
24ab1ebc60 Client: PortalSettings: WhiteLabel: add favicon 2022-11-18 03:07:08 +05:00
Viktor Fomin
11e5a7d965 Client: PortalSettings: WhiteLabel: fix padding 2022-11-18 03:03:04 +05:00
Viktor Fomin
1ea594820c Client: PortalSettings: WhiteLabel: add about logo 2022-11-18 01:55:14 +05:00
Viktor Fomin
e803a0f298 Client: PortalSettings: WhiteLabel: add login logo 2022-11-18 01:52:52 +05:00
Viktor Fomin
96a3d72724 Client: PortalSettings: WhiteLabel: add compact logo 2022-11-18 01:46:26 +05:00
Viktor Fomin
fba8043a93 Client: PortalSettings: WhiteLabel: use translate 2022-11-18 01:39:53 +05:00
Viktor Fomin
2436f81935 Client: PortalSettings: WhiteLabel: move logo to component 2022-11-18 01:38:05 +05:00
Viktor Fomin
5e13be9b35 Client: PortalSettings: WhiteLabel: add logos 2022-11-18 00:57:54 +05:00
5ced8a9533 Web:Components:Delete unnecessary style. 2022-11-17 22:33:43 +03:00
9843362686 Web:Components:Add MobileProgressBar theme. 2022-11-17 22:32:27 +03: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
Viktor Fomin
0e739459e1 Client: PortalSettings: WhiteLabel: start refactoring 2022-11-18 00:30:14 +05:00
Viktor Fomin
198043095d Client: PortalSettings: WhiteLabel: move styles 2022-11-18 00:29:41 +05:00
f557a3e177 Merge branch 'develop' into feature/api-origin 2022-11-17 20:26:07 +03:00
7415a19a5e Merge branch 'develop' into bugfix/login 2022-11-17 19:05:09 +03:00
8ab20eea79 Merge branch 'develop' into feature/api-origin 2022-11-17 18:16:43 +03:00
5583ca0467
Merge pull request #1048 from ONLYOFFICE/hotfix/nodejs-fix-nconf
fix nconf
2022-11-17 18:13:10 +03:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
1903b4e779 Web: Added canEditFile function. 2022-11-17 16:59:08 +03:00
3a3d6baeef Web: Added canViewVersionHistory function. 2022-11-17 16:41:32 +03:00
af88793aa4 Merge branch 'develop' into feature/api-origin 2022-11-17 16:09:15 +03:00
6a87a8e6bd Web: Added canChangeVersionHistory function. 2022-11-17 16:05:59 +03:00
9da275952c fix nconf 2022-11-17 15:58:13 +03:00
Viktor Fomin
631845fb55 Merge branch 'develop' into bugfix/login 2022-11-17 17:40:39 +05:00
49975050b6 Web:Client:Add hiding custom functionality. 2022-11-17 15:12:44 +03:00
TimofeyBoyko
f30142af13 Web:Client:EmptyScreen: fix gap between items 2022-11-17 14:57:52 +03:00
TimofeyBoyko
3d8593f803 Web:Client:EmptyScreen: fix img for rooms 2022-11-17 14:41:15 +03:00
TimofeyBoyko
5694bc0678 Web:Client:EmptyScreen: fix header text 2022-11-17 14:36:01 +03:00
83ac09a0d3 Web:Client:Fix. 2022-11-17 14:29:32 +03:00
TimofeyBoyko
58e5ed56e9 Web:Client:EmptyContainer: fix invite users for empty container into rooms 2022-11-17 14:28:37 +03:00
TimofeyBoyko
6f75168fce Web:Client:EmptyContainer: hide filter block for emtpy folder container 2022-11-17 14:09:09 +03:00
17ed215623 Web:Client:Fix preview. 2022-11-17 14:05:04 +03:00
TimofeyBoyko
9c70bc73eb Web:Client:EmptyContainer: fix display into room 2022-11-17 13:45:32 +03:00
TimofeyBoyko
a95df80f75 Web:Client:Locales: add new translation keys for empty screen 2022-11-17 13:45:05 +03:00
f306a525fb Web:Common:Add ProgressTheme. 2022-11-17 12:27:32 +03:00
6cc2c5aca1 Web:Components:Add theme base and dark for preparationPortalProgress. 2022-11-17 12:26:57 +03:00
fc10e8a298 Web:Client:Fix styles progress, add ColorTheme. 2022-11-17 12:26:02 +03:00
6f5e4d94a8 Web: Files: removed favorites for editor 2022-11-17 12:01:30 +03:00