|
5f2fbb74db
|
Merge pull request #933 from ONLYOFFICE/feature/shared-redesign-third-party
Feature/shared redesign third party
|
2022-10-20 14:32:47 +03:00 |
|
|
1f5605eb84
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 14:24:12 +03:00 |
|
|
1f06783437
|
Merge pull request #936 from ONLYOFFICE/bugfix/fix-greetingsettings
Bugfix/fix greetingsettings
|
2022-10-20 14:23:11 +03:00 |
|
|
49ac021dd3
|
Web:Client:Add getGreetingSettingsIsDefault method.
|
2022-10-20 14:10:32 +03:00 |
|
|
e49b5b5945
|
Web:Client:Add greetingSettingsIsDefault, getGreetingSettingsIsDefault.
|
2022-10-20 14:09:11 +03:00 |
|
|
285c831477
|
Web:Client:Delete greetingSettingsIsDefault, greetingSettingsIsDefault.
|
2022-10-20 14:08:47 +03:00 |
|
|
ba01d9dacd
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/letters
# Conflicts:
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
|
2022-10-20 13:56:13 +03:00 |
|
|
2927cdb66b
|
Notify: small fix
|
2022-10-20 13:50:08 +03:00 |
|
Viktor Fomin
|
9c007d82d0
|
Merge branch 'develop' into bugfix/login
|
2022-10-20 15:32:29 +05:00 |
|
Viktor Fomin
|
d2fe1b8e9b
|
Login: fix access for auth user
|
2022-10-20 15:32:20 +05:00 |
|
TimofeyBoyko
|
eab4908c03
|
Merge branch 'develop' into bugfix/files-context-menu
|
2022-10-20 14:40:00 +05:00 |
|
|
2c6d5fb9d8
|
Merge pull request #935 from ONLYOFFICE/bugfix/fix-empty-trash
bugfix/fix-empty-trash
|
2022-10-20 12:38:26 +03:00 |
|
|
2352ab01b6
|
Files: fix deleting folders from trash
|
2022-10-20 12:35:46 +03:00 |
|
Viktor Fomin
|
76ba5fdf98
|
Merge branch 'develop' into bugfix/login
|
2022-10-20 14:22:22 +05:00 |
|
TimofeyBoyko
|
c831a2cfd6
|
Web:Common:FilterInput: fix memory leak
|
2022-10-20 14:17:58 +05:00 |
|
Viktor Fomin
|
a3f505f2b6
|
Login: use theme from store
|
2022-10-20 14:04:48 +05:00 |
|
Viktor Fomin
|
0e59cf271e
|
Login: add support dark theme
|
2022-10-20 14:01:20 +05:00 |
|
Viktor Fomin
|
abc85081c0
|
Components: Themes: add header color
|
2022-10-20 14:00:21 +05:00 |
|
TimofeyBoyko
|
c9a674d25a
|
Web:Client:Home: add context options to section header for acrhive
|
2022-10-20 13:54:31 +05:00 |
|
|
0d680dd005
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-20 11:36:22 +03:00 |
|
|
75ad9ebe39
|
Web:Client:Fix.
|
2022-10-20 11:22:02 +03:00 |
|
TimofeyBoyko
|
a0da3a1735
|
Web:Client: add new translation key for EmptyArchiveDialog
|
2022-10-20 13:11:26 +05:00 |
|
TimofeyBoyko
|
a2e6164ffe
|
Web:Client: add new translation key 'ArchiveAction'
|
2022-10-20 12:53:50 +05:00 |
|
Viktor Fomin
|
9c421fdbec
|
Login: add theme for nav
|
2022-10-19 23:53:09 +05:00 |
|
Viktor Fomin
|
07e80ece4e
|
Components: Themes: add nav bg
|
2022-10-19 23:52:48 +05:00 |
|
|
9c99f3a53f
|
Merge branch 'develop' into feature/shared-redesign-third-party
|
2022-10-19 19:41:39 +03:00 |
|
|
35592fd306
|
Quota: fix
|
2022-10-19 19:27:04 +03:00 |
|
|
a703b09b63
|
Merge pull request #814 from ONLYOFFICE/feature/company-info-settings
Feature/company info settings
|
2022-10-19 19:07:44 +03:00 |
|
|
16d1f6d33f
|
Merge pull request #932 from ONLYOFFICE/bugfix/rooms-drag-n-drop
Web:Client:WithFileActions: disable drag and drop for rooms
|
2022-10-19 18:55:06 +03:00 |
|
TimofeyBoyko
|
ac2e9baa90
|
Web:Client:WithFileActions: disable drag and drop for rooms
|
2022-10-19 20:52:03 +05:00 |
|
|
d666bc15dd
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-19 18:44:33 +03:00 |
|
|
56ef525cde
|
Removed --depth 1 on git clone
|
2022-10-19 18:41:24 +03:00 |
|
|
2767e172c6
|
Update core_base_domain
|
2022-10-19 18:40:54 +03:00 |
|
|
ea86b81c7e
|
Quota: fix
|
2022-10-19 18:04:31 +03:00 |
|
|
42d9a6682c
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-19 17:54:58 +03:00 |
|
|
8c2c8394bb
|
Web:Client:Methods refactoring onSave, onRestore in AdditionalResources and CompanyInfoSettings.
|
2022-10-19 17:52:45 +03:00 |
|
Elyor Djalilov
|
d819128bdb
|
Web:Client:ActiveSessions: added translations
|
2022-10-19 18:30:22 +05:00 |
|
|
04d697e08b
|
Merge pull request #931 from ONLYOFFICE/bugfix/fixed-organization-name
Bugfix/fixed organization name
|
2022-10-19 16:22:59 +03:00 |
|
|
2b95553037
|
another fix quota
|
2022-10-19 16:22:13 +03:00 |
|
|
23f3714195
|
Web: People: fixed header height
|
2022-10-19 16:17:43 +03:00 |
|
|
4115bdc5dd
|
Web: Files: fixed TrustedMailDescription translation
|
2022-10-19 16:03:59 +03:00 |
|
|
b99bde994e
|
Web: Files: fixed LanguageTimeSettingsTooltip translation
|
2022-10-19 16:01:32 +03:00 |
|
|
1cb9c4450e
|
Merge pull request #930 from ONLYOFFICE/feature/change-user-status-dialog
Feature/change user status dialog
|
2022-10-19 15:48:42 +03:00 |
|
TimofeyBoyko
|
2df9fe1111
|
Web:Client:Dialogs: fix close dialogs for change user status
|
2022-10-19 17:44:35 +05:00 |
|
TimofeyBoyko
|
870e3a93f1
|
Web:Client:Dialogs: fix close dialogs while request is running for change user type and change user status dialogs
|
2022-10-19 17:41:44 +05:00 |
|
TimofeyBoyko
|
ab2d267a19
|
Web:Client: fix crash
|
2022-10-19 17:32:29 +05:00 |
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
TimofeyBoyko
|
37acdabf9e
|
Merge branch 'develop' into feature/change-user-status-dialog
|
2022-10-19 17:22:15 +05:00 |
|
TimofeyBoyko
|
354dd00adc
|
Web:Client:DialogStore: fix changeUserTypeDialogVisible
|
2022-10-19 17:22:06 +05:00 |
|
|
7569a741d8
|
Merge branch 'develop' into feature/company-info-settings
|
2022-10-19 15:21:18 +03:00 |
|