|
|
59e0e53d19
|
Web: Client: Settings: use SaveCancelButtons
|
2022-04-12 11:30:43 +03:00 |
|
|
|
c62b18b68b
|
Merge branch 'feature/ip-security' of github.com:ONLYOFFICE/AppServer into feature/admin-messages
|
2022-04-12 11:28:54 +03:00 |
|
|
|
a7a2eb733b
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-12 10:45:15 +03:00 |
|
|
|
ce7ac083ca
|
Web: Client: Settings: fix ip regex
|
2022-04-12 10:41:00 +03:00 |
|
|
|
9ae3945680
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 17:46:54 +03:00 |
|
|
|
ae9ae673cb
|
Web: Files: fixed loader styles for tiles
|
2022-04-11 17:46:46 +03:00 |
|
|
|
27af58022d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-11 17:10:12 +03:00 |
|
|
|
44c2a267d4
|
Web: Client: Settings: fix get ip restriction enable
|
2022-04-11 17:07:05 +03:00 |
|
|
|
5dd5e22ba5
|
Web: Common: fix ipRestrictions
|
2022-04-11 17:05:55 +03:00 |
|
|
|
866a6f6c26
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 16:37:37 +03:00 |
|
|
|
0e7eec8221
|
Web: Files: fixed "Duplicate" translation
|
2022-04-11 16:22:23 +03:00 |
|
|
|
fdfdf4e547
|
Web:Studio:Fix border width.
|
2022-04-11 16:10:12 +03:00 |
|
|
|
ce5fe18139
|
Web: Files: fixed onClickMakeForm
|
2022-04-11 13:50:33 +03:00 |
|
|
|
acc0934965
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 13:29:33 +03:00 |
|
|
|
eaf365de0f
|
Web: Client: Settings: add try/catch
|
2022-04-11 13:27:37 +03:00 |
|
Timofey Boyko
|
63c812cbf0
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 13:22:22 +03:00 |
|
Timofey Boyko
|
9c01f05de8
|
Web:Studio:Settings: hide article when catalog item changed
|
2022-04-11 13:22:04 +03:00 |
|
|
|
361e22f5af
|
Web: Components: fixed heading styles for dark theme
|
2022-04-11 13:15:36 +03:00 |
|
|
|
c33e724a3d
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:28:02 +03:00 |
|
|
|
01e745f47b
|
Web:Studio:Fix loaders styles.
|
2022-04-11 12:26:58 +03:00 |
|
|
|
b33fe33f18
|
Web: Client: Settings: fix show warning
|
2022-04-11 12:15:47 +03:00 |
|
|
|
f3a144327a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
|
2022-04-11 12:09:59 +03:00 |
|
|
|
433c684d09
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:08:50 +03:00 |
|
|
|
1922fe67d4
|
Web: Files: fixed activateHotkeys
|
2022-04-11 11:53:49 +03:00 |
|
|
|
002a432b4d
|
Web: fixed info-panel icon
|
2022-04-11 11:11:44 +03:00 |
|
|
|
90cade35e3
|
Merge pull request #609 from ONLYOFFICE/feature/iprestrictions
iprestrictions
|
2022-04-11 10:54:26 +03:00 |
|
|
|
3c013939bc
|
Merge branch 'develop' into feature/iprestrictions
|
2022-04-11 10:38:12 +03:00 |
|
|
|
95959317a2
|
fix
|
2022-04-11 10:38:00 +03:00 |
|
|
|
952996f534
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-10 20:08:22 +03:00 |
|
|
|
a2c1e836c0
|
Web:Studio:Added LoaderSubmenu.
|
2022-04-10 19:57:43 +03:00 |
|
|
|
34f223d67c
|
Web:Studio:Added LoaderSectionHeader.
|
2022-04-10 19:24:05 +03:00 |
|
|
|
a2995f37e6
|
Web:Common:Added article loader.
|
2022-04-10 18:23:21 +03:00 |
|
|
|
b0a64cbac7
|
Web: Client: Settings: fix after merge
|
2022-04-08 16:54:26 +03:00 |
|
|
|
3f70481d3a
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/ip-security
# Conflicts:
# packages/asc-web-common/store/AuthStore.js
|
2022-04-08 16:51:26 +03:00 |
|
|
|
df580e9938
|
Merge pull request #607 from ONLYOFFICE/feature/trusted-mail
Feature/trusted mail
|
2022-04-08 09:49:02 -04:00 |
|
|
|
21489279b4
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
# Conflicts:
# web/ASC.Web.Client/src/store/SettingsSetupStore.js
|
2022-04-08 16:42:11 +03:00 |
|
|
|
860982c889
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-08 16:37:44 +03:00 |
|
|
|
d2ba43ce4b
|
Web:Studio:Added setIsLoadingArticleSettings method.
|
2022-04-08 16:37:33 +03:00 |
|
|
|
dcb6e9b4a7
|
Web: Components: SaveCancelButtons: fix width
|
2022-04-08 16:32:33 +03:00 |
|
|
|
f835484454
|
Web: Client: Settings: fix width
|
2022-04-08 16:12:34 +03:00 |
|
Eugene Kozyrev
|
542df3d847
|
Change project language (#612)
|
2022-04-08 16:04:09 +03:00 |
|
|
|
b2d162b630
|
Web: Client: Settings: use SaveCancelButtons
|
2022-04-08 16:01:03 +03:00 |
|
|
|
31dadfd140
|
Web: removed unused code
|
2022-04-08 15:45:08 +03:00 |
|
Timofey Boyko
|
9bdf036f18
|
Web:Files: delete useless code
|
2022-04-08 15:33:45 +03:00 |
|
|
|
9aa95c6462
|
Web: Client: fix isSaving
|
2022-04-08 15:18:58 +03:00 |
|
|
|
d9e991327c
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/trusted-mail
|
2022-04-08 15:02:03 +03:00 |
|
|
|
136fa429b7
|
Web: Client: Settings: return isLoading
|
2022-04-08 15:01:53 +03:00 |
|
|
|
5a6badff68
|
Web: Components: Ipad: fixed arrow icon size for table header
|
2022-04-08 14:48:02 +03:00 |
|
|
|
c3be1ec82d
|
Web: Components: Ipad: fixed search-input height
|
2022-04-08 14:46:42 +03:00 |
|
Tatiana Lopaeva
|
af86179e02
|
Merge pull request #611 from ONLYOFFICE/bugfix/fixed-hotkeys-selection-with-arrows
Web: Files: Hotkeys: fixed arrows selection
|
2022-04-08 13:50:40 +03:00 |
|
