Commit Graph

7162 Commits

Author SHA1 Message Date
Elyor Djalilov
f4e53d9cf8 unused key removed 2022-11-30 15:33:03 +05:00
Elyor Djalilov
4e8d62f24a unused key removed 2022-11-30 15:31:16 +05:00
Elyor Djalilov
4050700819 unused key removed 2022-11-30 15:30:46 +05:00
Elyor Djalilov
e986d29240 unused key removed 2022-11-30 15:30:25 +05:00
Elyor Djalilov
5c0322fe80 unused key removed 2022-11-30 15:30:01 +05:00
Elyor Djalilov
08108a6afa unused key removed 2022-11-30 15:29:38 +05:00
Elyor Djalilov
39930f88c6 unused key removed 2022-11-30 15:29:17 +05:00
Elyor Djalilov
feeebbb54a unused key removed 2022-11-30 15:28:50 +05:00
Elyor Djalilov
86442a8704 unused key removed 2022-11-30 15:28:25 +05:00
Elyor Djalilov
1afb601f0a unused key removed 2022-11-30 15:28:01 +05:00
Elyor Djalilov
1c929c76dc unused key removed 2022-11-30 15:27:29 +05:00
Elyor Djalilov
21855e992d unused key removed 2022-11-30 15:26:30 +05:00
Elyor Djalilov
96020455bd unused key removed 2022-11-30 15:26:07 +05:00
Elyor Djalilov
30c0cc2134 unused key removed 2022-11-30 15:25:41 +05:00
Elyor Djalilov
8d930f9830 unused key removed 2022-11-30 15:25:14 +05:00
Elyor Djalilov
3c430abfef unused key removed 2022-11-30 15:24:49 +05:00
Elyor Djalilov
18a8b5a371 unused key removed 2022-11-30 15:24:05 +05:00
Elyor Djalilov
139d313670 unused key removed 2022-11-30 15:23:36 +05:00
Elyor Djalilov
982ab9e047 unused key removed 2022-11-30 15:23:02 +05:00
Elyor Djalilov
7b71164aac unused key removed 2022-11-30 15:22:31 +05:00
Elyor Djalilov
57973a0af6 fixed incorrect key 2022-11-30 15:21:52 +05:00
Elyor Djalilov
c3e702bbf5 unused key removed 2022-11-30 15:21:15 +05:00
Elyor Djalilov
aa097121c4 unused key removed 2022-11-30 15:15:05 +05:00
Elyor Djalilov
9bcb2be434 unused key removed 2022-11-30 15:13:05 +05:00
Elyor Djalilov
37e15bb90b unused key removed 2022-11-30 15:12:40 +05:00
Elyor Djalilov
eb21deff5c unused key removed 2022-11-30 15:10:05 +05:00
Elyor Djalilov
f7ef99c00d unused key removed 2022-11-30 15:08:06 +05:00
Mushka Nikita
b96059c041 Merge branch 'feature/info-panel-history-update' of github.com:ONLYOFFICE/AppServer into feature/info-panel-history-update 2022-11-30 13:07:40 +03:00
Elyor Djalilov
1a5ecc1f5a unused key removed 2022-11-30 15:07:02 +05:00
Elyor Djalilov
a2ea616c77 unused key removed 2022-11-30 15:04:50 +05:00
Elyor Djalilov
02218f522a unused key removed 2022-11-30 15:04:02 +05:00
Elyor Djalilov
6a61438766 unused key removed 2022-11-30 15:03:34 +05:00
Elyor Djalilov
9b35c5735a unused key removed 2022-11-30 15:02:14 +05:00
Mushka Nikita
c6b4a076b6 moved new translation keys to Common 2022-11-30 13:00:30 +03:00
Mushka Nikita
becf705370 changed time format to "LT" 2022-11-30 12:55:15 +03:00
Elyor Djalilov
5ffd47d754 deleted duplicate key 2022-11-30 14:53:26 +05:00
Viktor Fomin
8f97413d1d Merge branch 'develop' into feature/fix-whitelable 2022-11-30 12:33:31 +03:00
Elyor Djalilov
69ebe3b38a deleted duplicate key 2022-11-30 14:33:22 +05:00
Timofey Boyko
a2213c9366 Web:Common:Constants: add new payments enum 2022-11-30 12:24:12 +03:00
Elyor Djalilov
7c32906fa7 not translated toasts fixed 2022-11-30 14:14:29 +05:00
Timofey Boyko
4ff7ea1a33 Merge branch 'develop' into feature/accounts-room-list 2022-11-30 11:15:42 +03:00
e1e39de101 Merge branch 'develop' into feature/info-panel-history-update 2022-11-29 19:03:53 +03:00
Akmal Isomadinov
a19f26310a Web:Client:Store:ContextOptionsStore Added id 2022-11-29 17:51:23 +05:00
Akmal Isomadinov
95b903a28e merge develop 2022-11-29 17:07:54 +05:00
Akmal Isomadinov
73b9a179e9 Web:Client:Components:Dialogs:CreateEditRoomDialog:Sub-Components:ThirdPartyStorage Refactoring and Added className 2022-11-29 16:26:36 +05:00
Akmal Isomadinov
c203ff7f47 Web:Client:Components:Dialogs:CreateEditRoomDialog:Sub-Components:ThirdPartyStorage:ThirdPartyComboBox Added className 2022-11-29 16:25:27 +05:00
Akmal Isomadinov
008aa79c1d Web:Client:Components:Dialogs:CreateEditRoomDialog:CreateRoomDialog Updated button id 2022-11-29 15:56:47 +05:00
Akmal Isomadinov
6de2111331 Web:Client:Components:Dialogs:CreateEditRoomDialog:Sub-Components Refactoring and Updated id 2022-11-29 15:49:42 +05:00
Elyor Djalilov
26d210c8d7 not found keys fixed 2022-11-29 15:32:36 +05:00
Elyor Djalilov
a9188bfd59 not found keys fixed 2022-11-29 15:28:24 +05:00
Mushka Nikita
7ff073a1e4 cleaned up old code 2022-11-29 13:26:13 +03:00
Elyor Djalilov
b6a4a50d7d not found keys fixed 2022-11-29 15:26:07 +05:00
Mushka Nikita
ef7a5fc2df fixed indent commit 2022-11-29 13:24:14 +03:00
Mushka Nikita
feace8a3c4 added indent between day-divided segments 2022-11-29 13:23:45 +03:00
Elyor Djalilov
4e63364b6f fixed page crash 2022-11-29 15:17:42 +05:00
Mushka Nikita
c3f35494f5 added new getDateTime func to HistoryHelper and implemented it 2022-11-29 13:00:34 +03:00
Mushka Nikita
8822c5c9e5 created historyHelper with getRelativeDateDay function 2022-11-29 12:47:54 +03:00
Mushka Nikita
5bf963d702 destructured historyBlock to its own component 2022-11-29 12:47:17 +03:00
Mushka Nikita
cfddc54524 updated styles for header and subheader to fixed position behaviour 2022-11-29 12:46:45 +03:00
Mushka Nikita
5740f1b7d3 added "Today" and "Yesterday" translation keys to en and ru 2022-11-29 12:45:39 +03:00
Akmal Isomadinov
0bdd059032 Web:Client:Pages:AccountsHome:Section:Header fixed className 2022-11-29 14:27:06 +05:00
Elyor Djalilov
78e9677237 fixed incorrect key 2022-11-29 14:19:16 +05:00
Elyor Djalilov
812339b19b not translated toasts fixed 2022-11-29 14:06:46 +05:00
Elyor Djalilov
6a510a34c0 commented key removed 2022-11-29 14:00:41 +05:00
Elyor Djalilov
353a3670f8 unused key removed 2022-11-29 13:56:32 +05:00
baf08554d6
Merge pull request #1083 from ONLYOFFICE/bugfix/157
Bugfix/157
2022-11-29 10:28:36 +03:00
Elyor Djalilov
e4b077f69b key was moved to the Common 2022-11-29 00:39:03 +05:00
Elyor Djalilov
2e44a446af not translated toasts fixed 2022-11-28 23:52:29 +05:00
Elyor Djalilov
3211ccf761 not found keys fixed 2022-11-28 23:26:44 +05:00
Elyor Djalilov
80b65ca16f not found keys fixed 2022-11-28 23:22:20 +05:00
Elyor Djalilov
af4bcf4c05 deleted duplicate keys 2022-11-28 23:01:07 +05:00
Elyor Djalilov
89fe900387 deleted duplicate keys 2022-11-28 22:54:54 +05:00
Akmal Isomadinov
265bae4017 Web:Client:Pages:Home:InfoPanel:Body:Sub-Components:ItemTitle:ItemContextOptions Refactoring 2022-11-28 22:53:32 +05:00
Akmal Isomadinov
bb83e986e3 Web:Client:Store:ContextOptionsStore Added ids 2022-11-28 22:52:08 +05:00
Akmal Isomadinov
1fc099db6e Web:Client:Store:AccountsContextOptionsStore Updated ids 2022-11-28 22:51:23 +05:00
Elyor Djalilov
8951cf62fc deleted duplicate keys 2022-11-28 22:50:56 +05:00
Akmal Isomadinov
0b2249f382 Web:Client:Pages:Home:InfoPanel:Body:Views:Details Added className 2022-11-28 22:50:31 +05:00
Akmal Isomadinov
8a7d06563e Web:Client:Pages:Home:InfoPanel:Body:Helpers:DetailsHelper Added method getPropertClassName and Refactoring 2022-11-28 22:49:12 +05:00
Elyor Djalilov
04db0e8f0a deleted duplicate key and was moved to the Common 2022-11-28 22:46:57 +05:00
Elyor Djalilov
23109e30c2 deleted duplicate keys and was moved to the Common 2022-11-28 22:19:57 +05:00
Elyor Djalilov
7f89e3d2bf unused key removed 2022-11-28 22:12:23 +05:00
Elyor Djalilov
642e7d4036 unused key removed 2022-11-28 22:11:18 +05:00
Elyor Djalilov
b3b6615226 deleted duplicate key 2022-11-28 22:03:20 +05:00
Elyor Djalilov
d88331c704 deleted duplicate keys 2022-11-28 21:41:21 +05:00
827042cf8b Fix folder unsubscribe 2022-11-28 17:37:55 +03:00
Akmal Isomadinov
5537c6d23c Web:Client:Store:FilesStore fixed typo 2022-11-28 17:56:24 +05:00
Akmal Isomadinov
9550bc0f77 Web:Client:Pages:Home:InfoPanel:Body:Views:Accounts Updated id 2022-11-28 17:49:28 +05:00
Akmal Isomadinov
a413e9ff14 Web:Client:Store:FilesActionsStore Added id 2022-11-28 17:34:34 +05:00
Akmal Isomadinov
8f17a5c86b Web:Client:Store:AccountsContextOptionsStore Added ids 2022-11-28 17:34:03 +05:00
Akmal Isomadinov
05ba07585a Web:Client:Pages:Home:InfoPanel:Body:Views:Accounts Added ids 2022-11-28 17:33:26 +05:00
Akmal Isomadinov
a4ab6dbfed Web:Client:Pages:Home:InfoPanel:Body:Sub-Components:ItemTitle:AccountsItemTitle Added id 2022-11-28 17:32:23 +05:00
Viktor Fomin
69a90492d0 Client: add missing props 2022-11-28 15:29:55 +03:00
Elyor Djalilov
b924f1582d deleted duplicate keys and was moved to the Common 2022-11-28 15:37:10 +05:00
Viktor Fomin
5d46e4b320 Client: PortalSettings: WhiteLabel: add comment 2022-11-28 13:33:13 +03:00
Viktor Fomin
cf400cb800 Client: fix logo 2022-11-28 13:31:58 +03:00
Akmal Isomadinov
b8eb745270 Web:Client:Components:Dialogs Added ids 2022-11-28 15:26:49 +05:00
Viktor Fomin
ef88b12780 Client: PortalSettings: WhiteLabel: fix 2022-11-28 13:23:17 +03:00
Elyor Djalilov
3c637dbaa2 deleted duplicate keys and was moved to the Common 2022-11-28 15:19:44 +05:00
Akmal Isomadinov
fb36966c08 Web:Client:Components:Dialogs:ChangeUserTypeDialog Added id 2022-11-28 15:14:53 +05:00
Elyor Djalilov
6ac2aceb64 deleted duplicate keys and was moved to the Common 2022-11-28 14:55:18 +05:00
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