Commit Graph

148 Commits

Author SHA1 Message Date
Viktor Fomin
8f97413d1d Merge branch 'develop' into feature/fix-whitelable 2022-11-30 12:33:31 +03:00
Akmal Isomadinov
95b903a28e merge develop 2022-11-29 17:07:54 +05:00
Viktor Fomin
366d92abb2 Merge branch 'develop' into feature/fix-whitelable 2022-11-28 12:09:11 +03:00
Akmal Isomadinov
dc3693358d Web: Updated ids infoPanel 2022-11-25 19:43:51 +05: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
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
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
Viktor Fomin
50c55f0e29 Common: fix logo 2022-11-22 13:06:07 +05:00
Vlada Gazizova
5884fa7acd
Merge branch 'develop' into feature/custom-theme 2022-11-21 11:15:55 +03:00
37952ee5b9 Web: Files: fixed display members tab for viewer 2022-11-18 14:05:22 +03:00
999e892b7e Merge branch 'develop' into feature/custom-theme 2022-11-17 17:30:46 +03:00
75ca934448 Merge branch 'develop' into feature/custom-theme 2022-11-11 22:22:40 +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
65bc045fe7 Fix TypeError: Cannot read properties of null (reading '1') 2022-11-09 14:15:55 +03:00
7803b0e33c Merge branch 'develop' into feature/custom-theme 2022-11-08 16:54:02 +03:00
cc64fc9887 Web: Files: fixed selectionParentRoom error 2022-11-08 14:11:17 +03: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
36bd8eab14 Web:Common:Delete onSaveSelectedNewThemes. 2022-11-02 16:05:02 +03: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
mushka
8fe7efe036 cleaned up infoPanelBody inject 2022-10-31 14:09:28 +03:00
Viktor Fomin
9510ccbc74 Common: SettingsStore: fix logo url 2022-10-31 13:29:40 +05:00
2facf7fa7c Web:Common:Add onSaveSelectedNewThemes. 2022-10-30 16:40:20 +03:00
Viktor Fomin
d66cf18981 Common: SettingsStore: fix 2022-10-27 00:29:44 +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
mushka
521d6f9250 moved selection calculation logic to info panel store and added several selection helper methods 2022-10-21 20:20: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
285c831477 Web:Client:Delete greetingSettingsIsDefault, greetingSettingsIsDefault. 2022-10-20 14:08:47 +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
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
TimofeyBoyko
d6459403a5 Web:Common:UserStore: delete useless code 2022-10-17 16:02:09 +05:00
TimofeyBoyko
df2630ca47 Web:Common:CurrentQoutaStore: add showRoomQuotaBar and showStorageQuotaBar 2022-10-17 16:01:51 +05:00
1fac4168fe Merge branch 'develop' into feature/company-info-settings 2022-10-17 11:02:59 +03:00
TimofeyBoyko
b1d63436cc Merge branch 'develop' into feature/bar-quotas 2022-10-17 11:53:38 +05:00
c79b525da3 Web:Client:Add additionalResourcesIsDefault, companyInfoSettingsIsDefault, greetingSettingsIsDefault, getGreetingSettingsIsDefault, setAdditionalResourcesIsDefault, setCompanyInfoSettingsIsDefault. 2022-10-14 17:26:54 +03:00
TimofeyBoyko
470c100e2f Merge branch 'develop' into feature/bar-quotas 2022-10-14 12:26:16 +05:00
28d918464f Merge branch 'develop' into feature/company-info-settings 2022-10-13 15:48:31 +03:00