|
a563bbe3cf
|
Merge branch 'develop' into feature/two-factor-authentication
# Conflicts:
# web/ASC.Web.Api/Api/AuthenticationController.cs
|
2022-10-09 21:32:14 +03:00 |
|
|
4d19337805
|
Merge pull request #792 from ONLYOFFICE/feature/login-settings
Feature/login settings
|
2022-10-09 20:56:22 +03:00 |
|
|
75aebdd9b2
|
optimization
|
2022-10-09 19:35:59 +03:00 |
|
|
964e372477
|
Merge pull request #895 from ONLYOFFICE/bugfix/context-menu-header
Bugfix/context menu header
|
2022-10-07 18:27:54 +03:00 |
|
|
fe2dd3c394
|
Merge branch 'develop' into feature/login-settings
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-10-07 17:47:24 +03:00 |
|
TimofeyBoyko
|
0af18bf639
|
Merge branch 'develop' into bugfix/context-menu-header
|
2022-10-07 19:32:45 +05:00 |
|
TimofeyBoyko
|
68fc4fb2d4
|
Web:Common:FilterInput: delete useless code
|
2022-10-07 19:24:56 +05:00 |
|
TimofeyBoyko
|
3fa401c790
|
Web:Components:Combobox: disable mobile view for low count of options
|
2022-10-07 19:24:39 +05:00 |
|
|
d0682bb467
|
Merge pull request #779 from ONLYOFFICE/feature/user-quota
Feature/user quota
|
2022-10-07 17:09:52 +03:00 |
|
|
302b9c57ff
|
fix
|
2022-10-07 17:08:38 +03:00 |
|
|
8f14b6ce27
|
Merge branch 'develop' into feature/user-quota
|
2022-10-07 16:54:14 +03:00 |
|
|
e3bcada474
|
fix
|
2022-10-07 16:49:03 +03:00 |
|
|
c8e6578c11
|
fix
|
2022-10-07 16:48:06 +03:00 |
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
18d1da7fa5
|
Merge pull request #894 from ONLYOFFICE/bugfix/scroll-after-keyboard
Bugfix/scroll-after-keyboard
|
2022-10-07 15:15:38 +03:00 |
|
|
8d5ac645e6
|
Web: Fixed scroll shift and page height reduction, moved logic to a common component.
|
2022-10-07 15:09:55 +03:00 |
|
|
294bffbe13
|
Merge pull request #893 from ONLYOFFICE/bugfix/border-styles
Bugfix/border styles
|
2022-10-07 11:06:20 +03:00 |
|
|
c794e0443e
|
Web: Fixed hotkey border styles.
|
2022-10-07 10:40:55 +03:00 |
|
|
c6fd7f0621
|
Web: Removed the transition when clicking on a room in the archives.
|
2022-10-07 10:37:26 +03:00 |
|
TimofeyBoyko
|
df17649b19
|
Web:Components:ContextMenu: fix header styles
|
2022-10-06 17:39:15 +03:00 |
|
TimofeyBoyko
|
f2a9985694
|
Web:Components: add header context menu for accounts
|
2022-10-06 17:33:26 +03:00 |
|
|
090259d313
|
Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota
|
2022-10-06 15:56:37 +03:00 |
|
|
4ebd5323c0
|
Quota: fix
|
2022-10-06 15:55:47 +03:00 |
|
|
f655620485
|
Quota: fix
|
2022-10-06 15:17:07 +03:00 |
|
|
bfdfd371cf
|
fix
|
2022-10-06 14:57:50 +03:00 |
|
|
4aa072328e
|
Merge pull request #891 from ONLYOFFICE/feature/change-name-context-options
Feature/change name context option
|
2022-10-06 14:54:31 +03:00 |
|
TimofeyBoyko
|
46dc79c25c
|
Merge branch 'develop' into feature/change-name-context-options
|
2022-10-06 13:15:06 +03:00 |
|
TimofeyBoyko
|
b62d870f76
|
Web:Client:Accounts: add change name dialog action to context menu
|
2022-10-06 13:12:44 +03:00 |
|
TimofeyBoyko
|
a21f8986bc
|
Web:Client: move save logic from profile to change name dialog
|
2022-10-06 13:12:13 +03:00 |
|
|
8b03298040
|
Merge pull request #890 from ONLYOFFICE/bugfix/fixed-article-selection-item
Bugfix/fixed article selection item
|
2022-10-06 13:07:52 +03:00 |
|
|
e833fd227f
|
Web: Client: fixed article selected node for portal settings
|
2022-10-06 12:44:40 +03:00 |
|
|
19bfd19966
|
Web: Client: fixed article selected node for profile
|
2022-10-06 12:42:38 +03:00 |
|
|
37f8589603
|
Web: Components: fixed combobox styles
|
2022-10-06 12:41:30 +03:00 |
|
|
39b15a7117
|
Create frontend.macos.code-workspace
|
2022-10-06 12:14:22 +03:00 |
|
|
c16ef82df3
|
Update runMigrations.sh
Added execution flag (chmod +x)
|
2022-10-06 12:14:12 +03:00 |
|
|
11ffccf983
|
fix
|
2022-10-06 11:22:10 +03:00 |
|
Vashchuk Nikita
|
9b37c9f9b3
|
fix
|
2022-10-05 19:13:56 +04:00 |
|
|
7208db2872
|
Merge pull request #888 from ONLYOFFICE/bugfix/fixed-hotkeys-border
Web: Files: fixed hotkeys border
|
2022-10-05 17:48:08 +03:00 |
|
|
752ce34407
|
Merge branch 'develop' into feature/user-quota
|
2022-10-05 17:01:40 +03:00 |
|
|
71b65bd693
|
Web: Files: fixed hotkeys border
|
2022-10-05 16:23:34 +03:00 |
|
|
0869ce4bfb
|
Create socket.sh
|
2022-10-05 14:44:41 +03:00 |
|
|
ec85cb896a
|
Update build.sh
|
2022-10-05 14:43:43 +03:00 |
|
|
6682ca850e
|
fix
|
2022-10-05 14:04:24 +03:00 |
|
|
691ea10401
|
Merge pull request #885 from ONLYOFFICE/bugfix/fixed-delete-files
Web: Files: fixed removeFiles
|
2022-10-05 13:44:14 +03:00 |
|
|
0173ec2d9a
|
Web: Files: fixed remove folders
|
2022-10-05 13:39:59 +03:00 |
|
|
dd730aded3
|
Web: Files: fixed removeFiles
|
2022-10-05 13:30:41 +03:00 |
|
|
b308aa1fe6
|
Merge pull request #884 from ONLYOFFICE/bugfix/context-menu-icons
Bugfix/context menu icons
|
2022-10-05 13:05:59 +03:00 |
|
TimofeyBoyko
|
62c1acb5e4
|
Web:Components:DropDownIten: fix dark theme for icon with rect fill
|
2022-10-05 13:02:34 +03:00 |
|
TimofeyBoyko
|
73fa50cc46
|
Web:Client: fix icon for debug button and about button of profile context menu
|
2022-10-05 12:48:42 +03:00 |
|
TimofeyBoyko
|
089a5fa760
|
Web:Client: fix icon for room-info of context menu
|
2022-10-05 12:46:41 +03:00 |
|